configure/depends: rename 'USE_TEXTUREPACKER_NATIVE_ROOT' to 'NATIVE_ROOT' for genera...

diff --git a/configure.in b/configure.in
index ef0e051..daf5477 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -695,7 +695,7 @@ case $host in
 esac
 AC_SUBST([ARCH])
 
-check_sdl_arch=[`file $USE_TEXTUREPACKER_NATIVE_ROOT/lib/libSDL_image.dylib | awk '{print $NF}'`]
+check_sdl_arch=[`file $NATIVE_ROOT/lib/libSDL_image.dylib | awk '{print $NF}'`]
 if test "x$check_sdl_arch" = "xi386" ; then
   DARWIN_NATIVE_ARCH=-m32
 elif test "x$check_sdl_arch" = "xx86_64" ; then
@@ -1960,6 +1960,12 @@ AC_C_BIGENDIAN
 
 if test "$cross_compiling" = "yes"; then
   final_message="$final_message\n  Crosscomp.:\tYes"
+  if [[ -d "$NATIVE_ROOT" ]]; then
+    CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -I$NATIVE_ROOT/include"
+    CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -I$NATIVE_ROOT/include"
+    LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD -L$NATIVE_ROOT/lib"
+    final_message="$final_message\n  Native Root:\t$NATIVE_ROOT"
+  fi
 else
   final_message="$final_message\n  Crosscomp.:\tNo"
 fi
@@ -2103,8 +2109,8 @@ if test "x$use_texturepacker" != "xno"; then
   USE_TEXTUREPACKER=1
   if test "x$use_texturepacker_native" = "xyes"; then
     USE_TEXTUREPACKER_NATIVE=1
-    if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then 
-      USE_TEXTUREPACKER_NATIVE_ROOT= 
+    if [[ ! -d "$NATIVE_ROOT" ]]; then
+      NATIVE_ROOT=
     fi
   fi
 else
@@ -2517,7 +2523,7 @@ AC_SUBST(USE_XRANDR)
 AC_SUBST(USE_ALSA)
 AC_SUBST(USE_TEXTUREPACKER)
 AC_SUBST(USE_TEXTUREPACKER_NATIVE)
-AC_SUBST(USE_TEXTUREPACKER_NATIVE_ROOT)
+AC_SUBST(NATIVE_ROOT)
 AC_SUBST(USE_AIRTUNES)
 AC_SUBST(USE_LIBUDEV)
 AC_SUBST(USE_LIBUSB)

diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
index 71e3d4a..343182c 100644 (file)
--- a/tools/TexturePacker/Makefile.in
+++ b/tools/TexturePacker/Makefile.in
@@ -12,7 +12,7 @@ CXXFLAGS+= \
 RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
 
 ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
+NATIVE_ROOT_PATH=@NATIVE_ROOT@
 ifdef NATIVE_ROOT_PATH
 ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
 DEFINES += -DTARGET_DARWIN

diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in
index 7cc470d..207748a 100644 (file)
--- a/tools/depends/target/config.site.in
+++ b/tools/depends/target/config.site.in
@@ -39,7 +39,7 @@ PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm
 PYTHON_CPPFLAGS=-I@prefix@/@deps_dir@/include/python${PYTHON_VERSION}
 PYTHON_SITE_PKG=@prefix@/@deps_dir@/lib/python${PYTHON_VERSION}/site-packages
 PYTHON_NOVERSIONCHECK=no-check
-USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@tool_dir@
+NATIVE_ROOT=@prefix@/@tool_dir@
 
 #afps-ng and libomxil-bellagio
 ac_cv_func_malloc_0_nonnull=yes

diff --git a/tools/rbp/depends/depends.mk b/tools/rbp/depends/depends.mk
index bafa99c..d805001 100644 (file)
--- a/tools/rbp/depends/depends.mk
+++ b/tools/rbp/depends/depends.mk
@@ -19,7 +19,7 @@ ifeq ($(USE_BUILDROOT),1)
        export PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig
        export PYTHON_VERSION=2.7
        export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
-       export USE_TEXTUREPACKER_NATIVE_ROOT=/usr
+       export NATIVE_ROOT=/usr
        export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) -lpthread -ldl -lutil -lm
 else
        export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations
@@ -47,7 +47,7 @@ else
        export PKG_CONFIG_PATH=$(PREFIX)/bin/pkg-config
        export PYTHON_VERSION=2.6
        export PATH:=${PREFIX}/bin:$(PATH):${TOOLCHAIN}/bin
-       export USE_TEXTUREPACKER_NATIVE_ROOT=/usr
+       export NATIVE_ROOT=/usr
        export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION)
 endif
 export PYTHON_CPPFLAGS=-I$(SDKSTAGE)/usr/include/python$(PYTHON_VERSION)