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

svn-id: r31888

18 files changed, 39 insertions, 39 deletions

diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h
index 40485a5927..c2bb51385a 100644
--- a/backends/platform/PalmOS/Src/prefixes/compile.h
+++ b/backends/platform/PalmOS/Src/prefixes/compile.h
@@ -26,27 +26,27 @@
 #ifndef __COMPILE_H__
 #define __COMPILE_H__
 
-#define DISABLE_SCUMM
-#define DISABLE_SCUMM_7_8
-#define DISABLE_HE
+#undef ENABLE_SCUMM
+#undef ENABLE_SCUMM_7_8
+#undef ENABLE_HE
 
-#define DISABLE_AGOS
-#define DISABLE_SKY
-#define DISABLE_SWORD1
-#define DISABLE_SWORD2
-#define DISABLE_QUEEN
-#define DISABLE_SAGA
-#define DISABLE_KYRA
-#define DISABLE_AWE
-#define DISABLE_GOB
-#define DISABLE_LURE
-#define DISABLE_CINE
-#define DISABLE_AGI
-#define DISABLE_TOUCHE
-#define DISABLE_PARALLACTION
-#define DISABLE_CRUISE
-#define DISABLE_DRASCULA
-#define DISABLE_IGOR
+#undef ENABLE_AGOS
+#undef ENABLE_SKY
+#undef ENABLE_SWORD1
+#undef ENABLE_SWORD2
+#undef ENABLE_QUEEN
+#undef ENABLE_SAGA
+#undef ENABLE_KYRA
+#undef ENABLE_AWE
+#undef ENABLE_GOB
+#undef ENABLE_LURE
+#undef ENABLE_CINE
+#undef ENABLE_AGI
+#undef ENABLE_TOUCHE
+#undef ENABLE_PARALLACTION
+#undef ENABLE_CRUISE
+#undef ENABLE_DRASCULA
+#undef ENABLE_IGOR
 
 // ScummVM
 #define DISABLE_HQ_SCALERS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_agi.h b/backends/platform/PalmOS/Src/prefixes/native_agi.h
index 790f108efa..f3feee8c70 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_agi.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_agi.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_AGI
+#define ENABLE_AGI STATIC_PLUGIN
 
 #undef USE_MAD
 #undef USE_VORBIS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_agos.h b/backends/platform/PalmOS/Src/prefixes/native_agos.h
index f3b3476262..8a804e3116 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_agos.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_agos.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_AGOS
+#define ENABLE_AGOS STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_cine.h b/backends/platform/PalmOS/Src/prefixes/native_cine.h
index bacdfa2047..3d19d9c557 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_cine.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_cine.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_CINE
+#define ENABLE_CINE STATIC_PLUGIN
 #define _DEBUG
 
 #undef USE_MAD
diff --git a/backends/platform/PalmOS/Src/prefixes/native_cruise.h b/backends/platform/PalmOS/Src/prefixes/native_cruise.h
index 9bc0cdac13..89e6e65a70 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_cruise.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_cruise.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_CRUISE
+#define ENABLE_CRUISE STATIC_PLUGIN
 
 #undef USE_MAD
 #undef USE_VORBIS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_drascula.h b/backends/platform/PalmOS/Src/prefixes/native_drascula.h
index 3904cc98ba..35bc381af4 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_drascula.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_drascula.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_DRASCULA
+#define ENABLE_DRASCULA STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_gob.h b/backends/platform/PalmOS/Src/prefixes/native_gob.h
index 16863cd5b6..9cb34099d0 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_gob.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_gob.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_GOB
+#define ENABLE_GOB STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_igor.h b/backends/platform/PalmOS/Src/prefixes/native_igor.h
index 749be9daaf..2808dd2331 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_igor.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_igor.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_IGOR
+#define ENABLE_IGOR STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_kyra.h b/backends/platform/PalmOS/Src/prefixes/native_kyra.h
index 7f6dd57565..c89b0a5b93 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_kyra.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_kyra.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_KYRA
+#define ENABLE_KYRA
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_lure.h b/backends/platform/PalmOS/Src/prefixes/native_lure.h
index b017c46fe6..71835ee644 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_lure.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_lure.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_LURE
+#define ENABLE_LURE STATIC_PLUGIN
 
 #undef USE_MAD
 #undef USE_VORBIS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_parallaction.h b/backends/platform/PalmOS/Src/prefixes/native_parallaction.h
index 545cdd36fd..e8d46cc382 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_parallaction.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_parallaction.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_PARALLACTION
+#define ENABLE_PARALLACTION STATIC_PLUGIN
 
 #undef USE_MAD
 #undef USE_VORBIS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_queen.h b/backends/platform/PalmOS/Src/prefixes/native_queen.h
index d2a1b44ef8..85bb5a0a04 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_queen.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_queen.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_QUEEN
+#define ENABLE_QUEEN STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_saga.h b/backends/platform/PalmOS/Src/prefixes/native_saga.h
index 1a728e6bcb..19db05b633 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_saga.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_saga.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SAGA
+#define ENABLE_SAGA STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_scumm.h b/backends/platform/PalmOS/Src/prefixes/native_scumm.h
index 5014a8d5ff..b8433a3fa8 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_scumm.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_scumm.h
@@ -2,9 +2,9 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SCUMM
-#undef DISABLE_SCUMM_7_8
-#undef DISABLE_HE
+#define ENABLE_SCUMM STATIC_PLUGIN
+#define ENABLE_SCUMM_7_8
+#define ENABLE_HE
 
 #define USE_ARM_GFX_ASM
 #define USE_ARM_SMUSH_ASM
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sky.h b/backends/platform/PalmOS/Src/prefixes/native_sky.h
index 193c57e87d..49b157471f 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_sky.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_sky.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SKY
+#define ENABLE_SKY STATIC_PLUGIN
 
 #endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword1.h b/backends/platform/PalmOS/Src/prefixes/native_sword1.h
index 8e52a978a8..aaae4c9b86 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_sword1.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_sword1.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SWORD1
+#define ENABLE_SWORD1
 #define USE_MPEG2
 #define USE_VORBIS
 
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword2.h b/backends/platform/PalmOS/Src/prefixes/native_sword2.h
index f74a8bcc9a..5e9c45b047 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_sword2.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_sword2.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SWORD2
+#define ENABLE_SWORD2 STATIC_PLUGIN
 #undef _DEBUG
 #define USE_MPEG2
 #define USE_VORBIS
diff --git a/backends/platform/PalmOS/Src/prefixes/native_touche.h b/backends/platform/PalmOS/Src/prefixes/native_touche.h
index 486630b799..acf50e2787 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_touche.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_touche.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_TOUCHE
+#define ENABLE_TOUCHE STATIC_PLUGIN
 
 #endif