aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-24 14:58:40 +0000
committerJohannes Schickel2009-05-24 14:58:40 +0000
commite9401655dd84618e3bf6cf82a58e78c33f41b384 (patch)
tree3c56a3621e7741088079f708cb11eb98d5a8508f /engines/kyra
parent6651cdc97c19571966eb29936e7849af003008b7 (diff)
downloadscummvm-rg350-e9401655dd84618e3bf6cf82a58e78c33f41b384.tar.gz
scummvm-rg350-e9401655dd84618e3bf6cf82a58e78c33f41b384.tar.bz2
scummvm-rg350-e9401655dd84618e3bf6cf82a58e78c33f41b384.zip
Commit patch #2796028 "lol files are always compiled" with some slight extension.
svn-id: r40865
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/module.mk4
-rw-r--r--engines/kyra/sound_lol.cpp5
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index eafc1f5436..6ff6cf115e 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -25,7 +25,6 @@ MODULE_OBJS := \
resource_intern.o \
saveload.o \
saveload_lok.o \
- saveload_lol.o \
saveload_hof.o \
saveload_mr.o \
scene_v1.o \
@@ -56,7 +55,6 @@ MODULE_OBJS := \
sound_towns.o \
sound.o \
sound_lok.o \
- sound_lol.o \
sprites.o \
staticres.o \
text.o \
@@ -76,10 +74,12 @@ MODULE_OBJS += \
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
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index 4cd033c885..1c6d427661 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_LOL
+
#include "kyra/sound.h"
#include "kyra/lol.h"
#include "kyra/resource.h"
@@ -296,3 +298,6 @@ int LoLEngine::snd_stopMusic() {
}
} // end of namespace Kyra
+
+#endif // ENABLE_LOL
+