Allow static and dynamic plugins to be used at the same time

svn-id: r31888

3 files changed, 13 insertions, 143 deletions

diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 116d75b191..b114c79b48 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -86,184 +86,54 @@ ARM = 1
 ifdef DS_BUILD_A
 	DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM
 	LOGO = logoa.bmp
-	DISABLE_HE = 1
-	#DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
+	ENABLE_SCUMM = STATIC_PLUGIN
 	USE_ARM_GFX_ASM = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
 	BUILD=scummvm-A
 endif
 
 ifdef DS_BUILD_B
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_B
 	LOGO = logob.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	#DISABLE_SKY = 1#
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	#DISABLE_QUEEN = 1#
-	DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_SKY = STATIC_PLUGIN
+	ENABLE_QUEEN = STATIC_PLUGIN
 	BUILD=scummvm-B
 endif
 
 ifdef DS_BUILD_C
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_C
 	LOGO = logoc.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	#DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_AGOS = STATIC_PLUGIN
 	BUILD=scummvm-C
 endif
 
 ifdef DS_BUILD_D
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_D
 	LOGO = logod.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	#DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	#DISABLE_CINE = 1
-	#DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_GOB = STATIC_PLUGIN
+	ENABLE_CINE = STATIC_PLUGIN
+	ENABLE_AGI = STATIC_PLUGIN
 	BUILD=scummvm-D
 endif
 
-
 ifdef DS_BUILD_E
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_E
 	LOGO = logoe.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	#DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_SAGA = STATIC_PLUGIN
 	BUILD=scummvm-E
 endif
 
-
 ifdef DS_BUILD_F
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_F
 	LOGO = logof.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	DISABLE_SAGA = 1
-	#DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_KYRA = STATIC_PLUGIN
 	BUILD=scummvm-F
-
 endif
 
-
-
 ifdef DS_BUILD_G
 	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_G
 	LOGO = logog.bmp
-	DISABLE_HE = 1
-	DISABLE_SCUMM = 1
-	DISABLE_SCUMM_7_8 = 1
-	DISABLE_AGOS = 1
-	DISABLE_SKY = 1
-	DISABLE_SWORD1 = 1
-	DISABLE_SWORD2 = 1
-	DISABLE_QUEEN = 1
-	DISABLE_SAGA = 1
-	DISABLE_KYRA = 1
-	DISABLE_GOB = 1
-	#DISABLE_LURE = 1
-	DISABLE_CINE = 1
-	DISABLE_AGI = 1
-	DISABLE_TOUCHE = 1
-	DISABLE_PARALLACTION = 1
-	DISABLE_CRUISE = 1
-	DISABLE_DRASCULA = 1
-	DISABLE_IGOR = 1
+	ENABLE_LURE = STATIC_PLUGIN
 	BUILD=scummvm-G
-
 endif
 
 
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 0aed095244..d11e4e6f75 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -359,7 +359,7 @@ void initSprites() {
 
 
 void saveGameBackBuffer() {
-#ifdef DISABLE_SCUMM
+#ifndef ENABLE_SCUMM
     if (savedBuffer == NULL) savedBuffer = new u8[gameWidth * gameHeight];
     for (int r = 0; r < gameHeight; r++) {
 
@@ -375,7 +375,7 @@ void saveGameBackBuffer() {
 }
 
 void restoreGameBackBuffer() {
-#ifdef DISABLE_SCUMM
+#ifndef ENABLE_SCUMM
 	if (savedBuffer) {
 		for (int r = 0; r < gameHeight; r++) {
 
diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp
index b5bebddb54..bf4ce7c909 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.cpp
+++ b/backends/platform/ds/arm9/source/wordcompletion.cpp
@@ -2,7 +2,7 @@
 #include "engines/agi/agi.h"
 #include "osystem_ds.h"
 
-#ifndef DISABLE_AGI
+#ifdef ENABLE_AGI
 
 namespace DS {
 // Default dictionary is about 64Kb, so 128Kb should be enough for future expansion