libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GROOVIE: Only compile ROQ when groovie2 is enabled

Browse Source
This commit is contained in:
Matthew Hoops 2014-06-02 06:44:53 -04:00
parent 8bdf4e38be
commit 98dbb8070b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/groovie/groovie.cpp
View File

@ -29,10 +29,13 @@
#include "groovie/graphics.h" #include "groovie/graphics.h"
#include "groovie/music.h" #include "groovie/music.h"
#include "groovie/resource.h" #include "groovie/resource.h"
#include "groovie/roq.h"
#include "groovie/stuffit.h" #include "groovie/stuffit.h"
#include "groovie/vdx.h" #include "groovie/vdx.h"
#ifdef ENABLE_GROOVIE2
#include "groovie/roq.h"
#endif
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/debug-channels.h" #include "common/debug-channels.h"
#include "common/events.h" #include "common/events.h"
@ -159,7 +162,9 @@ Common::Error GroovieEngine::run() {
case kGroovieV2: case kGroovieV2:
_resMan = new ResMan_v2(); _resMan = new ResMan_v2();
_grvCursorMan = new GrvCursorMan_v2(_system); _grvCursorMan = new GrvCursorMan_v2(_system);
#ifdef ENABLE_GROOVIE2
_videoPlayer = new ROQPlayer(this); _videoPlayer = new ROQPlayer(this);
#endif
break; break;
} }

6
engines/groovie/module.mk
View File

@ -12,12 +12,16 @@ MODULE_OBJS := \
music.o \ music.o \
player.o \ player.o \
resource.o \ resource.o \
roq.o \
saveload.o \ saveload.o \
script.o \ script.o \
stuffit.o \ stuffit.o \
vdx.o vdx.o
ifdef ENABLE_GROOVIE2
MODULE_OBJS += \
roq.o
endif
# This module can be built as a plugin # This module can be built as a plugin
ifeq ($(ENABLE_GROOVIE), DYNAMIC_PLUGIN) ifeq ($(ENABLE_GROOVIE), DYNAMIC_PLUGIN)
PLUGIN := 1 PLUGIN := 1