[droid] - nearly forgot to make use of the DARWIN_NATIVE_ARCH in libs…

…quish and TexturePacker ;)
xbmc · Aug 3, 2012 · 250e9ca · 250e9ca
1 parent 41cce90
commit 250e9ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in
@@ -25,7 +25,7 @@ NATIVE_LIB=libsquish-native.so
 CLEAN_FILES+=$(NATIVE_LIB)
 
 ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
-NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
+NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
 endif
 
 all: $(LIB) $(NATIVE_LIB)

diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
@@ -16,7 +16,7 @@ NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
 ifdef NATIVE_ROOT_PATH
 ifeq ($(findstring osx,@ARCH@),osx)
 DEFINES += -DTARGET_DARWIN
-NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
+NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
 RPATH=
 endif
 NATIVE_CXXFLAGS+= -I. \