diff options
| author | Max Horn | 2010-10-13 15:00:51 +0000 |
|---|---|---|
| committer | Max Horn | 2010-10-13 15:00:51 +0000 |
| commit | fa8275f27b69b311c9c64dbb38b524e0c61006fe (patch) | |
| tree | c2e2dde42d8f30b2550af73fa16657eaeef9592b | |
| parent | 043f2db0c747c68a9188eba1c58ccc993c0bfa52 (diff) | |
| download | scummvm-rg350-fa8275f27b69b311c9c64dbb38b524e0c61006fe.tar.gz scummvm-rg350-fa8275f27b69b311c9c64dbb38b524e0c61006fe.tar.bz2 scummvm-rg350-fa8275f27b69b311c9c64dbb38b524e0c61006fe.zip | |
SWORD25: Don't even compile theora related code when that lib is not present
svn-id: r53428
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/kernel.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/module.mk | 12 |
3 files changed, 11 insertions, 5 deletions
@@ -2417,7 +2417,7 @@ if test "$_theoradec" = yes ; then 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 diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp index d976a36ab5..78181bc4d3 100644 --- a/engines/sword25/kernel/kernel.cpp +++ b/engines/sword25/kernel/kernel.cpp @@ -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" diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk index 76d44cc3fc..1f5374e353 100644 --- a/engines/sword25/module.mk +++ b/engines/sword25/module.mk @@ -3,10 +3,6 @@ MODULE := engines/sword25 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 @@ MODULE_OBJS := \ 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 |