From 27a1b2483504c279af8b39e3f58f6efc11dc330f Mon Sep 17 00:00:00 2001 From: Groove Date: Sat, 18 Aug 2018 13:28:18 +0200 Subject: [PATCH] Fixed swizzle build on VC --- glm/detail/setup.hpp | 2 +- glm/gtx/compatibility.inl | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index ac892f38..dc2fbdab 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -448,7 +448,7 @@ #define GLM_SWIZZLE_OPERATOR 1 #define GLM_SWIZZLE_FUNCTION 2 -#if defined(GLM_FORCE_SWIZZLE) && !defined(GLM_FORCE_XYZW_ONLY) && (GLM_LANG & GLM_LANG_CXX11_FLAG) && (GLM_LANG & GLM_LANG_CXXMS_FLAG) +#if defined(GLM_FORCE_SWIZZLE) && !defined(GLM_FORCE_XYZW_ONLY) && (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_LANG & GLM_LANG_CXXMS_FLAG) # define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_OPERATOR #elif defined(GLM_FORCE_SWIZZLE) && !defined(GLM_FORCE_XYZW_ONLY) # define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_FUNCTION diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl index 28b31f98..1d49496b 100644 --- a/glm/gtx/compatibility.inl +++ b/glm/gtx/compatibility.inl @@ -1,5 +1,3 @@ -/// @ref gtx_compatibility - #include namespace glm