diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/BUILD_OVERLAY | 9 | ||||
-rw-r--r-- | apps/plugins/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 1 | ||||
-rw-r--r-- | apps/plugins/chessbox.c | 3 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox.make | 8 | ||||
-rw-r--r-- | apps/plugins/rockboy.c | 3 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.make | 8 | ||||
-rw-r--r-- | apps/plugins/zxbox.c | 3 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.make | 2 |
9 files changed, 15 insertions, 25 deletions
diff --git a/apps/plugins/BUILD_OVERLAY b/apps/plugins/BUILD_OVERLAY new file mode 100644 index 0000000000..f792b0e9a4 --- /dev/null +++ b/apps/plugins/BUILD_OVERLAY | |||
@@ -0,0 +1,9 @@ | |||
1 | #include "config.h" | ||
2 | |||
3 | /* this file is processed by makefiles | ||
4 | * they will grep for "YES" to see if overlay plugins must be built | ||
5 | */ | ||
6 | |||
7 | #if PLUGIN_BUFFER_SIZE <= 0x10000 && !defined(SIMULATOR) | ||
8 | YES | ||
9 | #endif | ||
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 4e6079ac59..6a126f3f14 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -70,7 +70,8 @@ iriverify.c | |||
70 | /* Overlays loaders */ | 70 | /* Overlays loaders */ |
71 | #if PLUGIN_BUFFER_SIZE <= 0x10000 && defined(HAVE_LCD_BITMAP) | 71 | #if PLUGIN_BUFFER_SIZE <= 0x10000 && defined(HAVE_LCD_BITMAP) |
72 | 72 | ||
73 | #if CONFIG_KEYPAD != ONDIO_PAD /* not enough buttons for rockboy */ | 73 | #if CONFIG_KEYPAD != ONDIO_PAD && CONFIG_KEYPAD != SANSA_M200_PAD |
74 | /* not enough buttons for rockboy */ | ||
74 | rockboy.c | 75 | rockboy.c |
75 | #endif | 76 | #endif |
76 | 77 | ||
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 18d9db8ef2..b74d3fad30 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -12,6 +12,7 @@ clock | |||
12 | #ifdef HAVE_LCD_BITMAP | 12 | #ifdef HAVE_LCD_BITMAP |
13 | 13 | ||
14 | #if (CONFIG_KEYPAD != ONDIO_PAD) /* not enough buttons */ \ | 14 | #if (CONFIG_KEYPAD != ONDIO_PAD) /* not enough buttons */ \ |
15 | && (CONFIG_KEYPAD != SANSA_M200_PAD) /* not enough buttons */ \ | ||
15 | && (LCD_PIXELFORMAT != HORIZONTAL_PACKING) /* TODO */ \ | 16 | && (LCD_PIXELFORMAT != HORIZONTAL_PACKING) /* TODO */ \ |
16 | && (LCD_PIXELFORMAT != VERTICAL_INTERLEAVED) /* TODO */ \ | 17 | && (LCD_PIXELFORMAT != VERTICAL_INTERLEAVED) /* TODO */ \ |
17 | && (defined(HAVE_LCD_COLOR) || (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) || \ | 18 | && (defined(HAVE_LCD_COLOR) || (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) || \ |
diff --git a/apps/plugins/chessbox.c b/apps/plugins/chessbox.c index 3eace4ca22..a6db7ba949 100644 --- a/apps/plugins/chessbox.c +++ b/apps/plugins/chessbox.c | |||
@@ -22,8 +22,6 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #if MEM <= 8 && !defined(SIMULATOR) | ||
26 | |||
27 | #include "lib/overlay.h" | 25 | #include "lib/overlay.h" |
28 | 26 | ||
29 | PLUGIN_HEADER | 27 | PLUGIN_HEADER |
@@ -33,4 +31,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
33 | { | 31 | { |
34 | return run_overlay(parameter, PLUGIN_GAMES_DIR "/chessbox.ovl", "ChessBox"); | 32 | return run_overlay(parameter, PLUGIN_GAMES_DIR "/chessbox.ovl", "ChessBox"); |
35 | } | 33 | } |
36 | #endif | ||
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make index 7611b5bb1a..357130cb74 100644 --- a/apps/plugins/chessbox/chessbox.make +++ b/apps/plugins/chessbox/chessbox.make | |||
@@ -15,18 +15,12 @@ CHESSBOX_OBJ := $(call c2obj, $(CHESSBOX_SRC)) | |||
15 | 15 | ||
16 | OTHER_SRC += $(CHESSBOX_SRC) | 16 | OTHER_SRC += $(CHESSBOX_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
20 | ### lowmem targets | 19 | ### lowmem targets |
21 | ROCKS += $(CHESSBOX_OBJDIR)/chessbox.ovl | 20 | ROCKS += $(CHESSBOX_OBJDIR)/chessbox.ovl |
22 | CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.link | 21 | CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.link |
23 | CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | 22 | CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map |
24 | else | 23 | else |
25 | ### all other targets | ||
26 | ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock | ||
27 | endif | ||
28 | else | ||
29 | ### simulator | ||
30 | ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock | 24 | ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock |
31 | endif | 25 | endif |
32 | 26 | ||
diff --git a/apps/plugins/rockboy.c b/apps/plugins/rockboy.c index 5d67ed0840..bd72dea1f8 100644 --- a/apps/plugins/rockboy.c +++ b/apps/plugins/rockboy.c | |||
@@ -22,8 +22,6 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #if MEM <= 8 && !defined(SIMULATOR) | ||
26 | |||
27 | #include "lib/overlay.h" | 25 | #include "lib/overlay.h" |
28 | 26 | ||
29 | PLUGIN_HEADER | 27 | PLUGIN_HEADER |
@@ -33,4 +31,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
33 | { | 31 | { |
34 | return run_overlay(parameter, VIEWERS_DIR "/rockboy.ovl", "RockBoy"); | 32 | return run_overlay(parameter, VIEWERS_DIR "/rockboy.ovl", "RockBoy"); |
35 | } | 33 | } |
36 | #endif | ||
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make index 81e9a1f798..d7ae68c0c4 100644 --- a/apps/plugins/rockboy/rockboy.make +++ b/apps/plugins/rockboy/rockboy.make | |||
@@ -16,18 +16,12 @@ ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) | |||
16 | 16 | ||
17 | OTHER_SRC += $(ROCKBOY_SRC) | 17 | OTHER_SRC += $(ROCKBOY_SRC) |
18 | 18 | ||
19 | ifndef SIMVER | 19 | ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) |
20 | ifneq (,$(findstring RECORDER,$(TARGET))) | ||
21 | ## lowmem targets | 20 | ## lowmem targets |
22 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.ovl | 21 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.ovl |
23 | ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.link | 22 | ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.link |
24 | ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | 23 | ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map |
25 | else | 24 | else |
26 | ### all other targets | ||
27 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock | ||
28 | endif | ||
29 | else | ||
30 | ### simulator | ||
31 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock | 25 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock |
32 | endif | 26 | endif |
33 | 27 | ||
diff --git a/apps/plugins/zxbox.c b/apps/plugins/zxbox.c index 3edff78554..94f7807bad 100644 --- a/apps/plugins/zxbox.c +++ b/apps/plugins/zxbox.c | |||
@@ -19,8 +19,6 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | 21 | ||
22 | #if MEM <= 8 && !defined(SIMULATOR) | ||
23 | |||
24 | #include "lib/overlay.h" | 22 | #include "lib/overlay.h" |
25 | 23 | ||
26 | PLUGIN_HEADER | 24 | PLUGIN_HEADER |
@@ -30,4 +28,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
30 | { | 28 | { |
31 | return run_overlay(parameter, VIEWERS_DIR "/zxbox.ovl", "ZXBox"); | 29 | return run_overlay(parameter, VIEWERS_DIR "/zxbox.ovl", "ZXBox"); |
32 | } | 30 | } |
33 | #endif | ||
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index c209d20ca1..de7312e009 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make | |||
@@ -16,7 +16,7 @@ ZXBOX_OBJ := $(call c2obj, $(ZXBOX_SRC)) | |||
16 | OTHER_SRC += $(ZXBOX_SRC) | 16 | OTHER_SRC += $(ZXBOX_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifndef SIMVER |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | 19 | ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) |
20 | ## lowmem targets | 20 | ## lowmem targets |
21 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl | 21 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl |
22 | ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.link | 22 | ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.link |