diff options
| author | Memphiz <memphis@machzwo.de> | 2012-06-23 18:41:45 +0200 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2012-08-08 19:14:46 -0400 |
| commit | d1764060253e50ec1e47df3dc90475d4944f8d43 (patch) | |
| tree | bef7a41b31d2c07dbc41b82aeb31d919705a2cc2 /lib | |
| parent | 95e549aa512bfda63a2cbb9e0a4d136ded18959a (diff) | |
[droid] - fix the darwin detection for libsquash / build side and force buildside arch on darwin to -m32
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libsquish/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in index 2b4a7ac084..ffb2886765 100644 --- a/lib/libsquish/Makefile.in +++ b/lib/libsquish/Makefile.in @@ -24,14 +24,14 @@ ifeq (@USE_TEXTUREPACKER_NATIVE@,1) NATIVE_LIB=libsquish-native.so CLEAN_FILES+=$(NATIVE_LIB) -ifeq ($(findstring osx,$(ARCH)),osx) +ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) endif 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) +ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) g++ $(NATIVE_ARCH) -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 $@ |