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

[fingolfin at users.sourceforge.net]

Revision: 51473
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51473&view=rev
Author:   fingolfin
Date:     2010-07-29 16:24:08 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
DS: Get rid of DS_NON_SCUMM_BUILD and DS_SCUMM_BUILD

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/makefile
    scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2010-07-29 15:50:53 UTC (rev 51472)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2010-07-29 16:24:08 UTC (rev 51473)
@@ -110,7 +110,7 @@
 #WRAP_MALLOC = 1
 
 ifdef DS_BUILD_A
-	DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
+	DEFINES = -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
 	LOGO = logoa.bmp
 	ENABLE_SCUMM = STATIC_PLUGIN
 	USE_ARM_GFX_ASM = 1
@@ -118,7 +118,7 @@
 endif
 
 ifdef DS_BUILD_B
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_B
+	DEFINES = -DDS_BUILD_B
 	LOGO = logob.bmp
 	ENABLE_SKY = STATIC_PLUGIN
 	ENABLE_QUEEN = STATIC_PLUGIN
@@ -126,14 +126,14 @@
 endif
 
 ifdef DS_BUILD_C
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_C
+	DEFINES = -DDS_BUILD_C
 	LOGO = logoc.bmp
 	ENABLE_AGOS = STATIC_PLUGIN
 	BUILD=scummvm-C
 endif
 
 ifdef DS_BUILD_D
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_D
+	DEFINES = -DDS_BUILD_D
 	LOGO = logod.bmp
 	ENABLE_GOB = STATIC_PLUGIN
 	ENABLE_CINE = STATIC_PLUGIN
@@ -142,42 +142,42 @@
 endif
 
 ifdef DS_BUILD_E
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_E
+	DEFINES = -DDS_BUILD_E
 	LOGO = logoe.bmp
 	ENABLE_SAGA = STATIC_PLUGIN
 	BUILD=scummvm-E
 endif
 
 ifdef DS_BUILD_F
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_F
+	DEFINES = -DDS_BUILD_F
 	LOGO = logof.bmp
 	ENABLE_KYRA = STATIC_PLUGIN
 	BUILD=scummvm-F
 endif
 
 ifdef DS_BUILD_G
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_G
+	DEFINES = -DDS_BUILD_G
 	LOGO = logog.bmp
 	ENABLE_LURE = STATIC_PLUGIN
 	BUILD=scummvm-G
 endif
 
 ifdef DS_BUILD_H
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_H
+	DEFINES = -DDS_BUILD_H
 	LOGO = logoh.bmp
 	ENABLE_PARALLACTION = STATIC_PLUGIN
 	BUILD=scummvm-H
 endif
 
 ifdef DS_BUILD_I
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_I
+	DEFINES = -DDS_BUILD_I
 	LOGO = logoi.bmp
 	ENABLE_MADE = STATIC_PLUGIN
 	BUILD=scummvm-I
 endif
 
 ifdef DS_BUILD_K
-	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_K
+	DEFINES = -DDS_BUILD_K
 	LOGO = logok.bmp
 	ENABLE_CRUISE = STATIC_PLUGIN
 	BUILD=scummvm-K
@@ -185,14 +185,14 @@
 
 
 #ifdef DS_BUILD_L
-#	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_L
+#	DEFINES = -DDS_BUILD_L
 #	LOGO = logog.bmp
 #	ENABLE_DRASCULA = STATIC_PLUGIN
 #	BUILD=scummvm-K
 #endif
 
 #ifdef DS_BUILD_M
-#	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_M
+#	DEFINES = -DDS_BUILD_M
 #	LOGO = logog.bmp
 #	ENABLE_TUCKER = STATIC_PLUGIN
 #	BUILD=scummvm-K

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp	2010-07-29 15:50:53 UTC (rev 51472)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp	2010-07-29 16:24:08 UTC (rev 51473)
@@ -128,12 +128,6 @@
 
 	_radioButtonMode = false;
 
-#ifdef DS_SCUMM_BUILD
-	if (!DS::isGBAMPAvailable()) {
-//		addButton(this, 100, 140, "Delete Save", 0, 'dels', 'D');
-	}
-#endif
-
 //	new GUI::StaticTextWidget(this, 90, 10, 130, 15, "ScummVM DS Options", Graphics::kTextAlignCenter);
 
 


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