[Scummvm-cvs-logs] SF.net SVN: scummvm:[40865] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 40865
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40865&view=rev
Author:   lordhoto
Date:     2009-05-24 14:58:40 +0000 (Sun, 24 May 2009)

Log Message:
-----------
Commit patch #2796028 "lol files are always compiled" with some slight extension.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/module.mk
    scummvm/trunk/engines/kyra/sound_lol.cpp

Modified: scummvm/trunk/engines/kyra/module.mk
===================================================================
--- scummvm/trunk/engines/kyra/module.mk	2009-05-24 14:37:53 UTC (rev 40864)
+++ scummvm/trunk/engines/kyra/module.mk	2009-05-24 14:58:40 UTC (rev 40865)
@@ -25,7 +25,6 @@
 	resource_intern.o \
 	saveload.o \
 	saveload_lok.o \
-	saveload_lol.o \
 	saveload_hof.o \
 	saveload_mr.o \
 	scene_v1.o \
@@ -56,7 +55,6 @@
 	sound_towns.o \
 	sound.o \
 	sound_lok.o \
-	sound_lol.o \
 	sprites.o \
 	staticres.o \
 	text.o \
@@ -76,10 +74,12 @@
 	gui_lol.o \
 	items_lol.o \
 	lol.o \
+	saveload_lol.o \
 	scene_lol.o \
 	screen_lol.o \
 	script_lol.o \
 	sequences_lol.o \
+	sound_lol.o \
 	sprites_lol.o \
 	text_lol.o \
 	timer_lol.o

Modified: scummvm/trunk/engines/kyra/sound_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lol.cpp	2009-05-24 14:37:53 UTC (rev 40864)
+++ scummvm/trunk/engines/kyra/sound_lol.cpp	2009-05-24 14:58:40 UTC (rev 40865)
@@ -23,6 +23,8 @@
  *
  */
 
+#ifdef ENABLE_LOL
+
 #include "kyra/sound.h"
 #include "kyra/lol.h"
 #include "kyra/resource.h"
@@ -296,3 +298,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.