diff options
| author | huceke <ebsi4711@gmail.com> | 2012-09-04 15:20:59 -0700 |
|---|---|---|
| committer | huceke <ebsi4711@gmail.com> | 2012-09-04 15:20:59 -0700 |
| commit | 45fe6fce168e99e34cd7ffd437d482eabb2bd3da (patch) | |
| tree | f5d2d10366d2152e505ee8137e662300b845a0e4 /lib | |
| parent | d9d303f93a201e5fb70f84765766bbdbb906eecb (diff) | |
| parent | 494cb5e4f24766f76cf6db8114f33a81fd00b8ba (diff) | |
Merge pull request #1282 from huceke/raspberrypi
RaspberryPI support
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcec/Makefile | 2 | ||||
| -rw-r--r-- | lib/libsquish/Makefile.in | 9 | ||||
| -rw-r--r-- | lib/libsquish/config.h | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/lib/libcec/Makefile b/lib/libcec/Makefile index c1eed1e6ea..b521c14551 100644 --- a/lib/libcec/Makefile +++ b/lib/libcec/Makefile @@ -7,7 +7,7 @@ # lib name, version LIBNAME=libcec -VERSION=1.7.1 +VERSION=1.8.1 SOURCE=$(LIBNAME)-$(VERSION) # download location and format diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in index f7b3cc1621..34f93bdeea 100644 --- a/lib/libsquish/Makefile.in +++ b/lib/libsquish/Makefile.in @@ -12,11 +12,6 @@ SRCS= \ squish.cpp CXXFLAGS+=-I. -ifeq ($(findstring powerpc,$(ARCH)),powerpc) - CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec -else ifeq ($(findstring x86,$(ARCH)), x86) - CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2 -endif LIB=libsquish.a @@ -32,9 +27,9 @@ 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 Darwin,$(shell uname -s)),Darwin) - g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ + g++ $(NATIVE_ARCH) -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 $@ + g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@ endif endif diff --git a/lib/libsquish/config.h b/lib/libsquish/config.h index 2fad5576a9..00a2d068bf 100644 --- a/lib/libsquish/config.h +++ b/lib/libsquish/config.h @@ -28,13 +28,23 @@ // Set to 1 when building squish to use Altivec instructions. #ifndef SQUISH_USE_ALTIVEC +#if defined(__ALTIVEC__) +#define SQUISH_USE_ALTIVEC 1 +#else #define SQUISH_USE_ALTIVEC 0 #endif +#endif // Set to 1 or 2 when building squish to use SSE or SSE2 instructions. #ifndef SQUISH_USE_SSE +#if defined(__SSE2__) +#define SQUISH_USE_SSE 2 +#elif defined(__SSE__) +#define SQUISH_USE_SSE 1 +#else #define SQUISH_USE_SSE 0 #endif +#endif // Internally set SQUISH_USE_SIMD when either Altivec or SSE is available. #if SQUISH_USE_ALTIVEC && SQUISH_USE_SSE |