Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32505

18 files changed, 99 insertions, 177 deletions

diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile
index e6a190b1ce..55db7f8cad 100644
--- a/backends/platform/ds/arm7/Makefile
+++ b/backends/platform/ds/arm7/Makefile
@@ -68,7 +68,8 @@ endif
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:=	/home/neil/devkitpror21/libnds home/neil/devkitpror21/libnds/nds
+#LIBDIRS	:=	/home/neil/devkitpror21/libnds home/neil/devkitpror21/libnds/nds
+LIBDIRS	:=	$(DEVKITPRO)/libnds
 
 
 #---------------------------------------------------------------------------------
@@ -127,6 +128,10 @@ clean:
 	@echo clean ...$(TARGET)
 	@rm -fr $(BUILD) *.bin
 
+#---------------------------------------------------------------------------------
+semiclean:
+	@echo semiclean ...$(TARGET)
+
 
 #---------------------------------------------------------------------------------
 else
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index 0e31204ef7..bee39f1efe 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -36,7 +36,7 @@
 #include <arm7/clock.h>
 #include <stdlib.h>
 #include <string.h>
-#include <registers_alt.h>
+//#include <registers_alt.h>	// not needed in current libnds
 #include <NDS/scummvm_ipc.h>
 //////////////////////////////////////////////////////////////////////
 #ifdef USE_DEBUGGER
@@ -261,6 +261,9 @@ uint16 powerManagerWrite(uint32 command, u32 data, bool enable) {
   REG_SPICNT = SPI_ENABLE | SPI_BAUD_1MHz;
   REG_SPIDATA = enable? (result | data): (result & ~data);
   SerialWaitBusy();
+  
+  // FIXME: This function should either return something, or have a comment
+  // explaining why it is valid for it to not return something. :-)
 }
 
 /*
diff --git a/backends/platform/ds/arm9/buildkeyboard.bat b/backends/platform/ds/arm9/buildkeyboard.bat
index 2078381ccb..ae3398d24d 100644
--- a/backends/platform/ds/arm9/buildkeyboard.bat
+++ b/backends/platform/ds/arm9/buildkeyboard.bat
@@ -2,7 +2,3 @@ cd data
 ..\tools\gfx2gba -c16 -t8 -M -pkeyboard_pal.raw ..\keyboard.bmp
 del keyboard.map
 pause
-cd data
-..\tools\gfx2gba -c16 -t8 -M -pkeyboard_pal.raw ..\keyboard.bmp
-del keyboard.map
-pause
\ No newline at end of file
diff --git a/backends/platform/ds/arm9/lib/readme.txt b/backends/platform/ds/arm9/lib/readme.txt
index f6e7f4c511..2469e38cd0 100644
--- a/backends/platform/ds/arm9/lib/readme.txt
+++ b/backends/platform/ds/arm9/lib/readme.txt
@@ -1,2 +1 @@
 If building with MAD enabled, put libmad.a in here.
-If building with MAD enabled, put libmad.a in here.
\ No newline at end of file
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index aefd8c091e..1a4d61113e 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -1,47 +1,39 @@
-#DYNAMIC_MODULES = 1
-#libndsdir = $(DEVKITPRO)/libnds
-libndsdir = /home/neil/devkitpror21/libnds
-
-# Select the build you want by uncommenting one of the following lines:
-
-
-
-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
+srcdir      ?= .
+DEPDIR      := .deps
 
-ifeq ($(SCUMM_BUILD),e)
-        DS_BUILD_E = 1
-endif
+#DYNAMIC_MODULES = 1
+libndsdir = $(DEVKITPRO)/libnds
+#libndsdir = /home/neil/devkitpror21/libnds
 
-ifeq ($(SCUMM_BUILD),f)
-        DS_BUILD_F = 1
-endif
+# Select the build by setting SCUMM_BUILD to a,b,c,d,e,f or g.
+# Anything else gets build a.
 
 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?
 
@@ -79,6 +71,9 @@ VPATH = $(srcdir)
 
 # 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
@@ -164,7 +159,7 @@ ifdef USE_PROFILER
 	DEFINES += -DUSE_PROFILER
 endif
 
-CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor	 -Wno-non-virtual-dtor \
+CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder  \
 		-fno-exceptions -fno-rtti -mthumb-interwork
 
 #		-mthumb
@@ -187,9 +182,9 @@ endif
 
 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 -I$(portdir)/source/compressor -I$(portdir)/source/fat \
-			-I$(srcdir)/backends/fs  -I$(srcdir)/backends/fs/ds -I$(portdir)/data -I$(libndsdir)/include -I$(portdir)/../commoninclude\
-			-I$(srcdir)/scumm -I$(libndsdir)/include -I$(libndsdir)/include/nds -I$(srcdir)/engines -I$(portdir)/source/mad\
+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
 
 
@@ -273,9 +268,7 @@ OPT_SIZE := -Os
 #-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)
 
 
 
@@ -287,6 +280,9 @@ ndsall:
 
 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)
@@ -365,8 +361,7 @@ else
 #	echo !!!!!!!! $(OPTFLAG)
 
 	$(MKDIR) $(*D)/$(DEPDIR)
-	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-	$(CXX) -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" $(if $(findstring $(notdir $<), $(OPTLIST)), $(OPT_SPEED), $(OPT_SIZE)) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(if $(findstring $(notdir $<), $(OPTLIST)), $(OPT_SPEED), $(OPT_SIZE)) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o 
 endif
 
 
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp
index 9569a820f2..56ac4e8c09 100644
--- a/backends/platform/ds/arm9/source/cdaudio.cpp
+++ b/backends/platform/ds/arm9/source/cdaudio.cpp
@@ -21,8 +21,8 @@
  */
  
 #include "cdaudio.h"
