Ease conditional LoL compiling with build systems not based on the default one.

svn-id: r39125

15 files changed, 52 insertions, 15 deletions

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index e125ca06eb..fcd01a39a5 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -24,12 +24,10 @@
 
 #include "kyra/kyra_v1.h"
 #include "kyra/kyra_lok.h"
+#include "kyra/lol.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
 
-#ifdef ENABLE_LOL
-#include "kyra/lol.h"
-#endif // ENABLE_LOL
 
 #include "common/config-manager.h"
 #include "engines/advancedDetector.h"
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 009ba3063f..68cd379d5c 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/gui_lol.h"
@@ -1735,3 +1737,5 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h
index 29dc1da406..29eeaa10f8 100644
--- a/engines/kyra/gui_lol.h
+++ b/engines/kyra/gui_lol.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #ifndef KYRA_GUI_LOL_H
 #define KYRA_GUI_LOL_H
 
@@ -80,3 +82,5 @@ private:
 
 #endif
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index 7c584f7738..8bbcc91332 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#ifdef ENABLE_LOL
 
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
@@ -268,4 +269,5 @@ void LoLEngine::foundItemSub(int item, int block) {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 24f8aae5a1..399427ec1c 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/resource.h"
@@ -433,7 +435,6 @@ Common::Error LoLEngine::init() {
 }
 
 Common::Error LoLEngine::go() {
-#ifdef ENABLE_LOL
 	setupPrologueData(true);
 
 	if (!saveFileLoadable(0))
@@ -520,7 +521,6 @@ Common::Error LoLEngine::go() {
 	_tim = 0;
 
 	// TODO: outro
-#endif
 	return Common::kNoError;
 }
 
@@ -1575,3 +1575,5 @@ bool LoLEngine::notEnoughMagic(int charNum, int spellNum, int spellLevel) {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index a3cb4342cd..ae52627fac 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #ifndef KYRA_LOL_H
 #define KYRA_LOL_H
 
@@ -993,3 +995,5 @@ private:
 
 #endif
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 47b8b3da15..06227d58d9 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -38,11 +38,8 @@
 #include "common/archive.h"
 
 #include "kyra/kyra_v1.h"
-#include "kyra/kyra_hof.h"
-
-#ifdef ENABLE_LOL
 #include "kyra/lol.h"
-#endif // ENABLE_LOL
+#include "kyra/kyra_hof.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index dbb3fe82ad..687b6a17cf 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/resource.h"
@@ -1608,3 +1610,5 @@ void LoLEngine::drawScriptShapes(int pageNum) {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 4eee909ff2..19f2d16d8b 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/screen_lol.h"
 #include "kyra/lol.h"
 
@@ -626,3 +628,5 @@ uint8 Screen_LoL::getShapePaletteSize(const uint8 *shp) {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h
index 3dcce8a486..58267312e5 100644
--- a/engines/kyra/screen_lol.h
+++ b/engines/kyra/screen_lol.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #ifndef KYRA_SCREEN_LOL_H
 #define KYRA_SCREEN_LOL_H
 
@@ -97,3 +99,5 @@ private:
 
 #endif
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 8d0ba48f8a..d21494cc85 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/timer.h"
@@ -1310,3 +1312,5 @@ void LoLEngine::setupOpcodeTable() {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index b36364d960..4037b9c30b 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/resource.h"
@@ -571,3 +573,5 @@ int LoLEngine::selectionCharAccept() {
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index d4a2421953..b95e95d18f 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 
@@ -1052,3 +1054,5 @@ void LoLEngine::walkMonsterGetNextStepCoords(int16 srcX, int16 srcY, int &newX,
 
 } // end of namespace Kyra
 
+#endif // ENABLE_LOL
+
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 24d2e6aafd..588ce4ac1d 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -27,24 +27,21 @@
 #include "common/md5.h"
 #include "kyra/kyra_v1.h"
 #include "kyra/kyra_lok.h"
+#include "kyra/lol.h"
 #include "kyra/kyra_v2.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
 #include "kyra/screen.h"
 #include "kyra/screen_lok.h"
+#include "kyra/screen_lol.h"
 #include "kyra/screen_hof.h"
 #include "kyra/screen_mr.h"
 #include "kyra/resource.h"
 #include "kyra/gui_lok.h"
+#include "kyra/gui_lol.h"
 #include "kyra/gui_hof.h"
 #include "kyra/gui_mr.h"
 
-#ifdef ENABLE_LOL
-#include "kyra/lol.h"
-#include "kyra/screen_lol.h"
-#include "kyra/gui_lol.h"
-#endif // ENABLE_LOL
-
 namespace Kyra {
 
 #define RESFILE_VERSION 40
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index 6bbb9e6b2c..39b89416e0 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/timer.h"
@@ -115,3 +117,6 @@ void LoLEngine::timerFadeMessageText(int timerNum) {
 }
 
 } // end of namespace Kyra
+
+#endif // ENABLE_LOL
+