From 07baa3b45a58ee133b389ec48f0336d4d4115a96 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 16 Jul 2016 20:03:22 +0200 Subject: [PATCH 1/2] Revert, to reduce risks of regressions --- glm/detail/setup.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 1464e848..6cf6d075 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -681,7 +681,9 @@ // http://gcc.gnu.org/projects/cxx0x.html // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx -#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) +#if GLM_PLATFORM == GLM_PLATFORM_ANDROID || GLM_PLATFORM == GLM_PLATFORM_CYGWIN +# define GLM_HAS_CXX11_STL 0 +#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) # if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_CXX11_STL 1 # else From dff3af56a884e31d21eae7ab3eb72a8d192adc54 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 16 Jul 2016 20:20:38 +0200 Subject: [PATCH 2/2] GLM 0.9.7.6 release --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c318b4fb..15aeadb7 100644 --- a/readme.md +++ b/readme.md @@ -51,7 +51,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes -#### [GLM 0.9.7.6](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX +#### [GLM 0.9.7.6](https://github.com/g-truc/glm/releases/tag/0.9.7.6) - 2016-07-16 ##### Improvements: - Added pkg-config file #509 - Updated list of compiler versions detected