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

svn-id: r31888

7 files changed, 9 insertions, 9 deletions

diff --git a/engines/scumm/he/cup_player_he.h b/engines/scumm/he/cup_player_he.h
index b9f257add1..1b1c32d86f 100644
--- a/engines/scumm/he/cup_player_he.h
+++ b/engines/scumm/he/cup_player_he.h
@@ -24,7 +24,7 @@
  */
 
 
-#if !defined(SCUMM_HE_CUP_PLAYER_HE_H) && !defined(DISABLE_HE)
+#if !defined(SCUMM_HE_CUP_PLAYER_HE_H) && defined(ENABLE_HE)
 #define SCUMM_HE_CUP_PLAYER_HE_H
 
 #include "common/stream.h"
diff --git a/engines/scumm/he/floodfill_he.h b/engines/scumm/he/floodfill_he.h
index d449599f7d..cfc672436c 100644
--- a/engines/scumm/he/floodfill_he.h
+++ b/engines/scumm/he/floodfill_he.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if !defined(SCUMM_HE_FLOODFILL_HE_H) && !defined(DISABLE_HE)
+#if !defined(SCUMM_HE_FLOODFILL_HE_H) && defined(ENABLE_HE)
 #define SCUMM_HE_FLOODFILL_HE_H
 
 #include "common/rect.h"
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 324c975213..fff8502134 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -27,7 +27,7 @@
 #define SCUMM_HE_INTERN_HE_H
 
 #include "scumm/intern.h"
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
 #include "scumm/he/floodfill_he.h"
 #include "scumm/he/wiz_he.h"
 #endif
@@ -40,7 +40,7 @@ class WriteStream;
 namespace Scumm {
 
 class ResExtractor;
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
 class LogicHE;
 class MoviePlayer;
 class Sprite;
@@ -178,7 +178,7 @@ protected:
 	byte VAR_NUM_SOUND_CHANNELS;
 };
 
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
 class ScummEngine_v71he : public ScummEngine_v70he {
 	friend class Wiz;
 
diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h
index 96de40f287..b144f78c46 100644
--- a/engines/scumm/he/logic_he.h
+++ b/engines/scumm/he/logic_he.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if !defined(SCUMM_HE_LOGIC_HE_H) && !defined(DISABLE_HE)
+#if !defined(SCUMM_HE_LOGIC_HE_H) && defined(ENABLE_HE)
 #define SCUMM_HE_LOGIC_HE_H
 
 
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 75da8cd04a..33e6748860 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -1524,7 +1524,7 @@ void ScummEngine_v70he::readGlobalObjects() {
 #endif
 }
 
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
 void ScummEngine_v99he::readMAXS(int blockSize) {
 	if (blockSize == 52) {
 		debug(0, "ScummEngine_v99he readMAXS: MAXS has blocksize %d", blockSize);
diff --git a/engines/scumm/he/sprite_he.h b/engines/scumm/he/sprite_he.h
index 55c1093f00..73a05af579 100644
--- a/engines/scumm/he/sprite_he.h
+++ b/engines/scumm/he/sprite_he.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if !defined(SCUMM_HE_SPRITE_HE_H) && !defined(DISABLE_HE)
+#if !defined(SCUMM_HE_SPRITE_HE_H) && defined(ENABLE_HE)
 #define SCUMM_HE_SPRITE_HE_H
 
 namespace Scumm {
diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h
index 186dbced6d..6887b45299 100644
--- a/engines/scumm/he/wiz_he.h
+++ b/engines/scumm/he/wiz_he.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if !defined(SCUMM_HE_WIZ_HE_H) && !defined(DISABLE_HE)
+#if !defined(SCUMM_HE_WIZ_HE_H) && defined(ENABLE_HE)
 #define SCUMM_HE_WIZ_HE_H
 
 #include "common/rect.h"