summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/chessbox/chessbox.make6
-rw-r--r--apps/plugins/rockboy/rockboy.make6
-rw-r--r--apps/plugins/zxbox/zxbox.make6
3 files changed, 9 insertions, 9 deletions
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make
index d42984c771..432f309f26 100644
--- a/apps/plugins/chessbox/chessbox.make
+++ b/apps/plugins/chessbox/chessbox.make
@@ -25,7 +25,7 @@ else
25 CHESSBOX_INLDS := $(APPSDIR)/plugins/plugin.lds 25 CHESSBOX_INLDS := $(APPSDIR)/plugins/plugin.lds
26 ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock 26 ROCKS += $(CHESSBOX_OBJDIR)/chessbox.rock
27endif 27endif
28 CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$*.map 28 CHESSBOX_OVLFLAGS = -T$(CHESSBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
29 CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.lds 29 CHESSBOX_OUTLDS = $(CHESSBOX_OBJDIR)/chessbox.lds
30else 30else
31 ### simulator 31 ### simulator
@@ -46,11 +46,11 @@ $(CHESSBOX_OUTLDS): $(CHESSBOX_INLDS) $(CHESSBOX_OBJ)
46$(CHESSBOX_OBJDIR)/chessbox.rock: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB) 46$(CHESSBOX_OBJDIR)/chessbox.rock: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB)
47 47
48$(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB) 48$(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) $(PLUGINBITMAPLIB)
49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(CHESSBOX_OBJDIR)/$*.elf \ 49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
50 $(filter %.o, $^) \ 50 $(filter %.o, $^) \
51 $(filter %.a, $^) \ 51 $(filter %.a, $^) \
52 -lgcc $(CHESSBOX_OVLFLAGS) 52 -lgcc $(CHESSBOX_OVLFLAGS)
53 $(call PRINTS,LD $(@F))$(OC) -O binary $(CHESSBOX_OBJDIR)/$*.elf $@ 53 $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
54 54
55# special pattern rule for compiling chessbox with extra flags 55# special pattern rule for compiling chessbox with extra flags
56$(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(CHESSBOX_SRCDIR)/chessbox.make 56$(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(CHESSBOX_SRCDIR)/chessbox.make
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make
index 62196cf0b7..7faf1a56e9 100644
--- a/apps/plugins/rockboy/rockboy.make
+++ b/apps/plugins/rockboy/rockboy.make
@@ -26,7 +26,7 @@ else
26 ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds 26 ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds
27 ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock 27 ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock
28endif 28endif
29 ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(ROCKBOY_OBJDIR)/$*.map 29 ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
30 ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds 30 ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds
31else 31else
32 ### simulator 32 ### simulator
@@ -46,8 +46,8 @@ $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ)
46$(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) 46$(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
47 47
48$(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) 48$(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(ROCKBOY_OBJDIR)/$*.elf \ 49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
50 $(filter %.o, $^) \ 50 $(filter %.o, $^) \
51 $(filter %.a, $^) \ 51 $(filter %.a, $^) \
52 -lgcc $(ROCKBOY_OVLFLAGS) 52 -lgcc $(ROCKBOY_OVLFLAGS)
53 $(call PRINTS,LD $(@F))$(OC) -O binary $(ROCKBOY_OBJDIR)/$*.elf $@ 53 $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make
index e617ba3a12..937bcde432 100644
--- a/apps/plugins/zxbox/zxbox.make
+++ b/apps/plugins/zxbox/zxbox.make
@@ -36,7 +36,7 @@ ifdef SIMVER
36 ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile 36 ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile
37else 37else
38 ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds 38 ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds
39 ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/$*.map 39 ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
40endif 40endif
41 41
42$(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ) 42$(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ)
@@ -45,11 +45,11 @@ $(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ)
45$(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) 45$(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB)
46 46
47$(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB) 47$(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB)
48 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(ZXBOX_OBJDIR)/$*.elf \ 48 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
49 $(filter %.o, $^) \ 49 $(filter %.o, $^) \
50 $(filter %.a, $^) \ 50 $(filter %.a, $^) \
51 -lgcc $(ZXBOX_LDFLAGS) 51 -lgcc $(ZXBOX_LDFLAGS)
52 $(call PRINTS,LD $(@F))$(OC) -O binary $(ZXBOX_OBJDIR)/$*.elf $@ 52 $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
53 53
54# special pattern rule for compiling zxbox with extra flags 54# special pattern rule for compiling zxbox with extra flags
55$(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make 55$(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make