diff options
| author | davilla <davilla@4pi.com> | 2012-05-13 00:06:05 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-05-13 00:06:34 -0400 |
| commit | 240b7a9fe9fdbc254bbb11957dcc65f3f160ec4b (patch) | |
| tree | 2d9ab6d3fc89df71b652afa348a3db0c8b23ed8a /tools/TexturePacker | |
| parent | 9a27da9902a082fdd6315533889dd236d3e97fdf (diff) | |
[osx/ios] fixed i386/x86_64 pick for native compile of libsquash and texturepacker
Diffstat (limited to 'tools/TexturePacker')
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index b91a95b2d6..fcaeca3cf3 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -13,11 +13,7 @@ ifeq (@USE_TEXTUREPACKER_NATIVE@,1) NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ ifdef NATIVE_ROOT_PATH ifeq ($(findstring osx,@ARCH@),osx) -ifneq (,$(findstring x86_64,$(CXXFLAGS))) -CXXFLAGS+= -m32 -else -CXXFLAGS+= -m64 -endif +NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) endif CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include LIBS += -L$(NATIVE_ROOT_PATH)/lib @@ -45,7 +41,7 @@ all: $(TARGET) ifeq (@USE_TEXTUREPACKER_NATIVE@,1) # TexturePacker run native on build system, build it with native tools $(TARGET): $(SRCS) - g++ $(DEFINES) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) + g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) clean: rm -f $(TARGET) else |