diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
commit | 35e8b1429a2cdcf6580f6d25890fed9865165d0b (patch) | |
tree | 084be19a29bffa879eee8e3cad92d8f3b342a337 /apps/plugins/doom | |
parent | 02e04585bdf1fbd00cf84d2000f59ec198440cb3 (diff) | |
download | rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.tar.gz rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.zip |
Rockbox as an application: Replace many occurences of #ifdef SIMULATOR with #if (CONFIG_PLATFORM & PLATFORM_HOSTED) (or equivalently).
The simulator defines PLATFORM_HOSTED, as RaaA will do (RaaA will not define SIMULATOR).
The new define is to (de-)select code to compile on hosted platforms generally.
Should be no functional change to targets or the simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27019 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 6 | ||||
-rw-r--r-- | apps/plugins/doom/rockmacros.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 26afdd93db..042212812a 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -62,7 +62,7 @@ int fileexists(const char * fname) | |||
62 | return -1; | 62 | return -1; |
63 | } | 63 | } |
64 | 64 | ||
65 | #ifndef SIMULATOR | 65 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
66 | int my_open(const char *file, int flags, ...) | 66 | int my_open(const char *file, int flags, ...) |
67 | { | 67 | { |
68 | if(fpoint==8) | 68 | if(fpoint==8) |
@@ -111,7 +111,7 @@ int my_close(int id) | |||
111 | 111 | ||
112 | bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates | 112 | bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates |
113 | 113 | ||
114 | #ifndef SIMULATOR | 114 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
115 | // Here is a hacked up printf command to get the output from the game. | 115 | // Here is a hacked up printf command to get the output from the game. |
116 | int printf(const char *fmt, ...) | 116 | int printf(const char *fmt, ...) |
117 | { | 117 | { |
@@ -751,7 +751,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
751 | printf("There were still: %d files open\n", fpoint); | 751 | printf("There were still: %d files open\n", fpoint); |
752 | while(fpoint>0) | 752 | while(fpoint>0) |
753 | { | 753 | { |
754 | #ifdef SIMULATOR | 754 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
755 | close(filearray[fpoint]); | 755 | close(filearray[fpoint]); |
756 | #else | 756 | #else |
757 | rb->close(filearray[fpoint]); | 757 | rb->close(filearray[fpoint]); |
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h index 89c943622a..3276aa1539 100644 --- a/apps/plugins/doom/rockmacros.h +++ b/apps/plugins/doom/rockmacros.h | |||
@@ -42,7 +42,7 @@ char *my_strtok( char * s, const char * delim ); | |||
42 | #undef read_line | 42 | #undef read_line |
43 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) | 43 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) |
44 | 44 | ||
45 | #ifdef SIMULATOR | 45 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
46 | #define open(a, ...) rb->open((a), __VA_ARGS__) | 46 | #define open(a, ...) rb->open((a), __VA_ARGS__) |
47 | #define close(a) rb->close((a)) | 47 | #define close(a) rb->close((a)) |
48 | #else | 48 | #else |