diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 12:37:05 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 12:37:05 +0000 |
commit | 3cca7e865082c8144a47687e3a2455fba5a927d5 (patch) | |
tree | b5bf8a0d943b9af94be5ef5b47f1046ce84576e3 /firmware | |
parent | 3d1a85695b64029d93de631d0c6fd81c3311d6e7 (diff) | |
download | rockbox-3cca7e865082c8144a47687e3a2455fba5a927d5.tar.gz rockbox-3cca7e865082c8144a47687e3a2455fba5a927d5.zip |
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
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 10 | ||||
-rw-r--r-- | firmware/firmware.make | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index b155a9f03d..3327fbbce6 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -21,12 +21,13 @@ timer.c | |||
21 | panic.c | 21 | panic.c |
22 | debug.c | 22 | debug.c |
23 | 23 | ||
24 | /* Common */ | 24 | /* Standard library */ |
25 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) | 25 | #if !defined(SIMULATOR) |
26 | #if defined(__MINGW32__) || defined(__CYGWIN__) | ||
26 | libc/errno.c | 27 | libc/errno.c |
27 | /* alsa on linux requires a more advanced sprintf, i.e. not ours */ | 28 | /* alsa on linux requires a more advanced sprintf, i.e. not ours */ |
28 | libc/sprintf.c | 29 | libc/sprintf.c |
29 | #endif /* !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) */ | 30 | #endif /* defined(__MINGW32__) || defined(__CYGWIN__) */ |
30 | libc/atoi.c | 31 | libc/atoi.c |
31 | libc/ctype.c | 32 | libc/ctype.c |
32 | libc/memcmp.c | 33 | libc/memcmp.c |
@@ -42,6 +43,9 @@ libc/strrchr.c | |||
42 | libc/strtok.c | 43 | libc/strtok.c |
43 | libc/strstr.c | 44 | libc/strstr.c |
44 | libc/mktime.c | 45 | libc/mktime.c |
46 | #endif /* !defined(SIMULATOR)*/ | ||
47 | |||
48 | /* Common */ | ||
45 | common/config.c | 49 | common/config.c |
46 | common/crc32.c | 50 | common/crc32.c |
47 | #ifdef MI4_FORMAT | 51 | #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 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES += -I$(FIRMDIR)/libc/include -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include | 10 | INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include |
11 | ifndef SIMVER | ||
12 | INCLUDES += -I$(FIRMDIR)/libc/include | ||
13 | endif | ||
11 | 14 | ||
12 | FIRMLIB_SRC += $(call preprocess, $(FIRMDIR)/SOURCES) | 15 | FIRMLIB_SRC += $(call preprocess, $(FIRMDIR)/SOURCES) |
13 | FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC)) | 16 | FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC)) |