diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 12:09:36 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 12:09:36 +0000 |
commit | 838c74f79d69eec2d71e0af0fdbecbb4cac86637 (patch) | |
tree | 0b9fae603bd054bc0c688f9e27eee9b66f1ed7e6 | |
parent | c6b3d38a156dd624760a8eb1bb374affd43b4f2a (diff) | |
download | rockbox-838c74f79d69eec2d71e0af0fdbecbb4cac86637.tar.gz rockbox-838c74f79d69eec2d71e0af0fdbecbb4cac86637.zip |
Bug fix for simulator: Plugins and codecs were objcopied isntead of left as ELF.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19147 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/codecs.make | 7 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index a65dc4f67e..b31958a088 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -98,6 +98,9 @@ $(CODECDIR)/%.codec: $(CODECDIR)/%.o | |||
98 | $(filter %.o, $^) \ | 98 | $(filter %.o, $^) \ |
99 | $(filter %.a, $^) \ | 99 | $(filter %.a, $^) \ |
100 | -lgcc $(CODECLDFLAGS) | 100 | -lgcc $(CODECLDFLAGS) |
101 | $(call PRINTS,OC $(@F))$(OC) -O binary $(CODECDIR)/$*.elf $@ | 101 | ifdef SIMVER |
102 | 102 | $(SILENT)$(shell cp $(BUILDDIR)/$*.elf $@) | |
103 | else | ||
104 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ | ||
105 | endif | ||
103 | 106 | ||
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 2e266cb190..bb77f7de6c 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -73,4 +73,8 @@ $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o $(PLUGINLINK_LDS) | |||
73 | $(filter %.o, $^) \ | 73 | $(filter %.o, $^) \ |
74 | $(filter %.a, $^) \ | 74 | $(filter %.a, $^) \ |
75 | -lgcc $(PLUGINLDFLAGS) | 75 | -lgcc $(PLUGINLDFLAGS) |
76 | ifdef SIMVER | ||
77 | $(SILENT)$(shell cp $(BUILDDIR)/$*.elf $@) | ||
78 | else | ||
76 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ | 79 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ |
80 | endif \ No newline at end of file | ||