From 85e88a366dfb54c620fd7d86df71192c619243f7 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 22 Oct 2015 00:27:10 +0200 Subject: [PATCH 1/3] Cygwin GCC doesn't have a C++11 STL library --- 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 ebbdd45d..bec53614 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -65,6 +65,8 @@ #ifdef GLM_FORCE_PLATFORM_UNKNOWN # define GLM_PLATFORM GLM_PLATFORM_UNKNOWN +#elif defined(__CYGWIN__) +# define GLM_PLATFORM GLM_PLATFORM_CYGWIN #elif defined(__QNXNTO__) # define GLM_PLATFORM GLM_PLATFORM_QNXNTO #elif defined(__APPLE__) @@ -650,7 +652,7 @@ // http://gcc.gnu.org/projects/cxx0x.html // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx -#if GLM_PLATFORM == GLM_PLATFORM_ANDROID +#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 __has_include(<__config>) // libc++ From f1e9c2f186ef8787c33a7645d16028d7c809ea89 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 22 Oct 2015 00:30:27 +0200 Subject: [PATCH 2/3] Fixed Cygwin build errors when using C++11 #405 --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 8097856f..929b9ee8 100644 --- a/readme.md +++ b/readme.md @@ -56,6 +56,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed GTC_round floorMultiple/ceilMultiple #412 - Fixed GTC_packing unpackUnorm3x10_1x2 #414 - Fixed GTC_matrix_inverse affineInverse #192 +- Fixed Cygwin build errors when using C++11 #405 #### [GLM 0.9.7.1](https://github.com/g-truc/glm/releases/tag/0.9.7.1) - 2015-09-07 ##### Improvements: From 627d36fd4781774bf4f68651cb95b0934573d90a Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 22 Oct 2015 00:31:15 +0200 Subject: [PATCH 3/3] Updated GLM version --- glm/detail/setup.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index bec53614..7a4a36b3 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -42,11 +42,11 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 7 -#define GLM_VERSION_REVISION 1 +#define GLM_VERSION_REVISION 2 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED)) # define GLM_MESSAGE_VERSION_DISPLAYED -# pragma message ("GLM: version 0.9.7.1") +# pragma message ("GLM: version 0.9.7.2") #endif//GLM_MESSAGE ///////////////////////////////////////////////////////////////////////////////////