-#include "ds-fs.h"
-#include "config-manager.h"
+#include "backends/fs/ds/ds-fs.h"
+#include "common/config-manager.h"
 #include "dsmain.h"
 #include "NDS/scummvm_ipc.h"
 #include "console2.h"
diff --git a/backends/platform/ds/arm9/source/compressor/lz.h b/backends/platform/ds/arm9/source/compressor/lz.h
index dc10210742..e7ea1567ca 100644
--- a/backends/platform/ds/arm9/source/compressor/lz.h
+++ b/backends/platform/ds/arm9/source/compressor/lz.h
@@ -48,53 +48,3 @@ void LZ_Uncompress( unsigned char *in, unsigned char *out,
 
 
 #endif /* _lz_h_ */
-/*************************************************************************
-* Name:        lz.h
-* Author:      Marcus Geelnard
-* Description: LZ77 coder/decoder interface.
-* Reentrant:   Yes
-* $Id$
-*-------------------------------------------------------------------------
-* Copyright (c) 2003-2004 Marcus Geelnard
-*
-* This software is provided 'as-is', without any express or implied
-* warranty. In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would
-*    be appreciated but is not required.
-*
-* 2. Altered source versions must be plainly marked as such, and must not
-*    be misrepresented as being the original software.
-*
-* 3. This notice may not be removed or altered from any source
-*    distribution.
-*
-* Marcus Geelnard
-* marcus.geelnard at home.se
-*************************************************************************/
-
-#ifndef _lz_h_
-#define _lz_h_
-
-
-
-/*************************************************************************
-* Function prototypes
-*************************************************************************/
-
-int LZ_Compress( unsigned char *in, unsigned char *out,
-                 unsigned int insize );
-int LZ_CompressFast( unsigned char *in, unsigned char *out,
-                     unsigned int insize, unsigned int *work );
-void LZ_Uncompress( unsigned char *in, unsigned char *out,
-                    unsigned int insize );
-
-
-#endif /* _lz_h_ */
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index efa60015fb..a130509e36 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -71,12 +71,11 @@
 #include <stdlib.h>
 #include "dsmain.h"
 #include "string.h"
-#include "system.h"
 #include "osystem_ds.h"
 #include "icons_raw.h"
-#include "gba_nds_fat.h"
-#include "disc_io.h"
-#include "config-manager.h"
+#include "fat/gba_nds_fat.h"
+#include "fat/disc_io.h"
+#include "common/config-manager.h"
 #include "engines/scumm/scumm.h"
 #include "keyboard_raw.h"
 #include "keyboard_pal_raw.h"
@@ -89,14 +88,13 @@
 #include "user_debugger.h"
 #endif
 #include "ramsave.h"
-#include "disc_io.h"
 #include "blitters.h"
 #include "cartreset_nolibfat.h"
 #include "keys.h"
 #ifdef USE_PROFILER
 #include "profiler/cyg-profile.h"
 #endif
-#include "ds-fs.h"
+#include "backends/fs/ds/ds-fs.h"
 
 namespace DS {
 
@@ -360,14 +358,14 @@ void initSprites() {
 	   sprites[i].attribute[0] = ATTR0_DISABLED;
 	   sprites[i].attribute[1] = 0;
 	   sprites[i].attribute[2] = 0;
-	   sprites[i].attribute[3] = 0;
+	   sprites[i].filler = 0;
     }
 	
 	for (int i = 0; i < 128; i++) {
 	   spritesMain[i].attribute[0] = ATTR0_DISABLED;
 	   spritesMain[i].attribute[1] = 0;
 	   spritesMain[i].attribute[2] = 0;
-	   spritesMain[i].attribute[3] = 0;
+	   spritesMain[i].filler = 0;
     }
 	
 	updateOAM();
@@ -749,7 +747,7 @@ void displayMode16Bit() {
 
 
 	if (displayModeIs8Bit) {
-		static int test = 0;
+//		static int test = 0;
 //		consolePrintf("saving buffer... %d\n", test++);
 		saveGameBackBuffer();
 		for (int r = 0; r < 32 * 32; r++) {
@@ -1612,7 +1610,7 @@ void updateStatus() {
 //		spritesMain[0].attribute[0] = ATTR0_DISABLED;
 //		spritesMain[0].attribute[1] = 0;
 //		spritesMain[0].attribute[2] = 0;
-//		spritesMain[0].attribute[3] = 0;
+//		spritesMain[0].filler = 0;
 		setIconMain(0, 0, 0, 0, 0, false);
 	}
 
@@ -2431,7 +2429,7 @@ u8 fastRamData[FAST_RAM_SIZE] ITCM_DATA;
 
 void* fastRamAlloc(int size) {
 //	return malloc(size);
-	void* result = fastRamPointer;
+	void* result = (void *) fastRamPointer;
 	fastRamPointer += size;
 	if(fastRamPointer > fastRamData + FAST_RAM_SIZE) {
 		consolePrintf("FastRam (ITCM) allocation failed!\n");
@@ -2825,33 +2823,25 @@ int main(void)
 	//printf("'%s'", Common::ConfigManager::kApplicationDomain.c_str());
 
 #if defined(DS_BUILD_A)
-	char* argv[2] = {"/scummvmds", "--config=scummvm.ini"};
+	const char *argv[] = {"/scummvmds"};
 #elif defined(DS_BUILD_B)
-	char* argv[2] = {"/scummvmds", "--config=scummvmb.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmb.ini"};
 #elif defined(DS_BUILD_C)
-	char* argv[2] = {"/scummvmds", "--config=scummvmc.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmc.ini"};
 #elif defined(DS_BUILD_D)
-	char* argv[3] = {"/scummvmds", "--config=scummvmd.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmd.ini"};
 #elif defined(DS_BUILD_E)
-	char* argv[3] = {"/scummvmds", "--config=scummvme.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvme.ini"};
 #elif defined(DS_BUILD_F)
-	char* argv[3] = {"/scummvmds", "--config=scummvmf.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmf.ini"};
 #elif defined(DS_BUILD_G)
-	char* argv[3] = {"/scummvmds", "--config=scummvmg.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmg.ini"};
 #endif
 
-#ifdef DS_NON_SCUMM_BUILD	
-
-	while (1) {
-		scummvm_main(2, (char **) &argv);
-		powerOff();
-	}
-#else
 	while (1) {
-		scummvm_main(1, (char **) &argv);
+		scummvm_main(ARRAYSIZE(argv), (char **) &argv);
 		powerOff();
 	}
-#endif
 
 	return 0;
 }
diff --git a/backends/platform/ds/arm9/source/fat/disc_io.h b/backends/platform/ds/arm9/source/fat/disc_io.h
index 05d4c020bd..2d3da1fc6f 100644
--- a/backends/platform/ds/arm9/source/fat/disc_io.h
+++ b/backends/platform/ds/arm9/source/fat/disc_io.h
@@ -53,7 +53,7 @@
 //----------------------------------------------------------------------
 
 #if defined _CF_USE_DMA && defined _CF_ALLOW_UNALIGNED
- #error You can't use both DMA and unaligned memory
+ #error You can not use both DMA and unaligned memory
 #endif
 
 // When compiling for NDS, make sure NDS is defined
diff --git a/backends/platform/ds/arm9/source/fat/io_efa2.h b/backends/platform/ds/arm9/source/fat/io_efa2.h
index 27c4e9beb8..840c6b83ac 100644
--- a/backends/platform/ds/arm9/source/fat/io_efa2.h
+++ b/backends/platform/ds/arm9/source/fat/io_efa2.h
@@ -26,31 +26,3 @@
 extern LPIO_INTERFACE EFA2_GetInterface(void);
 
 #endif	// define IO_EFA2_H
-/*
-  io_efa2.h by CyteX
-
-  Based on io_mpfc.h by chishm (Michael Chisholm)
-
-  Hardware Routines for reading the NAND flash located on
-  EFA2 flash carts
-
-  This software is completely free. No warranty is provided.
-  If you use it, please give me credit and email me about your
-  project at cytex <at> gmx <dot> de and do not forget to also
-  drop chishm <at> hotmail <dot> com a line
-
-  See gba_nds_fat.txt for help and license details.
-*/
-
-#ifndef IO_EFA2_H
-#define IO_EFA2_H
-
-// 'EFA2'
-#define DEVICE_TYPE_EFA2 0x32414645
-
-#include "disc_io.h"
-
-// export interface
-extern LPIO_INTERFACE EFA2_GetInterface(void);
-
-#endif	// define IO_EFA2_H
diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp
index ca4e617e29..9c8af81a6e 100644
--- a/backends/platform/ds/arm9/source/gbampsave.cpp
+++ b/backends/platform/ds/arm9/source/gbampsave.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "gbampsave.h"
-#include "gba_nds_fat.h"
-#include "ds-fs.h"
-#include "config-manager.h"
+#include "fat/gba_nds_fat.h"
+#include "backends/fs/ds/ds-fs.h"
+#include "common/config-manager.h"
 
 /////////////////////////
 // GBAMP Save File
diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h
index e9188b5312..d0cbc68bfd 100644
--- a/backends/platform/ds/arm9/source/gbampsave.h
+++ b/backends/platform/ds/arm9/source/gbampsave.h
@@ -23,8 +23,8 @@
 #ifndef _GBAMPSAVE_H_
 #define _GBAMPSAVE_H_
 
-#include "system.h"
-#include "ds-fs.h"
+#include "common/system.h"
+#include "backends/fs/ds/ds-fs.h"
 
 #define SAVE_BUFFER_SIZE 100000
 
diff --git a/backends/platform/ds/arm9/source/mad/readme.txt b/backends/platform/ds/arm9/source/mad/readme.txt
index 09a2ec07df..c911ab9271 100644
--- a/backends/platform/ds/arm9/source/mad/readme.txt
+++ b/backends/platform/ds/arm9/source/mad/readme.txt
@@ -1,2 +1 @@
 Put mad.h here if you are compiling with Madlib support enabled.
-Put mad.h here if you are compiling with Madlib support enabled.
\ No newline at end of file
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 1d8d39dcab..6e6b457115 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -22,7 +22,6 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "system.h"
 
 #include "common/util.h"
 #include "common/rect.h"
@@ -32,12 +31,12 @@
 #include "nds.h"
 #include "dsmain.h"
 #include "nds/registers_alt.h"
-#include "config-manager.h"
+#include "common/config-manager.h"
 #include "common/str.h"
 #include "cdaudio.h"
 #include "graphics/surface.h"
 #include "touchkeyboard.h"
-#include "ds-fs-factory.h"
+#include "backends/fs/ds/ds-fs-factory.h"
 
 OSystem_DS* OSystem_DS::_instance = NULL;
 
diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
index f8e005647e..be355ce76f 100644
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ b/backends/platform/ds/arm9/source/ramsave.cpp
@@ -20,7 +20,6 @@
  * 
  */
  // Save in order 1,2,3,4,larger 2,5
-#include "system.h"
 #include "ramsave.h"
 #include "nds.h"
 #include "compressor/lz.h"
diff --git a/backends/platform/ds/arm9/source/ramsave.h b/backends/platform/ds/arm9/source/ramsave.h
index 6add649f56..f919da18db 100644
--- a/backends/platform/ds/arm9/source/ramsave.h
+++ b/backends/platform/ds/arm9/source/ramsave.h
@@ -23,8 +23,8 @@
 #ifndef _RAMSAVE_H_
 #define _RAMSAVE_H_
 
-#include "system.h"
-#include "savefile.h"
+#include "common/system.h"
+#include "common/savefile.h"
 
 // SaveFileManager class
 
diff --git a/backends/platform/ds/arm9/source/wordcompletion.h b/backends/platform/ds/arm9/source/wordcompletion.h
index 39be8511bf..980277d6bb 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.h
+++ b/backends/platform/ds/arm9/source/wordcompletion.h
@@ -1,10 +1,7 @@
-
-
-
 namespace DS {
 
 extern bool findWordCompletions(char* input);
 extern void addAutoCompleteLine(char* line);
 extern void sortAutoCompleteWordList();
 
-}
\ No newline at end of file
+}
diff --git a/backends/platform/ds/makefile b/backends/platform/ds/makefile
index 9c88932a7f..3fb19e939c 100644
--- a/backends/platform/ds/makefile
+++ b/backends/platform/ds/makefile
@@ -15,6 +15,24 @@ all:
 	@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