From 008fa10c37d4f5f8ae175c24e5e0982d4315dfec Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 7 Feb 2013 11:40:35 -0800 Subject: [PATCH] update glm library --- thirdparty/glm/core/setup.hpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/thirdparty/glm/core/setup.hpp b/thirdparty/glm/core/setup.hpp index c573b70260..386abe6c22 100755 --- a/thirdparty/glm/core/setup.hpp +++ b/thirdparty/glm/core/setup.hpp @@ -510,19 +510,12 @@ #elif((GLM_PLATFORM & GLM_PLATFORM_APPLE) && (GLM_COMPILER & GLM_COMPILER_GCC)) # define GLM_ARCH GLM_ARCH_PURE #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_AVX2 -# elif(defined(__AVX__)) -# define GLM_ARCH GLM_ARCH_AVX -# elif(defined(__SSE4__)) -# define GLM_ARCH GLM_ARCH_SSE4 -# 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 +# define GLM_ARCH (GLM_ARCH_PURE \ +| (defined(__AVX2__) ? GLM_ARCH_AVX2 : 0) \ +| (defined(__AVX__) ? GLM_ARCH_AVX : 0) \ +| (defined(__SSE4__) ? GLM_ARCH_SSE4 : 0) \ +| (defined(__SSE3__) ? GLM_ARCH_SSE3 : 0) \ +| (defined(__SSE2__) ? GLM_ARCH_SSE2 : 0)) #else # define GLM_ARCH GLM_ARCH_PURE #endif @@ -568,7 +561,7 @@ #define GLM_SUPPORT_ANONYMOUS_UNION() \ ((GLM_LANG & GLM_LANG_CXX98) == GLM_LANG_CXX98) -//#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \ +//#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() // (((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS) || ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_LANG == GLM_LANG_CXX0X))) #define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \