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

robinwatts at users.sourceforge.net robinwatts at users.sourceforge.net
Sun Jun 1 20:09:20 CEST 2008


Revision: 32470
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32470&view=rev
Author:   robinwatts
Date:     2008-06-01 11:09:19 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
Tweaks to DS makefiles.

1) It wouldn't build at all for me, because source/fat had been missed off the
INCLUDES line.

2) Stray whitespace removed (to stop emacs warning on saving)

3) DS_BUILD flag selection reworked slightly. Now do: make all SCUMM_BUILD=x
(where x is a,b,c,d,e,f,g) and it'll select that version and build it. If
no x is supplied or x is not a-g, then version a will be built.

4) New allbuilds target. In backends/platform/ds, do: make allbuilds
and versions A-G are built in turn (version G does not complete currently due
to lack of logo g). This uses a 'semiclean' target in each makefile to clean
just the files that change between versions.

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

Modified: scummvm/trunk/backends/platform/ds/arm7/Makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/Makefile	2008-06-01 15:18:58 UTC (rev 32469)
+++ scummvm/trunk/backends/platform/ds/arm7/Makefile	2008-06-01 18:09:19 UTC (rev 32470)
@@ -128,7 +128,11 @@
 	@echo clean ...$(TARGET)
 	@rm -fr $(BUILD) *.bin
 
+#---------------------------------------------------------------------------------
+semiclean:
+	@echo semiclean ...$(TARGET)
 
+
 #---------------------------------------------------------------------------------
 else
 

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2008-06-01 15:18:58 UTC (rev 32469)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2008-06-01 18:09:19 UTC (rev 32470)
@@ -5,46 +5,35 @@
 libndsdir = $(DEVKITPRO)/libnds
 #libndsdir = /home/neil/devkitpror21/libnds
 
-# Select the build you want by uncommenting one of the following lines:
+# Select the build by setting SCUMM_BUILD to a,b,c,d,e,f or g.
+# Anything else gets build a.
 
-
-
-ifeq ($(SCUMM_BUILD),a)
-        DS_BUILD_A = 1
-endif
-
-ifeq ($(SCUMM_BUILD),b)
-        DS_BUILD_B = 1
-endif
-
-ifeq ($(SCUMM_BUILD),c)
-        DS_BUILD_C = 1
-endif
-
-ifeq ($(SCUMM_BUILD),d)
-        DS_BUILD_D = 1
-endif
-
-ifeq ($(SCUMM_BUILD),e)
-        DS_BUILD_E = 1
-endif
-
-ifeq ($(SCUMM_BUILD),f)
-        DS_BUILD_F = 1
-endif
-
 ifeq ($(SCUMM_BUILD),g)
         DS_BUILD_G = 1
+else
+ ifeq ($(SCUMM_BUILD),f)
+        DS_BUILD_F = 1
+ else
+  ifeq ($(SCUMM_BUILD),e)
+        DS_BUILD_E = 1
+  else
+   ifeq ($(SCUMM_BUILD),d)
+        DS_BUILD_D = 1
+   else
+    ifeq ($(SCUMM_BUILD),c)
+        DS_BUILD_C = 1
+    else
+     ifeq ($(SCUMM_BUILD),b)
+        DS_BUILD_B = 1
+     else
+        DS_BUILD_A = 1
+     endif
+    endif
+   endif
+  endif
+ endif
 endif
 
-#DS_BUILD_A = 1
-#DS_BUILD_B = 1
-#DS_BUILD_C = 1
-#DS_BUILD_D = 1		
-#DS_BUILD_E = 1
-#DS_BUILD_F = 1
-#DS_BUILD_G = 1
-
 # To do:
 # - FAT cache?
 
@@ -82,6 +71,9 @@
 
 # Command to build libmad is:
 # ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork'
+#
+# I actually had to use
+# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' LDFLAGS='C:/Progra~1/devkitpro/libnds/lib/libnds9.a' --disable-shared --disable-debugging
 
 USE_ARM_SOUND_ASM = 1
 ARM = 1
@@ -190,7 +182,7 @@
 
 LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -Wl,--wrap,time -mno-fpu -Wl,-Map,map.txt
 
-INCLUDES= -I./ -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/common -I$(portdir)/source \
+INCLUDES= -I./ -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/common -I$(portdir)/source -I$(portdir)/source/fat \
 			-I$(portdir)/data -I$(libndsdir)/include -I$(portdir)/../commoninclude\
 			-I$(libndsdir)/include -I$(libndsdir)/include/nds -I$(srcdir)/engines -I$(portdir)/source/mad\
 			-I$(portdir)/source/libcartreset -include $(srcdir)/common/scummsys.h
@@ -276,9 +268,7 @@
 #-mthumb -fno-gcse -fno-schedule-insns2
 
 
-			
-OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS) 
-		
+OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
 
 
 
@@ -290,6 +280,9 @@
 
 include $(srcdir)/Makefile.common
 
+semiclean:
+	$(RM) $(portdir)/source/dsoptions.o $(portdir)/source/dsmain.o $(FAT_OBJS) $(DATA_OBJS) $(portdir)/source/wordcompletion.o
+
 clean:
 	$(RM) $(OBJS) $(EXECUTABLE)
 	rm -fr $(BUILD)

Modified: scummvm/trunk/backends/platform/ds/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/makefile	2008-06-01 15:18:58 UTC (rev 32469)
+++ scummvm/trunk/backends/platform/ds/makefile	2008-06-01 18:09:19 UTC (rev 32470)
@@ -15,6 +15,24 @@
 	@for i in $(SUBDIRS); do if test -d $$i; then make -C $$i; fi; done;
 clean:
 	@for i in $(SUBDIRS); do if test -d $$i; then make -C $$i clean; fi; done;
+semiclean:
+	@for i in $(SUBDIRS); do if test -d $$i; then make -C $$i semiclean; fi; done;
 
 export:
 	@for i in $(SUBDIRS); do if test -d $$i; then make -C $$i export; fi; done;
+
+allbuilds:
+	make semiclean
+	make all       SCUMM_BUILD=a
+	make semiclean
+	make all       SCUMM_BUILD=b
+	make semiclean
+	make all       SCUMM_BUILD=c
+	make semiclean
+	make all       SCUMM_BUILD=d
+	make semiclean
+	make all       SCUMM_BUILD=e
+	make semiclean
+	make all       SCUMM_BUILD=f
+	make semiclean
+	make all       SCUMM_BUILD=g


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




More information about the Scummvm-git-logs mailing list