diff options
| author | S. Davilla <davilla@4pi.com> | 2011-05-02 16:33:32 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-05-02 16:33:51 -0400 |
| commit | c1256eb9e733f4b65b5c2db8bd8769691b898310 (patch) | |
| tree | e288f4a9a5a1ec48e231cec486273e24b8a2b536 | |
| parent | 12b3d5dfb605edd1b6f8e05b2155c4b86783efaa (diff) | |
[osx] fixed libsquish/texturepacker build when native g++ is 4.2.1
| -rw-r--r-- | lib/libsquish/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in index 866e5c6a49..7d76252dc1 100644 --- a/lib/libsquish/Makefile.in +++ b/lib/libsquish/Makefile.in @@ -28,7 +28,7 @@ all: $(LIB) $(NATIVE_LIB) # TexturePacker links to libsquish and needs to run on build system, so make a native flavor. $(NATIVE_LIB): $(SRCS) ifeq ($(findstring osx,$(ARCH)),osx) - g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ + g++ -m32 -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ else g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@ endif diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 94d4bd4ecb..84e9f722b7 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -38,7 +38,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++ -m32 $(DEFINES) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) clean: rm -f $(TARGET) else |