diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 14:17:09 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 14:17:09 +0000 |
commit | 20fb305b0b8a1b14e14b7fd1e9b185e2a52e3fe9 (patch) | |
tree | 16163cb6815da0dbaddc89cf78f6b0c5fa6672fb | |
parent | d273f663a1203717cd0ce65970efc5c40fbcff0d (diff) | |
download | rockbox-20fb305b0b8a1b14e14b7fd1e9b185e2a52e3fe9.tar.gz rockbox-20fb305b0b8a1b14e14b7fd1e9b185e2a52e3fe9.zip |
Don't objcopy simulator plugins.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19152 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/doom/doom.make | 9 | ||||
-rw-r--r-- | apps/plugins/midi/midi.make | 7 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi.make | 7 |
3 files changed, 19 insertions, 4 deletions
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index d566f5307b..3e95026c3c 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make | |||
@@ -42,13 +42,18 @@ $(DOOMBUILDDIR)/sscanf.o: $(DOOMBUILDDIR)/sscanf.c | |||
42 | $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ) | 42 | $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ) |
43 | # for some reason, this doesn't match the implicit rule in plugins.make, | 43 | # for some reason, this doesn't match the implicit rule in plugins.make, |
44 | # so we have to duplicate the link command here | 44 | # so we have to duplicate the link command here |
45 | $(call PRINTS,LD $(@F)) | ||
45 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ | 46 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ |
46 | $(filter %.o, $^) \ | 47 | $(filter %.o, $^) \ |
47 | $(filter %.a, $^) \ | 48 | $(filter %.a, $^) \ |
48 | -lgcc $(PLUGINLDFLAGS) | 49 | -lgcc $(PLUGINLDFLAGS) |
49 | $(call PRINTS,LD $(@F))$(OC) -O binary $*.elf $@ | 50 | ifdef SIMVER |
51 | $(SILENT)cp $*.elf $@ | ||
52 | else | ||
53 | $(SILENT)$(OC) -O binary $*.elf $@ | ||
54 | endif | ||
50 | 55 | ||
51 | # new rule needed to use extra compile flags | 56 | # new rule needed to use extra compile flags |
52 | $(DOOMBUILDDIR)/%.o: $(DOOMSRCDIR)/%.c $(DOOMSRCDIR)/doom.make | 57 | $(DOOMBUILDDIR)/%.o: $(DOOMSRCDIR)/%.c |
53 | $(SILENT)mkdir -p $(dir $@) | 58 | $(SILENT)mkdir -p $(dir $@) |
54 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(DOOMCFLAGS) -c $< -o $@ | 59 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(DOOMCFLAGS) -c $< -o $@ |
diff --git a/apps/plugins/midi/midi.make b/apps/plugins/midi/midi.make index 9100764974..93b6ead3b1 100644 --- a/apps/plugins/midi/midi.make +++ b/apps/plugins/midi/midi.make | |||
@@ -21,8 +21,13 @@ OTHER_SRC += $(MIDI_SRC) | |||
21 | $(MIDIBUILDDIR)/midi.rock: $(MIDI_OBJ) | 21 | $(MIDIBUILDDIR)/midi.rock: $(MIDI_OBJ) |
22 | # for some reason, this doesn't match the implicit rule in plugins.make, | 22 | # for some reason, this doesn't match the implicit rule in plugins.make, |
23 | # so we have to duplicate the link command here | 23 | # so we have to duplicate the link command here |
24 | $(call PRINTS,LD $(@F)) | ||
24 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ | 25 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ |
25 | $(filter %.o, $^) \ | 26 | $(filter %.o, $^) \ |
26 | $(filter %.a, $^) \ | 27 | $(filter %.a, $^) \ |
27 | -lgcc $(PLUGINLDFLAGS) | 28 | -lgcc $(PLUGINLDFLAGS) |
28 | $(call PRINTS,LD $(@F))$(OC) -O binary $*.elf $@ | 29 | ifdef SIMVER |
30 | $(SILENT)cp $*.elf $@ | ||
31 | else | ||
32 | $(SILENT)$(OC) -O binary $*.elf $@ | ||
33 | endif | ||
diff --git a/apps/plugins/reversi/reversi.make b/apps/plugins/reversi/reversi.make index be7369423e..4eaa82d8a0 100644 --- a/apps/plugins/reversi/reversi.make +++ b/apps/plugins/reversi/reversi.make | |||
@@ -21,8 +21,13 @@ OTHER_SRC += $(REVERSI_SRC) | |||
21 | $(REVERSIBUILDDIR)/reversi.rock: $(REVERSI_OBJ) | 21 | $(REVERSIBUILDDIR)/reversi.rock: $(REVERSI_OBJ) |
22 | # for some reason, this doesn't match the implicit rule in plugins.make, | 22 | # for some reason, this doesn't match the implicit rule in plugins.make, |
23 | # so we have to duplicate the link command here | 23 | # so we have to duplicate the link command here |
24 | $(call PRINTS,LD $(@F)) | ||
24 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ | 25 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $*.elf \ |
25 | $(filter %.o, $^) \ | 26 | $(filter %.o, $^) \ |
26 | $(filter %.a, $^) \ | 27 | $(filter %.a, $^) \ |
27 | -lgcc $(PLUGINLDFLAGS) | 28 | -lgcc $(PLUGINLDFLAGS) |
28 | $(call PRINTS,LD $(@F))$(OC) -O binary $*.elf $@ | 29 | ifdef SIMVER |
30 | $(SILENT)cp $*.elf $@ | ||
31 | else | ||
32 | $(SILENT)$(OC) -O binary $*.elf $@ | ||
33 | endif | ||