diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/codec_crt0.c | 2 | ||||
-rw-r--r-- | apps/codecs/lib/SOURCES | 2 | ||||
-rw-r--r-- | apps/codecs/lib/tlsf/src/tlsf.c | 4 | ||||
-rw-r--r-- | apps/codecs/libm4a/demux.c | 4 | ||||
-rw-r--r-- | apps/codecs/libspc/spc_codec.h | 2 | ||||
-rw-r--r-- | apps/codecs/libtremor/ctype.c | 3 |
6 files changed, 9 insertions, 8 deletions
diff --git a/apps/codecs/codec_crt0.c b/apps/codecs/codec_crt0.c index ed313634e3..dd0f99ffd8 100644 --- a/apps/codecs/codec_crt0.c +++ b/apps/codecs/codec_crt0.c | |||
@@ -36,7 +36,7 @@ extern enum codec_status codec_main(void); | |||
36 | 36 | ||
37 | enum codec_status codec_start(void) | 37 | enum codec_status codec_start(void) |
38 | { | 38 | { |
39 | #ifndef SIMULATOR | 39 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
40 | #ifdef USE_IRAM | 40 | #ifdef USE_IRAM |
41 | ci->memcpy(iramstart, iramcopy, iramend - iramstart); | 41 | ci->memcpy(iramstart, iramcopy, iramend - iramstart); |
42 | ci->memset(iedata, 0, iend - iedata); | 42 | ci->memset(iedata, 0, iend - iedata); |
diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES index da77f97d30..49e744721d 100644 --- a/apps/codecs/lib/SOURCES +++ b/apps/codecs/lib/SOURCES | |||
@@ -24,6 +24,6 @@ setjmp_cf.S | |||
24 | setjmp_mips.S | 24 | setjmp_mips.S |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #elif defined(SIMULATOR) && defined(__APPLE__) | 27 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) |
28 | osx.dummy.c | 28 | osx.dummy.c |
29 | #endif | 29 | #endif |
diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/apps/codecs/lib/tlsf/src/tlsf.c index 570e472607..87f8d262ee 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.c +++ b/apps/codecs/lib/tlsf/src/tlsf.c | |||
@@ -104,6 +104,7 @@ | |||
104 | #include <sys/mman.h> | 104 | #include <sys/mman.h> |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | #include "config.h" | ||
107 | #include "tlsf.h" | 108 | #include "tlsf.h" |
108 | 109 | ||
109 | #if !defined(__GNUC__) | 110 | #if !defined(__GNUC__) |
@@ -164,7 +165,8 @@ | |||
164 | #define PAGE_SIZE (getpagesize()) | 165 | #define PAGE_SIZE (getpagesize()) |
165 | #endif | 166 | #endif |
166 | 167 | ||
167 | #if defined(ROCKBOX) && defined(SIMULATOR) || !defined(ROCKBOX) | 168 | #if defined(ROCKBOX) && (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(DEBUG) \ |
169 | || !defined(ROCKBOX) | ||
168 | int printf(const char* fmt, ...); | 170 | int printf(const char* fmt, ...); |
169 | #define PRINT_MSG(fmt, args...) printf(fmt, ## args) | 171 | #define PRINT_MSG(fmt, args...) printf(fmt, ## args) |
170 | #define ERROR_MSG(fmt, args...) printf(fmt, ## args) | 172 | #define ERROR_MSG(fmt, args...) printf(fmt, ## args) |
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index 8c7189e158..bde2238409 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -37,10 +37,8 @@ | |||
37 | 37 | ||
38 | #include "m4a.h" | 38 | #include "m4a.h" |
39 | 39 | ||
40 | #if defined(DEBUG) || defined(SIMULATOR) | ||
41 | #ifdef DEBUGF | ||
42 | #undef DEBUGF | 40 | #undef DEBUGF |
43 | #endif | 41 | #if defined(DEBUG) |
44 | #define DEBUGF qtmovie->stream->ci->debugf | 42 | #define DEBUGF qtmovie->stream->ci->debugf |
45 | #else | 43 | #else |
46 | #define DEBUGF(...) | 44 | #define DEBUGF(...) |
diff --git a/apps/codecs/libspc/spc_codec.h b/apps/codecs/libspc/spc_codec.h index 95d09fa091..b3a445c596 100644 --- a/apps/codecs/libspc/spc_codec.h +++ b/apps/codecs/libspc/spc_codec.h | |||
@@ -51,7 +51,7 @@ | |||
51 | /* TGB is the only target fast enough for gaussian and realtime BRR decode */ | 51 | /* TGB is the only target fast enough for gaussian and realtime BRR decode */ |
52 | /* echo is almost fast enough but not quite */ | 52 | /* echo is almost fast enough but not quite */ |
53 | #if defined(TOSHIBA_GIGABEAT_F) || defined(TOSHIBA_GIGABEAT_S) ||\ | 53 | #if defined(TOSHIBA_GIGABEAT_F) || defined(TOSHIBA_GIGABEAT_S) ||\ |
54 | defined(SIMULATOR) || MEMORYSIZE <= 2 | 54 | (CONFIG_PLATFORM & PLATFORM_HOSTED) || MEMORYSIZE <= 2 |
55 | /* Don't cache BRR waves */ | 55 | /* Don't cache BRR waves */ |
56 | #define SPC_BRRCACHE 0 | 56 | #define SPC_BRRCACHE 0 |
57 | 57 | ||
diff --git a/apps/codecs/libtremor/ctype.c b/apps/codecs/libtremor/ctype.c index 359be61e5a..9f22047675 100644 --- a/apps/codecs/libtremor/ctype.c +++ b/apps/codecs/libtremor/ctype.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifndef SIMULATOR | 1 | #include "config.h" |
2 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
2 | #include "libc/ctype.c" | 3 | #include "libc/ctype.c" |
3 | #endif | 4 | #endif |