6 files changed, 9 insertions, 8 deletions
diff --git a/apps/codecs/codec_crt0.c b/apps/codecs/codec_crt0.c
index ed31363..dd0f99f 100644
--- a/apps/codecs/codec_crt0.c
+++ b/apps/codecs/codec_crt0.c
@@ -36,7 +36,7 @@ extern enum codec_status codec_main(void);
 
 enum codec_status codec_start(void)
 {
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #ifdef USE_IRAM
     ci->memcpy(iramstart, iramcopy, iramend - iramstart);
     ci->memset(iedata, 0, iend - iedata);
diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES
index da77f97..49e7447 100644
--- a/apps/codecs/lib/SOURCES
+++ b/apps/codecs/lib/SOURCES
@@ -24,6 +24,6 @@ setjmp_cf.S
 setjmp_mips.S
 #endif
 
-#elif defined(SIMULATOR) && defined(__APPLE__)
+#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 osx.dummy.c
 #endif
diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/apps/codecs/lib/tlsf/src/tlsf.c
index 570e472..87f8d26 100644
--- a/apps/codecs/lib/tlsf/src/tlsf.c
+++ b/apps/codecs/lib/tlsf/src/tlsf.c
@@ -104,6 +104,7 @@
 #include <sys/mman.h>
 #endif
 
+#include "config.h"
 #include "tlsf.h"
 
 #if !defined(__GNUC__)
@@ -164,7 +165,8 @@
 #define PAGE_SIZE (getpagesize())
 #endif
 
-#if defined(ROCKBOX) && defined(SIMULATOR) || !defined(ROCKBOX)
+#if defined(ROCKBOX) && (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(DEBUG) \
+    || !defined(ROCKBOX)
 int printf(const char* fmt, ...);
 #define PRINT_MSG(fmt, args...) printf(fmt, ## args)
 #define ERROR_MSG(fmt, args...) printf(fmt, ## args)
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c
index 8c7189e..bde2238 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/apps/codecs/libm4a/demux.c
@@ -37,10 +37,8 @@
 
 #include "m4a.h"
 
-#if defined(DEBUG) || defined(SIMULATOR)
-#ifdef DEBUGF
 #undef DEBUGF
-#endif
+#if defined(DEBUG)
 #define DEBUGF qtmovie->stream->ci->debugf
 #else
 #define DEBUGF(...)
diff --git a/apps/codecs/libspc/spc_codec.h b/apps/codecs/libspc/spc_codec.h
index 95d09fa..b3a445c 100644
--- a/apps/codecs/libspc/spc_codec.h
+++ b/apps/codecs/libspc/spc_codec.h
@@ -51,7 +51,7 @@
 /* TGB is the only target fast enough for gaussian and realtime BRR decode */
 /* echo is almost fast enough but not quite */
 #if defined(TOSHIBA_GIGABEAT_F) || defined(TOSHIBA_GIGABEAT_S) ||\
-    defined(SIMULATOR) || MEMORYSIZE <= 2
+    (CONFIG_PLATFORM & PLATFORM_HOSTED) || MEMORYSIZE <= 2
     /* Don't cache BRR waves */
     #define SPC_BRRCACHE 0 
     
diff --git a/apps/codecs/libtremor/ctype.c b/apps/codecs/libtremor/ctype.c
index 359be61..9f22047 100644
--- a/apps/codecs/libtremor/ctype.c
+++ b/apps/codecs/libtremor/ctype.c
@@ -1,3 +1,4 @@
-#ifndef SIMULATOR
+#include "config.h"
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #include "libc/ctype.c"
 #endif