diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 16fc13fba4..425a48b503 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/configure.in b/configure.in index b1fac0d5e9..c1d220356a 100644 --- a/configure.in +++ b/configure.in @@ -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)])], @@ -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 @@ -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") ;; @@ -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" @@ -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 |