[Scummvm-cvs-logs] SF.net SVN: scummvm:[39126] scummvm/branches/branch-0-13-0/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Mar 4 12:57:52 CET 2009
Revision: 39126
http://scummvm.svn.sourceforge.net/scummvm/?rev=39126&view=rev
Author: lordhoto
Date: 2009-03-04 11:57:52 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Backport of r39125: "Ease conditional LoL compiling with build systems not based on the default one.". This should fix MSVC build.
Modified Paths:
--------------
scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp
scummvm/branches/branch-0-13-0/engines/kyra/gui_lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/items_lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/lol.h
scummvm/branches/branch-0-13-0/engines/kyra/resource.h
scummvm/branches/branch-0-13-0/engines/kyra/scene_lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.h
scummvm/branches/branch-0-13-0/engines/kyra/script_lol.cpp
scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp
Modified: scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -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 "common/advancedDetector.h"
Modified: scummvm/branches/branch-0-13-0/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/gui_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/gui_lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
@@ -361,3 +363,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/items_lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/items_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/items_lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,7 @@
*
*/
+#ifdef ENABLE_LOL
#include "kyra/lol.h"
@@ -183,4 +184,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
Modified: scummvm/branches/branch-0-13-0/engines/kyra/lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@@ -1833,3 +1835,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/lol.h
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/lol.h 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/lol.h 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#ifndef KYRA_LOL_H
#define KYRA_LOL_H
@@ -673,3 +675,5 @@
#endif
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/resource.h
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/resource.h 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/resource.h 2009-03-04 11:57:52 UTC (rev 39126)
@@ -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/branches/branch-0-13-0/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/scene_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/scene_lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@@ -1384,3 +1386,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/screen_lol.h"
#include "kyra/lol.h"
@@ -318,3 +320,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.h
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.h 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/screen_lol.h 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#ifndef KYRA_SCREEN_LOL_H
#define KYRA_SCREEN_LOL_H
@@ -81,3 +83,5 @@
#endif
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/script_lol.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/script_lol.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@@ -465,3 +467,5 @@
} // end of namespace Kyra
+#endif // ENABLE_LOL
+
Modified: scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp 2009-03-04 11:53:25 UTC (rev 39125)
+++ scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp 2009-03-04 11:57:52 UTC (rev 39126)
@@ -27,11 +27,13 @@
#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"
@@ -39,11 +41,6 @@
#include "kyra/gui_hof.h"
#include "kyra/gui_mr.h"
-#ifdef ENABLE_LOL
-#include "kyra/lol.h"
-#include "kyra/screen_lol.h"
-#endif // ENABLE_LOL
-
namespace Kyra {
#define RESFILE_VERSION 35
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