diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-25 18:27:17 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-25 18:27:17 +0000 |
commit | 04b7cefd63ab23defc313ad5accbe4aa00e0165e (patch) | |
tree | bb95f1190cd12f12df112a60c6541301cdaf46d5 | |
parent | 6343111e00da93a8b792b4e6245184be31b8feff (diff) | |
download | rockbox-04b7cefd63ab23defc313ad5accbe4aa00e0165e.tar.gz rockbox-04b7cefd63ab23defc313ad5accbe4aa00e0165e.zip |
fix mem* wrappers in UI on cygwin, by not building certain plugins on sim, rather than building empty ones
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19856 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 17 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 3 | ||||
-rw-r--r-- | apps/plugins/chip8.c | 4 | ||||
-rw-r--r-- | apps/plugins/firmware_flash.c | 3 | ||||
-rw-r--r-- | apps/plugins/iriver_flash.c | 3 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 5 | ||||
-rw-r--r-- | apps/plugins/video.c | 2 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 3 |
8 files changed, 12 insertions, 28 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index d982ecb4c3..6257a222bd 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -1,10 +1,8 @@ | |||
1 | /* plugins common to all models */ | 1 | /* plugins common to all models */ |
2 | battery_bench.c | ||
3 | chessclock.c | 2 | chessclock.c |
4 | credits.c | 3 | credits.c |
5 | cube.c | 4 | cube.c |
6 | dict.c | 5 | dict.c |
7 | firmware_flash.c | ||
8 | jackpot.c | 6 | jackpot.c |
9 | keybox.c | 7 | keybox.c |
10 | logo.c | 8 | logo.c |
@@ -12,7 +10,6 @@ mosaique.c | |||
12 | properties.c | 10 | properties.c |
13 | random_folder_advance_config.c | 11 | random_folder_advance_config.c |
14 | rockblox.c | 12 | rockblox.c |
15 | rockbox_flash.c | ||
16 | search.c | 13 | search.c |
17 | settings_dumper.c | 14 | settings_dumper.c |
18 | snow.c | 15 | snow.c |
@@ -24,6 +21,13 @@ viewer.c | |||
24 | #ifdef HAVE_BACKLIGHT | 21 | #ifdef HAVE_BACKLIGHT |
25 | lamp.c | 22 | lamp.c |
26 | #endif /* HAVE_BACKLIGHT */ | 23 | #endif /* HAVE_BACKLIGHT */ |
24 | #ifndef SIMULATOR | ||
25 | battery_bench.c | ||
26 | firmware_flash.c | ||
27 | #endif /* SIMULATOR */ | ||
28 | #if (CONFIG_CPU == SH7034) | ||
29 | rockbox_flash.c | ||
30 | #endif /* CONFIG_CPU */ | ||
27 | 31 | ||
28 | #ifndef OLYMPUS_MROBE_500 | 32 | #ifndef OLYMPUS_MROBE_500 |
29 | 33 | ||
@@ -84,7 +88,8 @@ solitaire.c | |||
84 | sokoban.c | 88 | sokoban.c |
85 | star.c | 89 | star.c |
86 | starfield.c | 90 | starfield.c |
87 | #if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC) | 91 | #if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC) && \ |
92 | !defined(SIMULATOR) | ||
88 | video.c | 93 | video.c |
89 | #endif | 94 | #endif |
90 | vu_meter.c | 95 | vu_meter.c |
@@ -128,7 +133,9 @@ wav2wv.c | |||
128 | /* not for Ondio, has no remote control pin */ | 133 | /* not for Ondio, has no remote control pin */ |
129 | alpine_cdc.c | 134 | alpine_cdc.c |
130 | #endif | 135 | #endif |
136 | #if defined(HAVE_LCD_BITMAP) && !defined(SIMULATOR) | ||
131 | splitedit.c | 137 | splitedit.c |
138 | #endif | ||
132 | #endif /* CONFIG_CODEC */ | 139 | #endif /* CONFIG_CODEC */ |
133 | 140 | ||
134 | #if LCD_DEPTH > 1 /* non-mono bitmap targets */ | 141 | #if LCD_DEPTH > 1 /* non-mono bitmap targets */ |
@@ -139,7 +146,7 @@ matrix.c | |||
139 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | 146 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) |
140 | iriverify.c | 147 | iriverify.c |
141 | #endif | 148 | #endif |
142 | #if defined(IRIVER_H100_SERIES) | 149 | #if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR) |
143 | iriver_flash.c | 150 | iriver_flash.c |
144 | #endif | 151 | #endif |
145 | 152 | ||
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index f87886a2b9..40b9998dcb 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * KIND, either express or implied. | 19 | * KIND, either express or implied. |
20 | * | 20 | * |
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #ifndef SIMULATOR /* not for the simulator */ | ||
23 | 22 | ||
24 | #include "version.h" | 23 | #include "version.h" |
25 | #include "plugin.h" | 24 | #include "plugin.h" |
@@ -560,5 +559,3 @@ int main(void) | |||
560 | 559 | ||
561 | return PLUGIN_OK; | 560 | return PLUGIN_OK; |
562 | } | 561 | } |
563 | |||
564 | #endif /* SIMULATOR */ | ||
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index ecd40f687b..f18fccebb4 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -21,9 +21,6 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | /* Only build for (correct) target */ | ||
25 | #ifdef HAVE_LCD_BITMAP | ||
26 | |||
27 | PLUGIN_HEADER | 24 | PLUGIN_HEADER |
28 | 25 | ||
29 | #define EXTERN static | 26 | #define EXTERN static |
@@ -1456,4 +1453,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1456 | else | 1453 | else |
1457 | return PLUGIN_ERROR; | 1454 | return PLUGIN_ERROR; |
1458 | } | 1455 | } |
1459 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/firmware_flash.c b/apps/plugins/firmware_flash.c index c855fb669f..ebf4242e2a 100644 --- a/apps/plugins/firmware_flash.c +++ b/apps/plugins/firmware_flash.c | |||
@@ -23,8 +23,6 @@ | |||
23 | ****************************************************************************/ | 23 | ****************************************************************************/ |
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #ifndef SIMULATOR /* only for target */ | ||
27 | |||
28 | /* define DUMMY if you only want to "play" with the UI, does no harm */ | 26 | /* define DUMMY if you only want to "play" with the UI, does no harm */ |
29 | /* #define DUMMY */ | 27 | /* #define DUMMY */ |
30 | 28 | ||
@@ -1085,4 +1083,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1085 | } | 1083 | } |
1086 | 1084 | ||
1087 | #endif /* ifdef PLATFORM_ID */ | 1085 | #endif /* ifdef PLATFORM_ID */ |
1088 | #endif /* #ifndef SIMULATOR */ | ||
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index b2273f1b86..0b3833b9cf 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c | |||
@@ -24,8 +24,6 @@ | |||
24 | 24 | ||
25 | /* All CFI flash routines are copied and ported from firmware_flash.c */ | 25 | /* All CFI flash routines are copied and ported from firmware_flash.c */ |
26 | 26 | ||
27 | #ifndef SIMULATOR /* only for target */ | ||
28 | |||
29 | unsigned char *audiobuf; | 27 | unsigned char *audiobuf; |
30 | ssize_t audiobuf_size; | 28 | ssize_t audiobuf_size; |
31 | 29 | ||
@@ -815,4 +813,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
815 | } | 813 | } |
816 | 814 | ||
817 | #endif /* ifdef PLATFORM_ID */ | 815 | #endif /* ifdef PLATFORM_ID */ |
818 | #endif /* #ifndef SIMULATOR */ | ||
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index 28b4de8909..81a8b2416a 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -21,9 +21,6 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #ifndef SIMULATOR | ||
25 | #ifdef HAVE_LCD_BITMAP | ||
26 | |||
27 | PLUGIN_HEADER | 24 | PLUGIN_HEADER |
28 | 25 | ||
29 | /* variable button definitions */ | 26 | /* variable button definitions */ |
@@ -1271,5 +1268,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1271 | } | 1268 | } |
1272 | return splitedit_exit_code; | 1269 | return splitedit_exit_code; |
1273 | } | 1270 | } |
1274 | #endif | ||
1275 | #endif | ||
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index bd2ddb5de6..bcbbb99d80 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "system.h" | 31 | #include "system.h" |
32 | #include "lib/helper.h" | 32 | #include "lib/helper.h" |
33 | 33 | ||
34 | #ifndef SIMULATOR /* not for simulator by now */ | ||
35 | #ifdef HAVE_LCD_BITMAP /* and definitely not for the Player, haha */ | 34 | #ifdef HAVE_LCD_BITMAP /* and definitely not for the Player, haha */ |
36 | 35 | ||
37 | PLUGIN_HEADER | 36 | PLUGIN_HEADER |
@@ -1026,5 +1025,4 @@ enum plugin_status plugin_start(const void* parameter) | |||
1026 | } | 1025 | } |
1027 | 1026 | ||
1028 | #endif /* #ifdef HAVE_LCD_BITMAP */ | 1027 | #endif /* #ifdef HAVE_LCD_BITMAP */ |
1029 | #endif /* #ifndef SIMULATOR */ | ||
1030 | 1028 | ||
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 77d2924ebb..673c080102 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -20,8 +20,6 @@ | |||
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "lib/fixedpoint.h" | 21 | #include "lib/fixedpoint.h" |
22 | 22 | ||
23 | #if defined(HAVE_LCD_BITMAP) | ||
24 | |||
25 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
26 | 24 | ||
27 | /* variable button definitions */ | 25 | /* variable button definitions */ |
@@ -822,4 +820,3 @@ enum plugin_status plugin_start(const void* parameter) { | |||
822 | lastbutton = button; | 820 | lastbutton = button; |
823 | } | 821 | } |
824 | } | 822 | } |
825 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||