From 71d73fd470e339adff65aff0db6a44d1d6418b31 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 17 Nov 2011 19:52:59 +0000 Subject: Remove sim_tasks from the sdl application build. This unfortunately removes the screendump feature, but usually there are better desktop apps for that. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31011 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 4 +++- apps/main.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 809644b..79a0752 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1771,7 +1771,7 @@ static bool dbg_fm_radio(void) #endif /* CONFIG_TUNER */ #endif /* !SIMULATOR */ -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(APPLICATION) extern bool do_screendump_instead_of_usb; static bool dbg_screendump(void) @@ -2057,8 +2057,10 @@ static const struct the_menu_item menuitems[] = { #if (CONFIG_PLATFORM & PLATFORM_NATIVE) { "View battery", view_battery }, #endif +#ifndef APPLICATION { "Screendump", dbg_screendump }, #endif +#endif #if (CONFIG_PLATFORM & PLATFORM_NATIVE) { "View HW info", dbg_hw_info }, #endif diff --git a/apps/main.c b/apps/main.c index 9d83c62..50da787 100644 --- a/apps/main.c +++ b/apps/main.c @@ -131,7 +131,9 @@ #endif #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) +#ifdef SIMULATOR #include "sim_tasks.h" +#endif #include "system-sdl.h" #define HAVE_ARGV_MAIN /* Don't use SDL_main on windows -> no more stdio redirection */ @@ -360,7 +362,7 @@ static void init(void) button_init(); powermgmt_init(); backlight_init(); -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) +#ifdef SIMULATOR sim_tasks_init(); #endif #if (CONFIG_PLATFORM & PLATFORM_ANDROID) -- cgit v1.1