Merge pull request #16 from gigadude/master

Fix broken GCC SSE support
This commit is contained in:
Christophe Riccio 2012-09-05 15:03:27 -07:00
commit c588e9fa1e

View File

@ -510,19 +510,12 @@
#elif((GLM_PLATFORM & GLM_PLATFORM_APPLE) && (GLM_COMPILER & GLM_COMPILER_GCC)) #elif((GLM_PLATFORM & GLM_PLATFORM_APPLE) && (GLM_COMPILER & GLM_COMPILER_GCC))
# define GLM_ARCH GLM_ARCH_PURE # define GLM_ARCH GLM_ARCH_PURE
#elif(((GLM_COMPILER & GLM_COMPILER_GCC) && (defined(__i386__) || defined(__x86_64__))) || (GLM_COMPILER & GLM_COMPILER_LLVM_GCC)) #elif(((GLM_COMPILER & GLM_COMPILER_GCC) && (defined(__i386__) || defined(__x86_64__))) || (GLM_COMPILER & GLM_COMPILER_LLVM_GCC))
# if(defined(__AVX2__)) # define GLM_ARCH (GLM_ARCH_PURE \
# define GLM_ARCH GLM_ARCH_AVX2 | (defined(__AVX2__) ? GLM_ARCH_AVX2 : 0) \
# elif(defined(__AVX__)) | (defined(__AVX__) ? GLM_ARCH_AVX : 0) \
# define GLM_ARCH GLM_ARCH_AVX | (defined(__SSE4__) ? GLM_ARCH_SSE4 : 0) \
# elif(defined(__SSE4__)) | (defined(__SSE3__) ? GLM_ARCH_SSE3 : 0) \
# define GLM_ARCH GLM_ARCH_SSE4 | (defined(__SSE2__) ? GLM_ARCH_SSE2 : 0))
# elif(defined(__SSE3__))
# define GLM_ARCH GLM_ARCH_SSE3
# elif(defined(__SSE2__))
# define GLM_ARCH GLM_ARCH_SSE2
# else
# define GLM_ARCH GLM_ARCH_PURE
# endif
#else #else
# define GLM_ARCH GLM_ARCH_PURE # define GLM_ARCH GLM_ARCH_PURE
#endif #endif