mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2011-04-09 11:04:08 +01:00
commit 9e5554514c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/setup.hpp
View File

@ -19,6 +19,7 @@
#define GLM_VERSION_PATCH 2 #define GLM_VERSION_PATCH 2
#define GLM_VERSION_REVISION 0 #define GLM_VERSION_REVISION 0
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
// Compiler // Compiler
@ -37,6 +38,7 @@
#define GLM_COMPILER_VC2005 0x01000070 #define GLM_COMPILER_VC2005 0x01000070
#define GLM_COMPILER_VC2008 0x01000080 #define GLM_COMPILER_VC2008 0x01000080
#define GLM_COMPILER_VC2010 0x01000090 #define GLM_COMPILER_VC2010 0x01000090
#define GLM_COMPILER_VC2011 0x010000A0
// GCC defines // GCC defines
#define GLM_COMPILER_GCC 0x02000000 #define GLM_COMPILER_GCC 0x02000000
@ -98,6 +100,8 @@
# define GLM_COMPILER GLM_COMPILER_VC2008 # define GLM_COMPILER GLM_COMPILER_VC2008
# elif _MSC_VER == 1600 # elif _MSC_VER == 1600
# define GLM_COMPILER GLM_COMPILER_VC2010 # define GLM_COMPILER GLM_COMPILER_VC2010
# elif _MSC_VER == 1700
# define GLM_COMPILER GLM_COMPILER_VC2011
# else//_MSC_VER # else//_MSC_VER
# define GLM_COMPILER GLM_COMPILER_VC # define GLM_COMPILER GLM_COMPILER_VC
# endif//_MSC_VER # endif//_MSC_VER

4
test/gtc/gtc_type_ptr.cpp
View File

@ -4,12 +4,12 @@
// Created : 2010-09-16 // Created : 2010-09-16
// Updated : 2010-09-16 // Updated : 2010-09-16
// Licence : This source is under MIT licence // Licence : This source is under MIT licence
// File : test/gtc/matrix_transform.cpp // File : test/gtc/type_ptr.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_MESSAGES #define GLM_MESSAGES
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/type_ptr.hpp>
bool test_make_pointer() bool test_make_pointer()
{ {