From 3cca7e865082c8144a47687e3a2455fba5a927d5 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 14 May 2010 12:37:05 +0000 Subject: Include host system's header files and don't compile our c library replacements in the sim. This makes it possible to move the simulator code into the target tree (for Rockbox as an application). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26019 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 10 +++++++--- firmware/firmware.make | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index b155a9f03d..3327fbbce6 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -21,12 +21,13 @@ timer.c panic.c debug.c -/* Common */ -#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) +/* Standard library */ +#if !defined(SIMULATOR) +#if defined(__MINGW32__) || defined(__CYGWIN__) libc/errno.c /* alsa on linux requires a more advanced sprintf, i.e. not ours */ libc/sprintf.c -#endif /* !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) */ +#endif /* defined(__MINGW32__) || defined(__CYGWIN__) */ libc/atoi.c libc/ctype.c libc/memcmp.c @@ -42,6 +43,9 @@ libc/strrchr.c libc/strtok.c libc/strstr.c libc/mktime.c +#endif /* !defined(SIMULATOR)*/ + +/* Common */ common/config.c common/crc32.c #ifdef MI4_FORMAT diff --git a/firmware/firmware.make b/firmware/firmware.make index 115bfacad0..52b5a19cc6 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make @@ -7,7 +7,10 @@ # $Id$ # -INCLUDES += -I$(FIRMDIR)/libc/include -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include +INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include +ifndef SIMVER +INCLUDES += -I$(FIRMDIR)/libc/include +endif FIRMLIB_SRC += $(call preprocess, $(FIRMDIR)/SOURCES) FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC)) -- cgit v1.2.3