len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-17 03:57:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove sim_tasks from the sdl application build.

Browse source 
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
This commit is contained in:
Thomas Martitz 2011-11-17 19:52:59 +00:00
parent 7e211ff9d1
commit 71d73fd470
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/debug_menu.c
View file

@ -1771,7 +1771,7 @@ static bool dbg_fm_radio(void)
#endif /* CONFIG_TUNER */ #endif /* CONFIG_TUNER */
#endif /* !SIMULATOR */ #endif /* !SIMULATOR */
#ifdef HAVE_LCD_BITMAP #if defined(HAVE_LCD_BITMAP) && !defined(APPLICATION)
extern bool do_screendump_instead_of_usb; extern bool do_screendump_instead_of_usb;
static bool dbg_screendump(void) static bool dbg_screendump(void)
@ -2057,8 +2057,10 @@ static const struct the_menu_item menuitems[] = {
#if (CONFIG_PLATFORM & PLATFORM_NATIVE) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
{ "View battery", view_battery }, { "View battery", view_battery },
#endif #endif
#ifndef APPLICATION
{ "Screendump", dbg_screendump }, { "Screendump", dbg_screendump },
#endif #endif
#endif
#if (CONFIG_PLATFORM & PLATFORM_NATIVE) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
{ "View HW info", dbg_hw_info }, { "View HW info", dbg_hw_info },
#endif #endif

4
apps/main.c
View file

@ -131,7 +131,9 @@
#endif #endif
#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
#ifdef SIMULATOR
#include "sim_tasks.h" #include "sim_tasks.h"
#endif
#include "system-sdl.h" #include "system-sdl.h"
#define HAVE_ARGV_MAIN #define HAVE_ARGV_MAIN
/* Don't use SDL_main on windows -> no more stdio redirection */ /* Don't use SDL_main on windows -> no more stdio redirection */
@ -360,7 +362,7 @@ static void init(void)
button_init(); button_init();
powermgmt_init(); powermgmt_init();
backlight_init(); backlight_init();
#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) #ifdef SIMULATOR
sim_tasks_init(); sim_tasks_init();
#endif #endif
#if (CONFIG_PLATFORM & PLATFORM_ANDROID) #if (CONFIG_PLATFORM & PLATFORM_ANDROID)

7
firmware/target/hosted/sdl/button-sdl.c
View file

@ -309,10 +309,9 @@ static void button_event(int key, bool pressed)
{ {
int new_btn = 0; int new_btn = 0;
static bool usb_connected = false; static bool usb_connected = false;
if (usb_connected && key != USB_KEY)
return;
switch (key) switch (key)
{ {
#ifdef SIMULATOR
case USB_KEY: case USB_KEY:
if (!pressed) if (!pressed)
{ {
@ -320,7 +319,7 @@ static void button_event(int key, bool pressed)
sim_trigger_usb(usb_connected); sim_trigger_usb(usb_connected);
} }
return; return;
#endif
#if (CONFIG_PLATFORM & PLATFORM_PANDORA) #if (CONFIG_PLATFORM & PLATFORM_PANDORA)
case SDLK_LCTRL: case SDLK_LCTRL:
/* Will post SDL_USEREVENT in shutdown_hw() if successful. */ /* Will post SDL_USEREVENT in shutdown_hw() if successful. */
@ -372,6 +371,7 @@ static void button_event(int key, bool pressed)
} }
break; break;
#endif #endif
#ifndef APPLICATION
case SDLK_KP0: case SDLK_KP0:
case SDLK_F5: case SDLK_F5:
if(pressed) if(pressed)
@ -380,6 +380,7 @@ static void button_event(int key, bool pressed)
return; return;
} }
break; break;
#endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
case SDLK_F4: case SDLK_F4:
if(pressed) if(pressed)

2
uisimulator/common/SOURCES
View file

@ -5,12 +5,12 @@ font-player.c
lcd-playersim.c lcd-playersim.c
sim_icons.c sim_icons.c
#endif #endif
sim_tasks.c
fmradio.c fmradio.c
backlight-sim.c backlight-sim.c
#endif #endif
io.c io.c
sim_tasks.c
/* this is still needed for application since it has some stubs */ /* this is still needed for application since it has some stubs */
#if !(CONFIG_PLATFORM & PLATFORM_MAEMO) #if !(CONFIG_PLATFORM & PLATFORM_MAEMO)
powermgmt-sim.c powermgmt-sim.c