diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES.app_build | 2 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS.app_build | 2 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 8 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build index 990a7c1c86..89a8b0ede6 100644 --- a/apps/plugins/SOURCES.app_build +++ b/apps/plugins/SOURCES.app_build | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef HAVE_TOUCHSCREEN | 1 | #if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) |
2 | /* In devices running RockBox as an application, but having a keypad */ | 2 | /* In devices running RockBox as an application, but having a keypad */ |
3 | #include "SOURCES" | 3 | #include "SOURCES" |
4 | #else | 4 | #else |
diff --git a/apps/plugins/SUBDIRS.app_build b/apps/plugins/SUBDIRS.app_build index 934474a996..954044146a 100644 --- a/apps/plugins/SUBDIRS.app_build +++ b/apps/plugins/SUBDIRS.app_build | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef HAVE_TOUCHSCREEN | 1 | #if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) |
2 | /* This is for devices having a keypad, running RockBox as an application */ | 2 | /* This is for devices having a keypad, running RockBox as an application */ |
3 | #include "SUBDIRS" | 3 | #include "SUBDIRS" |
4 | 4 | ||
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 289b399e27..9ffdb0798f 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -262,10 +262,10 @@ | |||
262 | #define BATTERY_OFF_TXT "Power" | 262 | #define BATTERY_OFF_TXT "Power" |
263 | 263 | ||
264 | #elif CONFIG_KEYPAD == DX50_PAD | 264 | #elif CONFIG_KEYPAD == DX50_PAD |
265 | #define BATTERY_ON BUTTON_PLAY | 265 | #define BATTERY_ON BUTTON_PLAY |
266 | #define BATTERY_OFF BUTTON_POWER | 266 | #define BATTERY_OFF BUTTON_POWER_LONG |
267 | #define BATTERY_OFF_TXT "POWER" | 267 | #define BATTERY_OFF_TXT "Power Long" |
268 | #define BATTERY_ON_TXT "PLAY - start" | 268 | #define BATTERY_ON_TXT "Play - start" |
269 | 269 | ||
270 | #else | 270 | #else |
271 | #error No keymap defined! | 271 | #error No keymap defined! |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 1edbd37306..be3d35717e 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -11,11 +11,9 @@ | |||
11 | is_app_build = | 11 | is_app_build = |
12 | ifdef APP_TYPE | 12 | ifdef APP_TYPE |
13 | ifneq ($(APP_TYPE),sdl-sim) | 13 | ifneq ($(APP_TYPE),sdl-sim) |
14 | ifeq (,$(findstring standalone, $(APP_TYPE))) | ||
15 | is_app_build = yes | 14 | is_app_build = yes |
16 | endif | 15 | endif |
17 | endif | 16 | endif |
18 | endif | ||
19 | 17 | ||
20 | ifdef is_app_build | 18 | ifdef is_app_build |
21 | PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build) | 19 | PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build) |