[Scummvm-cvs-logs] SF.net SVN: scummvm:[53428] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 53428
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53428&view=rev
Author:   fingolfin
Date:     2010-10-13 15:00:51 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Don't even compile theora related code when that lib is not present

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/engines/sword25/kernel/kernel.cpp
    scummvm/trunk/engines/sword25/module.mk

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-10-13 15:00:28 UTC (rev 53427)
+++ scummvm/trunk/configure	2010-10-13 15:00:51 UTC (rev 53428)
@@ -2417,7 +2417,7 @@
 	LIBS="$LIBS $THEORADEC_LIBS -ltheoradec"
 	INCLUDES="$INCLUDES $THEORADEC_CFLAGS"
 fi
-define_in_config_h_if_yes "$_theoradec" 'USE_THEORADEC'
+define_in_config_if_yes "$_theoradec" 'USE_THEORADEC'
 if test ! "$_theoradec" = notsupported ; then
 	echo "$_theoradec"
 fi

Modified: scummvm/trunk/engines/sword25/kernel/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.cpp	2010-10-13 15:00:28 UTC (rev 53427)
+++ scummvm/trunk/engines/sword25/kernel/kernel.cpp	2010-10-13 15:00:51 UTC (rev 53428)
@@ -34,7 +34,9 @@
 
 #include "common/system.h"
 #include "sword25/gfx/graphicengine.h"
+#ifdef USE_THEORADEC
 #include "sword25/fmv/movieplayer.h"
+#endif
 #include "sword25/input/inputengine.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/kernel/persistenceservice.h"

Modified: scummvm/trunk/engines/sword25/module.mk
===================================================================
--- scummvm/trunk/engines/sword25/module.mk	2010-10-13 15:00:28 UTC (rev 53427)
+++ scummvm/trunk/engines/sword25/module.mk	2010-10-13 15:00:51 UTC (rev 53428)
@@ -3,10 +3,6 @@
 MODULE_OBJS := \
 	detection.o \
 	sword25.o \
-	fmv/movieplayer.o \
-	fmv/movieplayer_script.o \
-	fmv/theora_decoder.o \
-	fmv/yuvtorgba.o \
 	gfx/animation.o \
 	gfx/animationdescription.o \
 	gfx/animationresource.o \
@@ -99,6 +95,14 @@
 	util/pluto/pluto.o \
 	util/pluto/plzio.o
 
+ifdef USE_THEORADEC
+MODULE_OBJS += \
+	fmv/movieplayer.o \
+	fmv/movieplayer_script.o \
+	fmv/theora_decoder.o \
+	fmv/yuvtorgba.o
+endif
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
 PLUGIN := 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.