From a43f914abefaae80dd91c496ba5b77b46fb9d8d2 Mon Sep 17 00:00:00 2001
From: Matthew Stewart
Date: Sat, 17 Feb 2018 20:12:14 -0500
Subject: DS: Fix building with ndstool

---
 backends/platform/ds/ds.mk | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'backends/platform/ds')

diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index f2e7707a7f..18feea00c2 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -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  $< $@
-
 
 
 
-- 
cgit v1.2.3