[Scummvm-cvs-logs] scummvm master -> 98dbb8070b11d2a98a5e9af784a753777a56c9fb
clone2727
clone2727 at gmail.com
Mon Jun 2 12:45:40 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
98dbb8070b GROOVIE: Only compile ROQ when groovie2 is enabled
Commit: 98dbb8070b11d2a98a5e9af784a753777a56c9fb
https://github.com/scummvm/scummvm/commit/98dbb8070b11d2a98a5e9af784a753777a56c9fb
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-06-02T06:44:53-04:00
Commit Message:
GROOVIE: Only compile ROQ when groovie2 is enabled
Changed paths:
engines/groovie/groovie.cpp
engines/groovie/module.mk
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 8ba193e..427b1c8 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 b47eed9..84d6222 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
More information about the Scummvm-git-logs
mailing list