summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-09-01 22:09:43 +0000
committerThomas Martitz <kugel@rockbox.org>2010-09-01 22:09:43 +0000
commitc00fbc4d06dee2f075e8bb1671350c3079c992bf (patch)
tree487129015ad5b242083ed8271adbc97cc630c5b5
parenta4264eb89a21a3c9cc765df76ce293cfd3e73a49 (diff)
downloadrockbox-c00fbc4d06dee2f075e8bb1671350c3079c992bf.tar.gz
rockbox-c00fbc4d06dee2f075e8bb1671350c3079c992bf.zip
Android: Don't compile sim_tasks.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27973 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c7
-rw-r--r--uisimulator/common/SOURCES4
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/main.c b/apps/main.c
index 0c2f0751b3..5f2c9e5a58 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -121,11 +121,8 @@
121#define MAIN_NORETURN_ATTR 121#define MAIN_NORETURN_ATTR
122#endif 122#endif
123 123
124#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
125#include "sim_tasks.h"
126#endif
127
128#if (CONFIG_PLATFORM & PLATFORM_SDL) 124#if (CONFIG_PLATFORM & PLATFORM_SDL)
125#include "sim_tasks.h"
129#include "system-sdl.h" 126#include "system-sdl.h"
130#define HAVE_ARGV_MAIN 127#define HAVE_ARGV_MAIN
131/* Don't use SDL_main on windows -> no more stdio redirection */ 128/* Don't use SDL_main on windows -> no more stdio redirection */
@@ -350,7 +347,9 @@ static void init(void)
350 show_logo(); 347 show_logo();
351 button_init(); 348 button_init();
352 backlight_init(); 349 backlight_init();
350#if (CONFIG_PLATFORM & PLATFORM_SDL)
353 sim_tasks_init(); 351 sim_tasks_init();
352#endif
354 lang_init(core_language_builtin, language_strings, 353 lang_init(core_language_builtin, language_strings,
355 LANG_LAST_INDEX_IN_ARRAY); 354 LANG_LAST_INDEX_IN_ARRAY);
356#ifdef DEBUG 355#ifdef DEBUG
diff --git a/uisimulator/common/SOURCES b/uisimulator/common/SOURCES
index 39f008b9dd..db5b22fa42 100644
--- a/uisimulator/common/SOURCES
+++ b/uisimulator/common/SOURCES
@@ -9,10 +9,10 @@ fmradio.c
9backlight-sim.c 9backlight-sim.c
10#endif 10#endif
11 11
12#if !(CONFIG_PLATFORM & PLATFORM_ANDROID) 12#if (CONFIG_PLATFORM & PLATFORM_SDL)
13io.c 13io.c
14sim_tasks.c
14#endif 15#endif
15/* this is still needed for application since it has some stubs */ 16/* this is still needed for application since it has some stubs */
16powermgmt-sim.c 17powermgmt-sim.c
17sim_tasks.c
18stubs.c 18stubs.c