[Scummvm-cvs-logs] SF.net SVN: scummvm:[50729] scummvm/trunk/backends/platform/ds/arm9/ makefile

[fingolfin at users.sourceforge.net]

Revision: 50729
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50729&view=rev
Author:   fingolfin
Date:     2010-07-06 22:29:45 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
DS: cleanup arm9/makefile

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/makefile

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2010-07-06 22:14:06 UTC (rev 50728)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2010-07-06 22:29:45 UTC (rev 50729)
@@ -333,13 +333,11 @@
 
 # Compiler options for files which should be optimised for speed
 ifdef DS_BUILD_E
-# Another attempt to save some RAM in ITE
-OPT_SPEED := -O3 -mthumb
+  # Another attempt to save some RAM in ITE
+  OPT_SPEED := -O3 -mthumb
 else
-#OPT_SPEED := -O3
-
-OPT_SPEED := -Os -mthumb
-
+ #OPT_SPEED := -O3
+ OPT_SPEED := -Os -mthumb
 endif
 
 # Compiler options for files which should be optimised for space
@@ -379,14 +377,6 @@
 #---------------------------------------------------------------------------------
 # canned command sequence for binary data
 #---------------------------------------------------------------------------------
-#define bin2o
-#	bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
-#	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw_end[];" > `(echo $(<F) | tr . _)`.h
-#	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw[];" >> `(echo $(<F) | tr . _)`.h
-#	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_raw_size";" >> `(echo $(<F) | tr . _)`.h
-#endef
-
-
 define bin2o
 	bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
 	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
@@ -395,22 +385,6 @@
 endef
 
 
-#define bin2o
-#	@echo $(*)
-#	cp $(<) $(*).tmp
-#	$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
-#	--rename-section .data=.rodata \
-#	--redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_start=$(notdir $*)\
-#	--redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_end=$(notdir $*)_end\
-#	$(*).tmp $(@)
-#	echo "extern const u8" $(notdir $*)"[] __attribute__ ((aligned (4)));" > $(*).h
-#	echo "extern const u32" $(notdir $(*))_size[]";" >> $(*).h
-#
-#	echo $(*).h
-#	rm $(*).tmp
-#endef
-
-
 ##############
 # Replacement rule for the one in makefile.common
 ##############
@@ -474,10 +448,8 @@
 	padbin 16 $(basename $@).ds.gba
 
 #---------------------------------------------------------------------------------
-# FIXME: The following rule hardcodes the input & output filename -- shouldn't it use $< and $@ instead?
 %.bin: %.elf
-	$(OBJCOPY) -S scummvm.elf scummvm-stripped.elf
-	$(OBJCOPY) -O binary scummvm-stripped.elf scummvm.bin
+	$(OBJCOPY) -S -O binary $< $@
 
 #%.o: %.s
 #	$(MKDIR) $(*D)/$(DEPDIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.