libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DS: Fix building with ndstool

Browse Source
This commit is contained in:
Matthew Stewart 2018-02-17 20:12:14 -05:00 committed by Eugene Sandulenko
parent b3ccc1ce74
commit a43f914abe
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/platform/ds/ds.mk
View File

@ -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
@ -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
#
@ -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 $< $@