From 4a9bd5c1394e537cc4da85731fa556d5906b9e07 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:12:30 +0100 Subject: [PATCH 1/3] Updated revision number for release --- glm/core/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 07f32498..d8aac057 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -17,7 +17,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 1 -#define GLM_VERSION_REVISION 0 +#define GLM_VERSION_REVISION 2 /////////////////////////////////////////////////////////////////////////////////////////////////// // Compiler From 73f66c2260753f5b5cdd1247e021131145600f77 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:16:18 +0100 Subject: [PATCH 2/3] Anticipate VC2011 --- glm/core/setup.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index d8aac057..2a1cd304 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -37,6 +37,7 @@ #define GLM_COMPILER_VC2005 0x01000070 #define GLM_COMPILER_VC2008 0x01000080 #define GLM_COMPILER_VC2010 0x01000090 +#define GLM_COMPILER_VC2011 0x010000A0 // GCC defines #define GLM_COMPILER_GCC 0x02000000 @@ -98,6 +99,8 @@ # define GLM_COMPILER GLM_COMPILER_VC2008 # elif _MSC_VER == 1600 # define GLM_COMPILER GLM_COMPILER_VC2010 +# elif _MSC_VER == 1700 +# define GLM_COMPILER GLM_COMPILER_VC2011 # else//_MSC_VER # define GLM_COMPILER GLM_COMPILER_VC # endif//_MSC_VER From 653eef73577b416482f9215c2bcf12dd4837cf90 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:58:50 +0100 Subject: [PATCH 3/3] Updated test --- test/gtc/gtc_type_ptr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp index 0b9bc908..74efc2d0 100644 --- a/test/gtc/gtc_type_ptr.cpp +++ b/test/gtc/gtc_type_ptr.cpp @@ -4,12 +4,12 @@ // Created : 2010-09-16 // Updated : 2010-09-16 // Licence : This source is under MIT licence -// File : test/gtc/matrix_transform.cpp +// File : test/gtc/type_ptr.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_MESSAGES #include -#include +#include int main() {