[Scummvm-cvs-logs] SF.net SVN: scummvm:[39125] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Mar 4 12:53:25 CET 2009
Revision: 39125
http://scummvm.svn.sourceforge.net/scummvm/?rev=39125&view=rev
Author: lordhoto
Date: 2009-03-04 11:53:25 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Ease conditional LoL compiling with build systems not based on the default one.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/detection.cpp
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/gui_lol.h
scummvm/trunk/engines/kyra/items_lol.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/resource.h
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/screen_lol.h
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/kyra/sprites_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/kyra/timer_lol.cpp
Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/detection.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -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"
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -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 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/gui_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.h 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/gui_lol.h 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#ifndef KYRA_GUI_LOL_H
#define KYRA_GUI_LOL_H
@@ -80,3 +82,5 @@
#endif
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/items_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/items_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,7 @@
*
*/
+#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
@@ -268,4 +269,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -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::go() {
-#ifdef ENABLE_LOL
setupPrologueData(true);
if (!saveFileLoadable(0))
@@ -520,7 +521,6 @@
_tim = 0;
// TODO: outro
-#endif
return Common::kNoError;
}
@@ -1575,3 +1575,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/lol.h 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#ifndef KYRA_LOL_H
#define KYRA_LOL_H
@@ -993,3 +995,5 @@
#endif
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/resource.h 2009-03-04 11:53:25 UTC (rev 39125)
@@ -38,12 +38,9 @@
#include "common/archive.h"
#include "kyra/kyra_v1.h"
+#include "kyra/lol.h"
#include "kyra/kyra_hof.h"
-#ifdef ENABLE_LOL
-#include "kyra/lol.h"
-#endif // ENABLE_LOL
-
namespace Kyra {
class Resource;
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@@ -1608,3 +1610,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/screen_lol.h"
#include "kyra/lol.h"
@@ -626,3 +628,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/screen_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.h 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/screen_lol.h 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#ifndef KYRA_SCREEN_LOL_H
#define KYRA_SCREEN_LOL_H
@@ -97,3 +99,5 @@
#endif
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/timer.h"
@@ -1310,3 +1312,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@@ -571,3 +573,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
@@ -1052,3 +1054,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -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
Modified: scummvm/trunk/engines/kyra/timer_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lol.cpp 2009-03-04 11:14:14 UTC (rev 39124)
+++ scummvm/trunk/engines/kyra/timer_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/timer.h"
@@ -115,3 +117,6 @@
}
} // end of namespace Kyra
+
+#endif // ENABLE_LOL
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list