Skip to content

Commit

Permalink
DS: Fix building with ndstool
Browse files Browse the repository at this point in the history
  • Loading branch information
Stewmath authored and sev- committed Apr 7, 2018
1 parent b3ccc1c commit a43f914
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions backends/platform/ds/ds.mk
Expand Up @@ -146,11 +146,8 @@ dsclean:

# TODO: Add a 'dsdist' target ?

%.bin: %.elf
$(OBJCOPY) -S -O binary $< $@

%.nds: %.bin $(ndsdir)/arm7/arm7.bin
ndstool -c $@ -9 $< -7 $(ndsdir)/arm7/arm7.bin -b $(srcdir)/$(ndsdir)/$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"
%.nds: %.elf $(ndsdir)/arm7/arm7.elf
ndstool -c $@ -9 $< -7 $(ndsdir)/arm7/arm7.elf -b $(srcdir)/$(ndsdir)/$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"

%.ds.gba: %.nds
dsbuild $< -o $@ -l $(srcdir)/$(ndsdir)/arm9/ndsloader.bin
Expand All @@ -173,9 +170,6 @@ dsclean:
# as soon as possible.
CC := $(DEVKITPRO)/devkitARM/bin/arm-none-eabi-gcc

# HACK/TODO: Pointer to objcopy. This should really be set by configure
OBJCOPY := $(DEVKITPRO)/devkitARM/bin/arm-none-eabi-objcopy

#
# Set various flags
#
Expand Down Expand Up @@ -219,10 +213,6 @@ $(ndsdir)/arm7/arm7.elf: \
$(ndsdir)/arm7/source/main.o
$(CXX) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7 -o $@

# Rule for creating ARM7 .bin files from .elf files
$(ndsdir)/arm7/arm7.bin: $(ndsdir)/arm7/arm7.elf
$(OBJCOPY) -O binary $< $@




Expand Down

0 comments on commit a43f914

Please sign in to comment.