thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r53428
This commit is contained in:
Max Horn 2010-10-13 15:00:51 +00:00
parent 043f2db0c7
commit fa8275f27b
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -2417,7 +2417,7 @@ if test "$_theoradec" = yes ; then
LIBS="$LIBS $THEORADEC_LIBS -ltheoradec" LIBS="$LIBS $THEORADEC_LIBS -ltheoradec"
INCLUDES="$INCLUDES $THEORADEC_CFLAGS" INCLUDES="$INCLUDES $THEORADEC_CFLAGS"
fi fi
define_in_config_h_if_yes "$_theoradec" 'USE_THEORADEC' define_in_config_if_yes "$_theoradec" 'USE_THEORADEC'
if test ! "$_theoradec" = notsupported ; then if test ! "$_theoradec" = notsupported ; then
echo "$_theoradec" echo "$_theoradec"
fi fi

2
engines/sword25/kernel/kernel.cpp
View file

@ -34,7 +34,9 @@
#include "common/system.h" #include "common/system.h"
#include "sword25/gfx/graphicengine.h" #include "sword25/gfx/graphicengine.h"
#ifdef USE_THEORADEC
#include "sword25/fmv/movieplayer.h" #include "sword25/fmv/movieplayer.h"
#endif
#include "sword25/input/inputengine.h" #include "sword25/input/inputengine.h"
#include "sword25/kernel/kernel.h" #include "sword25/kernel/kernel.h"
#include "sword25/kernel/persistenceservice.h" #include "sword25/kernel/persistenceservice.h"

12
engines/sword25/module.mk
View file

@ -3,10 +3,6 @@ MODULE := engines/sword25
MODULE_OBJS := \ MODULE_OBJS := \
detection.o \ detection.o \
sword25.o \ sword25.o \
fmv/movieplayer.o \
fmv/movieplayer_script.o \
fmv/theora_decoder.o \
fmv/yuvtorgba.o \
gfx/animation.o \ gfx/animation.o \
gfx/animationdescription.o \ gfx/animationdescription.o \
gfx/animationresource.o \ gfx/animationresource.o \
@ -99,6 +95,14 @@ MODULE_OBJS := \
util/pluto/pluto.o \ util/pluto/pluto.o \
util/pluto/plzio.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 # This module can be built as a plugin
ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN) ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
PLUGIN := 1 PLUGIN := 1