diff options
| author | Matthew Hoops | 2014-06-02 06:44:53 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2014-06-02 06:44:53 -0400 |
| commit | 98dbb8070b11d2a98a5e9af784a753777a56c9fb (patch) | |
| tree | 37c445de576482dbcd3ecbe0112c7dd4391cef7d /engines | |
| parent | 8bdf4e38bee0e460703bddf9d45615b3ff628e33 (diff) | |
| download | scummvm-rg350-98dbb8070b11d2a98a5e9af784a753777a56c9fb.tar.gz scummvm-rg350-98dbb8070b11d2a98a5e9af784a753777a56c9fb.tar.bz2 scummvm-rg350-98dbb8070b11d2a98a5e9af784a753777a56c9fb.zip | |
GROOVIE: Only compile ROQ when groovie2 is enabled
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/groovie/groovie.cpp | 7 | ||||
| -rw-r--r-- | engines/groovie/module.mk | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 8ba193e0e9..427b1c866a 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -29,10 +29,13 @@ #include "groovie/graphics.h" #include "groovie/music.h" #include "groovie/resource.h" -#include "groovie/roq.h" #include "groovie/stuffit.h" #include "groovie/vdx.h" +#ifdef ENABLE_GROOVIE2 +#include "groovie/roq.h" +#endif + #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/events.h" @@ -159,7 +162,9 @@ Common::Error GroovieEngine::run() { case kGroovieV2: _resMan = new ResMan_v2(); _grvCursorMan = new GrvCursorMan_v2(_system); +#ifdef ENABLE_GROOVIE2 _videoPlayer = new ROQPlayer(this); +#endif break; } diff --git a/engines/groovie/module.mk b/engines/groovie/module.mk index b47eed912b..84d6222c59 100644 --- a/engines/groovie/module.mk +++ b/engines/groovie/module.mk @@ -12,12 +12,16 @@ MODULE_OBJS := \ music.o \ player.o \ resource.o \ - roq.o \ saveload.o \ script.o \ stuffit.o \ vdx.o +ifdef ENABLE_GROOVIE2 +MODULE_OBJS += \ + roq.o +endif + # This module can be built as a plugin ifeq ($(ENABLE_GROOVIE), DYNAMIC_PLUGIN) PLUGIN := 1 |