len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-04-11 16:37:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "sdlapp: Enable compilation of most apps/games"

Browse source 
This reverts commit 96b5642c93.

Reason for revert: Accidentlly merged this before it was ready.

Change-Id: I9344988f6556b774479dd4fd209f30e450ad0858
This commit is contained in:
Solomon Peachy 2026-03-30 20:52:36 -04:00
parent 78ba3211be
commit 65f2105445
30 changed files with 93 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/plugins/SOURCES
View file

@ -157,10 +157,7 @@ pong.c
sliding_puzzle.c
snake.c
snake2.c
#ifndef SDLAPP
/* Too many buttons for SDL */
solitaire.c
#endif
sokoban.c
star.c
starfield.c

2
apps/plugins/SOURCES.app_build
View file

@ -1,4 +1,4 @@
#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1) || defined(SDLAPP)
#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1)
/* In devices running RockBox as an application, but having a keypad */
#include "SOURCES"
#else

6
apps/plugins/blackjack.c
View file

@ -628,7 +628,7 @@ enum {
#define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif
@ -641,10 +641,6 @@ enum {
#define BJACK_SELECT BUTTON_CENTER
#define BJACK_SELECT_NAME "BUTTON_CENTER"
#endif
#ifndef BJACK_QUIT
#define BJACK_QUIT BUTTON_BOTTOMRIGHT
#define BJACK_QUIT_NAME "BUTTON_BOTTOMRIGHT"
#endif
#ifndef BJACK_MAX
#define BJACK_MAX BUTTON_TOPRIGHT
#endif

8
apps/plugins/boomshine.lua
View file

@ -707,9 +707,7 @@ if HAS_TOUCHSCREEN then
rb.touchscreen_mode(rb.TOUCHSCREEN_POINT)
end
if rb.backlight_force_on then
rb.backlight_force_on()
end
rb.backlight_force_on()
local eva = rockev.register("action", action_event, rb.HZ / 10)
@ -763,9 +761,7 @@ else
end
-- Restore user backlight settings
if rb.backlight_use_settings then
rb.backlight_use_settings()
end
rb.backlight_use_settings()
if rb.cpu_boost then rb.cpu_boost(false) end
os.exit()

5
apps/plugins/brickmania.c
View file

@ -382,7 +382,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define UP BUTTON_UP
#define DOWN BUTTON_DOWN
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif
@ -408,9 +408,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#ifndef DOWN
#define DOWN BUTTON_BOTTOMMIDDLE
#endif
#ifndef QUIT
#define QUIT BUTTON_BOTTOMRIGHT
#endif
#endif
/* MI: fallback for the suicide combination */

5
apps/plugins/calculator.c
View file

@ -557,7 +557,7 @@ F3: equal to "="
#define CALCULATOR_CALC BUTTON_MENU
#define CALCULATOR_CLEAR BUTTON_USER
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif
@ -583,9 +583,6 @@ F3: equal to "="
#ifndef CALCULATOR_CLEAR
#define CALCULATOR_CLEAR BUTTON_TOPRIGHT
#endif
#ifndef CALCULATOR_QUIT
#define CALCULATOR_QUIT BUTTON_TOPLEFT
#endif
#include "lib/pluginlib_touchscreen.h"
static struct ts_raster calc_raster = { X_0_POS, Y_1_POS,

5
apps/plugins/calendar.c
View file

@ -409,6 +409,9 @@
#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define CALENDAR_QUIT (BUTTON_BACK|BUTTON_MENU)
#define CALENDAR_SELECT BUTTON_PLAY
@ -440,7 +443,7 @@
#define CALENDAR_NEXT_MONTH BUTTON_POWER
#define CALENDAR_PREV_MONTH BUTTON_USER
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error "No keypad setting."
#endif

5
apps/plugins/chessclock.c
View file

@ -418,7 +418,7 @@
#define CHC_SETTINGS_OK BUTTON_SELECT
#define CHC_SETTINGS_CANCEL BUTTON_BACK
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif
@ -444,9 +444,6 @@
#ifndef CHC_MENU
#define CHC_MENU BUTTON_TOPRIGHT
#endif
#ifndef CHC_QUIT
#define CHC_QUIT BUTTON_BOTTOMRIGHT
#endif
#endif

5
apps/plugins/chip8.c
View file

@ -1314,7 +1314,10 @@ CONFIG_KEYPAD == MROBE500_PAD
#define CHIP8_KEY8 BUTTON_POWER
#define CHIP8_KEY9 BUTTON_USER
#elif !defined(HAVE_TOUCHSCREEN)
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#else
#error No keymap defined!
#endif

5
apps/plugins/cube.c
View file

@ -392,6 +392,9 @@
#define CUBE_PAUSE BUTTON_PLAY
#define CUBE_HIGHSPEED BUTTON_BACK
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define CUBE_QUIT BUTTON_BACK
#define CUBE_NEXT BUTTON_RIGHT
@ -422,7 +425,7 @@
#define CUBE_PAUSE BUTTON_USER
#define CUBE_HIGHSPEED BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

3
apps/plugins/fft/fft.c
View file

@ -56,8 +56,7 @@ static const struct button_mapping *plugin_contexts[] = { pla_main_ctx };
#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD) \
|| defined(SDLAPP)
|| (CONFIG_KEYPAD == IPOD_4G_PAD)
#define FFT_QUIT PLA_UP
#else
#define FFT_QUIT PLA_EXIT

5
apps/plugins/flipit.c
View file

@ -482,6 +482,9 @@
#define FLIPIT_STEP_BY_STEP BUTTON_VOL_UP
#define FLIPIT_TOGGLE BUTTON_SELECT
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define FLIPIT_LEFT BUTTON_LEFT
@ -520,7 +523,7 @@
#define FLIPIT_STEP_BY_STEP BUTTON_POWER
#define FLIPIT_TOGGLE BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/invadrox.c
View file

@ -281,6 +281,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_SELECT
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define QUIT BUTTON_BACK
@ -302,7 +305,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error INVADROX: Unsupported keypad
#endif

5
apps/plugins/jewels.c
View file

@ -367,6 +367,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define HK_SELECT "SELECT"
#define HK_CANCEL "BACK"
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN
@ -397,7 +400,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define HK_SELECT "A"
#define HK_CANCEL "B"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

2
apps/plugins/metronome.c
View file

@ -86,8 +86,6 @@ enum metronome_errors
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD)
#define METRONOME_QUIT PLA_UP
#elif defined(SDLAPP)
#define METRONOME_QUIT PLA_CANCEL
#else
#define METRONOME_QUIT PLA_EXIT
#endif

5
apps/plugins/minesweeper.c
View file

@ -442,6 +442,9 @@ CONFIG_KEYPAD == MROBE500_PAD
# define MINESWP_DISCOVER (BUTTON_MENU|BUTTON_REPEAT)
# define MINESWP_INFO BUTTON_MENU
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == RG_NANO_PAD
# define MINESWP_LEFT BUTTON_LEFT
# define MINESWP_RIGHT BUTTON_RIGHT
@ -462,7 +465,7 @@ CONFIG_KEYPAD == MROBE500_PAD
# define MINESWP_DISCOVER BUTTON_SELECT
# define MINESWP_INFO BUTTON_MENU
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/mp3_encoder.c
View file

@ -2577,6 +2577,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define MP3ENC_DONE BUTTON_POWER
#define MP3ENC_SELECT BUTTON_SELECT
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define MP3ENC_PREV BUTTON_LEFT
#define MP3ENC_NEXT BUTTON_RIGHT
@ -2595,7 +2598,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define MP3ENC_DONE BUTTON_POWER
#define MP3ENC_SELECT BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/oscilloscope.c
View file

@ -550,6 +550,9 @@
#define OSCILLOSCOPE_VOL_UP BUTTON_UP
#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == RG_NANO_PAD
#define OSCILLOSCOPE_QUIT BUTTON_START
#define OSCILLOSCOPE_DRAWMODE BUTTON_X
@ -573,7 +576,7 @@
#define OSCILLOSCOPE_VOL_UP BUTTON_UP
#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/pegbox.c
View file

@ -711,6 +711,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define LVL_UP_TEXT "UP+MENU"
#define LVL_DOWN_TEXT "DOWN+MENU"
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == RG_NANO_PAD
#define PEGBOX_SELECT BUTTON_A
#define PEGBOX_QUIT BUTTON_START
@ -745,7 +748,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define LVL_DOWN_TEXT "Start"
#define SELECT_TEXT "A"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error "Unsupported keymap!"
#endif

5
apps/plugins/pong.c
View file

@ -318,6 +318,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PONG_RIGHT_UP BUTTON_BACK
#define PONG_RIGHT_DOWN BUTTON_RIGHT
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define PONG_QUIT BUTTON_BACK
#define PONG_PAUSE BUTTON_PLAY
@ -342,7 +345,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PONG_RIGHT_UP BUTTON_MENU
#define PONG_RIGHT_DOWN BUTTON_POWER
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/rockblox.c
View file

@ -458,6 +458,9 @@
#define ROCKBLOX_RESTART BUTTON_BACK
#define ROCKBLOX_SCROLL_ENABLED 1
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define ROCKBLOX_OFF (BUTTON_BACK|BUTTON_REPEAT)
#define ROCKBLOX_ROTATE_CCW BUTTON_UP
@ -492,7 +495,7 @@
#define ROCKBLOX_DROP BUTTON_SELECT
#define ROCKBLOX_RESTART BUTTON_USER
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/sliding_puzzle.c
View file

@ -348,6 +348,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PUZZLE_SHUFFLE BUTTON_BACK
#define PUZZLE_PICTURE BUTTON_PLAY
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define PUZZLE_QUIT BUTTON_BACK
#define PUZZLE_LEFT BUTTON_LEFT
@ -375,7 +378,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PUZZLE_SHUFFLE BUTTON_SELECT
#define PUZZLE_PICTURE BUTTON_MENU
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/snake.c
View file

@ -305,6 +305,9 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
#define SNAKE_DOWN BUTTON_DOWN
#define SNAKE_PLAYPAUSE BUTTON_PLAY
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define SNAKE_QUIT BUTTON_BACK
#define SNAKE_LEFT BUTTON_LEFT
@ -329,7 +332,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
#define SNAKE_DOWN BUTTON_DOWN
#define SNAKE_PLAYPAUSE BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/snake2.c
View file

@ -449,6 +449,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define SNAKE2_PLAYPAUSE BUTTON_PLAY
#define SNAKE2_PLAYPAUSE_TEXT "PLAY"
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define SNAKE2_LEFT BUTTON_LEFT
#define SNAKE2_RIGHT BUTTON_RIGHT
@ -476,7 +479,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define SNAKE2_PLAYPAUSE BUTTON_SELECT
#define SNAKE2_PLAYPAUSE_TEXT "A"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/sokoban.c
View file

@ -681,6 +681,9 @@
#define BUTTON_SAVE BUTTON_BACK
#define BUTTON_SAVE_NAME "BACK"
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define SOKOBAN_LEFT BUTTON_LEFT
#define SOKOBAN_RIGHT BUTTON_RIGHT
@ -731,7 +734,7 @@
#define SOKOBAN_LEVEL_REPEAT_NAME "[TOPRIGHT]"
#define BUTTON_SAVE_NAME "A [CENTER]"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/spacerocks.c
View file

@ -363,6 +363,9 @@
#define AST_RIGHT BUTTON_RIGHT
#define AST_FIRE BUTTON_PLAY
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define AST_PAUSE BUTTON_MENU
#define AST_QUIT BUTTON_BACK
@ -390,7 +393,7 @@
#define AST_RIGHT BUTTON_RIGHT
#define AST_FIRE BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

10
apps/plugins/star.c
View file

@ -705,15 +705,15 @@
#define STAR_LEVEL_DOWN_NAME "Start"
#define STAR_LEVEL_REPEAT_NAME "Y"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif
#ifdef HAVE_TOUCHSCREEN
#ifndef STAR_QUIT
#define STAR_QUIT BUTTON_TOPRIGHT
#define STAR_QUIT_NAME "TOPRIGHT"
#endif
//#ifndef STAR_QUIT
//#define STAR_QUIT BUTTON_TOPLEFT
//#define STAR_QUIT_NAME "TOPLEFT"
//#endif
#ifndef STAR_LEFT
#define STAR_LEFT BUTTON_MIDLEFT
#endif

5
apps/plugins/vu_meter.c
View file

@ -443,6 +443,9 @@
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "VOL+/VOL-"
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define VUMETER_QUIT BUTTON_BACK
#define VUMETER_HELP BUTTON_LEFT
@ -476,7 +479,7 @@
#define LABEL_MENU "X"
#define LABEL_VOLUME "Up/Down"
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/wormlet.c
View file

@ -397,6 +397,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define BTN_QUIT BUTTON_POWER
#define BTN_STOPRESET BUTTON_BACK
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == MA_PAD
#define BTN_DIR_UP BUTTON_UP
#define BTN_DIR_DOWN BUTTON_DOWN
@ -426,7 +429,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define BTN_QUIT BUTTON_BACK
#define BTN_STOPRESET BUTTON_MENU
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error No keymap defined!
#endif

5
apps/plugins/xobox.c
View file

@ -351,6 +351,9 @@ CONFIG_KEYPAD == MROBE500_PAD
#define DOWN BUTTON_DOWN
#define PAUSE BUTTON_PLAY
#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD
/* use touchscreen */
#elif CONFIG_KEYPAD == RG_NANO_PAD
#define QUIT BUTTON_START
@ -369,7 +372,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define DOWN BUTTON_DOWN
#define PAUSE BUTTON_SELECT
#elif !defined(HAVE_TOUCHSCREEN)
#else
#error "No keymap defined!"
#endif