From f79c7bf8ad32eb020145d4da1bbcfe22b1d0341e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 1 Nov 2016 09:22:45 +0100 Subject: [PATCH 1/2] Updated release note for next revision --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index 4bcca0c9..34aa3987 100644 --- a/readme.md +++ b/readme.md @@ -51,6 +51,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes +#### [GLM 0.9.8.3](https://github.com/g-truc/glm/tree/0.9.8) - 2016-XX-XX +##### Fixes: + #### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01 ##### Improvements: - Added Visual C++ 15 detection From b45d5e86507675f95ef376e0b415dbefa7f5248b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 1 Nov 2016 23:10:06 +0100 Subject: [PATCH 2/2] Fixed Android build error with C++11 compiler but C++98 STL #284 #564 --- glm/detail/setup.hpp | 7 ++++++- readme.md | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 8edb0d7e..5d7d311c 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -150,6 +150,7 @@ # pragma message("GLM: Using GLM_FORCE_CXX14 but there is no known version of ICC compiler that fully supports C++14") # endif # define GLM_LANG GLM_LANG_CXX14 +# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX11) # if((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER <= GLM_COMPILER_GCC48)) || ((GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER <= GLM_COMPILER_CLANG33)) # pragma message("GLM: Using GLM_FORCE_CXX11 with a compiler that doesn't fully support C++11") @@ -159,6 +160,7 @@ # pragma message("GLM: Using GLM_FORCE_CXX11 but there is no known version of ICC compiler that fully supports C++11") # endif # define GLM_LANG GLM_LANG_CXX11 +# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX03) # define GLM_LANG GLM_LANG_CXX03 #elif defined(GLM_FORCE_CXX98) @@ -293,7 +295,10 @@ // 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_CLANG +// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564 +#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED) +# define GLM_HAS_CXX11_STL 0 +#elif GLM_COMPILER & GLM_COMPILER_CLANG # if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_CXX11_STL 1 # else diff --git a/readme.md b/readme.md index 34aa3987..99933db9 100644 --- a/readme.md +++ b/readme.md @@ -53,6 +53,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) #### [GLM 0.9.8.3](https://github.com/g-truc/glm/tree/0.9.8) - 2016-XX-XX ##### Fixes: +- Fixed Android build error with C++11 compiler but C++98 STL #284 #564 #### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01 ##### Improvements: