SWORD25: Don't even compile theora related code when that lib is not present
svn-id: r53428
This commit is contained in:
parent
043f2db0c7
commit
fa8275f27b
3 changed files with 11 additions and 5 deletions
2
configure
vendored
2
configure
vendored
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue