diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/chessbox/chessbox.make | 2 | ||||
-rw-r--r-- | apps/plugins/goban/goban.make | 2 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.make | 6 | ||||
-rw-r--r-- | apps/plugins/lua/lua.make | 2 | ||||
-rw-r--r-- | apps/plugins/pdbox/pdbox.make | 6 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 8 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.make | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.make | 2 |
9 files changed, 9 insertions, 23 deletions
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make index 357130cb74..ee4940de8b 100644 --- a/apps/plugins/chessbox/chessbox.make +++ b/apps/plugins/chessbox/chessbox.make | |||
@@ -44,7 +44,7 @@ $(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) | |||
44 | $(filter %.o, $^) \ | 44 | $(filter %.o, $^) \ |
45 | $(filter %.a, $+) \ | 45 | $(filter %.a, $+) \ |
46 | -lgcc $(CHESSBOX_OVLFLAGS) | 46 | -lgcc $(CHESSBOX_OVLFLAGS) |
47 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 47 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
48 | 48 | ||
49 | # special pattern rule for compiling chessbox with extra flags | 49 | # special pattern rule for compiling chessbox with extra flags |
50 | $(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(CHESSBOX_SRCDIR)/chessbox.make | 50 | $(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(CHESSBOX_SRCDIR)/chessbox.make |
diff --git a/apps/plugins/goban/goban.make b/apps/plugins/goban/goban.make index 2bc85ad8e1..a8b41285f0 100644 --- a/apps/plugins/goban/goban.make +++ b/apps/plugins/goban/goban.make | |||
@@ -43,4 +43,4 @@ $(GOBAN_BUILDDIR)/goban.ovl: $(GOBAN_OBJ) $(GOBAN_OUTLDS) | |||
43 | $(filter %.o, $^) \ | 43 | $(filter %.o, $^) \ |
44 | $(filter %.a, $+) \ | 44 | $(filter %.a, $+) \ |
45 | -lgcc $(GOBAN_OVLFLAGS) | 45 | -lgcc $(GOBAN_OVLFLAGS) |
46 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 46 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make index 7f7d94320a..97af1e98a7 100644 --- a/apps/plugins/imageviewer/imageviewer.make +++ b/apps/plugins/imageviewer/imageviewer.make | |||
@@ -40,11 +40,7 @@ $(IMGVBUILDDIR)/%.ovl: $(IMGDEC_OUTLDS) | |||
40 | $(filter-out $(PLUGIN_CRT0),$(filter %.o, $^)) \ | 40 | $(filter-out $(PLUGIN_CRT0),$(filter %.o, $^)) \ |
41 | $(filter %.a, $+) \ | 41 | $(filter %.a, $+) \ |
42 | -lgcc $(IMGDEC_OVLFLAGS) | 42 | -lgcc $(IMGDEC_OVLFLAGS) |
43 | ifdef APP_TYPE | 43 | $(SILENT)$(call objcopy,$(IMGVBUILDDIR)/$*.elf,$@) |
44 | $(SILENT)cp $(IMGVBUILDDIR)/$*.elf $@ | ||
45 | else | ||
46 | $(SILENT)$(OC) -O binary $(IMGVBUILDDIR)/$*.elf $@ | ||
47 | endif | ||
48 | 44 | ||
49 | # rule to create reference map for image decoder | 45 | # rule to create reference map for image decoder |
50 | $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGIN_LIBS) | 46 | $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGIN_LIBS) |
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make index 9e2db62e39..a70f0280b0 100644 --- a/apps/plugins/lua/lua.make +++ b/apps/plugins/lua/lua.make | |||
@@ -56,4 +56,4 @@ $(LUA_BUILDDIR)/lua.ovl: $(LUA_OBJ) $(LUA_OUTLDS) | |||
56 | $(filter %.o, $^) \ | 56 | $(filter %.o, $^) \ |
57 | $(filter %.a, $+) \ | 57 | $(filter %.a, $+) \ |
58 | -lgcc $(LUA_OVLFLAGS) | 58 | -lgcc $(LUA_OVLFLAGS) |
59 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 59 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make index 239e1c0852..3edc97efe5 100644 --- a/apps/plugins/pdbox/pdbox.make +++ b/apps/plugins/pdbox/pdbox.make | |||
@@ -36,10 +36,6 @@ $(PDBOXBUILDDIR)/pdbox.rock: | |||
36 | $(filter %.o, $^) \ | 36 | $(filter %.o, $^) \ |
37 | $(filter %.a, $+) \ | 37 | $(filter %.a, $+) \ |
38 | -lgcc $(PDBOXLDFLAGS) | 38 | -lgcc $(PDBOXLDFLAGS) |
39 | ifdef APP_TYPE | 39 | $(SILENT)$(call objcopy,$*.elf,$@) |
40 | $(SILENT)cp $*.elf $@ | ||
41 | else | ||
42 | $(SILENT)$(OC) -O binary $*.elf $@ | ||
43 | endif | ||
44 | 40 | ||
45 | 41 | ||
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make index e3d4544e07..9c29f7abd9 100644 --- a/apps/plugins/pictureflow/pictureflow.make +++ b/apps/plugins/pictureflow/pictureflow.make | |||
@@ -50,7 +50,7 @@ $(PICTUREFLOW_OBJDIR)/pictureflow.ovl: $(PICTUREFLOW_OBJ) $(PICTUREFLOW_OUTLDS) | |||
50 | $(filter %.o, $^) \ | 50 | $(filter %.o, $^) \ |
51 | $(filter %.a, $+) \ | 51 | $(filter %.a, $+) \ |
52 | -lgcc $(PICTUREFLOW_OVLFLAGS) | 52 | -lgcc $(PICTUREFLOW_OVLFLAGS) |
53 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 53 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
54 | 54 | ||
55 | # special pattern rule for compiling pictureflow with extra flags | 55 | # special pattern rule for compiling pictureflow with extra flags |
56 | $(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PICTUREFLOW_SRCDIR)/pictureflow.make | 56 | $(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PICTUREFLOW_SRCDIR)/pictureflow.make |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index b80523d41b..27bc69f1ca 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -120,13 +120,7 @@ $(BUILDDIR)/%.rock: | |||
120 | $(filter %.o, $^) \ | 120 | $(filter %.o, $^) \ |
121 | $(filter %.a, $+) \ | 121 | $(filter %.a, $+) \ |
122 | -lgcc $(PLUGINLDFLAGS) | 122 | -lgcc $(PLUGINLDFLAGS) |
123 | ifndef APP_TYPE | 123 | $(SILENT)$(call objcopy,$(BUILDDIR)/$*.elf,$@) |
124 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ # objcopy native | ||
125 | else ifeq (,$(findstring sdl-sim,$(APP_TYPE))) | ||
126 | $(SILENT)$(OC) -S -x $(BUILDDIR)/$*.elf $@ # objcopy hosted | ||
127 | else | ||
128 | $(SILENT)cp $(BUILDDIR)/$*.elf $@ # no objcopy, keep debug symbols | ||
129 | endif | ||
130 | 124 | ||
131 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua | 125 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua |
132 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ | 126 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ |
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make index 4869cedcbf..625c40eca8 100644 --- a/apps/plugins/rockboy/rockboy.make +++ b/apps/plugins/rockboy/rockboy.make | |||
@@ -37,4 +37,4 @@ $(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) | |||
37 | $(filter %.o, $^) \ | 37 | $(filter %.o, $^) \ |
38 | $(filter %.a, $+) \ | 38 | $(filter %.a, $+) \ |
39 | -lgcc $(ROCKBOY_OVLFLAGS) | 39 | -lgcc $(ROCKBOY_OVLFLAGS) |
40 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 40 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index a04801aa31..4638d5f0a2 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make | |||
@@ -45,7 +45,7 @@ $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) | |||
45 | $(filter %.o, $^) \ | 45 | $(filter %.o, $^) \ |
46 | $(filter %.a, $+) \ | 46 | $(filter %.a, $+) \ |
47 | -lgcc $(ZXBOX_LDFLAGS) | 47 | -lgcc $(ZXBOX_LDFLAGS) |
48 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 48 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
49 | 49 | ||
50 | # special pattern rule for compiling zxbox with extra flags | 50 | # special pattern rule for compiling zxbox with extra flags |
51 | $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(ZXBOX_SRCDIR)/zxbox.make | 51 | $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(ZXBOX_SRCDIR)/zxbox.make |