Skip to content

Commit

Permalink
added configure arg to enable/disable texturepacker
Browse files Browse the repository at this point in the history
  • Loading branch information
davilla committed Apr 30, 2011
1 parent 19911bc commit be61ad9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ configure: configure.in
@./bootstrap

# skin textures
ifneq ($(findstring arm,@ARCH@), arm)
ifeq (@USE_TEXTUREPACKER@,1)
skins: tools/TexturePacker/TexturePacker force
$(MAKE) -C $(CONFLUENCE_MEDIA)
else
Expand Down
17 changes: 17 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,12 @@ AC_ARG_ENABLE([libbluray],
[use_libbluray=$enableval],
[use_libbluray=auto])

AC_ARG_ENABLE([texturepacker],
[AS_HELP_STRING([--enable-texturepacker],
[enable texturepacker support (default is yes)])],
[use_texturepacker=$enableval],
[use_texturepacker=auto])

AC_ARG_WITH([lirc-device],
[AS_HELP_STRING([--with-lirc-device=file],
[specify the default LIRC device (default is /dev/lircd)])],
Expand Down Expand Up @@ -334,6 +340,7 @@ case $host in
use_joystick=no
use_vdadecoder=no
use_vtbdecoder=yes
use_texturepacker=no
ARCH="arm-osx"
SYSROOT="-miphoneos-version-min=4.1 -isysroot $SDKROOT"
ARCHTYPE=$HOSTTYPE
Expand Down Expand Up @@ -376,6 +383,7 @@ case $host in
AC_SUBST(ARCH_DEFINES, "-D_POWERPC64")
;;
arm*-*-linux-gnu*)
use_texturepacker=no
ARCH="arm"
AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
;;
Expand Down Expand Up @@ -1219,6 +1227,14 @@ else
final_message="$final_message\n Bluray:\tNo"
fi

if test "x$use_texturepacker" != "xno"; then
final_message="$final_message\n TexturePacker:Yes"
USE_TEXTUREPACKER=1
else
final_message="$final_message\n TexturePacker:No"
USE_TEXTUREPACKER=0
fi

if test "$use_mid" = "yes"; then
final_message="$final_message\n MID Support:\tYes"
SDL_DEFINES="$SDL_DEFINES -DMID"
Expand Down Expand Up @@ -1446,6 +1462,7 @@ AC_SUBST(USE_VDA)
AC_SUBST(USE_OPENMAX)
AC_SUBST(USE_PULSE)
AC_SUBST(USE_XRANDR)
AC_SUBST(USE_TEXTUREPACKER)

# pushd and popd are not available in other shells besides bash, so implement
# our own pushd/popd functions
Expand Down

0 comments on commit be61ad9

Please sign in to comment.