mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2013-06-13 16:53:22 +00:00
commit 5f0c0a6f21
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/core/setup.hpp
View File

@ -447,8 +447,12 @@
# if(__cplusplus >= 201103L) # if(__cplusplus >= 201103L)
# define GLM_LANG GLM_LANG_CXX11 # define GLM_LANG GLM_LANG_CXX11
// -std=c++0x or -std=gnu++0x // -std=c++0x or -std=gnu++0x
# elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) # elif((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC)
# define GLM_LANG GLM_LANG_CXX0X # if defined(__GXX_EXPERIMENTAL_CXX0X__)
# define GLM_LANG GLM_LANG_CXX0X
# else
# define GLM_LANG GLM_LANG_CXX98
# endif
# elif(GLM_COMPILER & GLM_COMPILER_VC) # elif(GLM_COMPILER & GLM_COMPILER_VC)
# if(defined(_MSC_EXTENSIONS)) # if(defined(_MSC_EXTENSIONS))
# if(GLM_COMPILER >= GLM_COMPILER_VC2012) # if(GLM_COMPILER >= GLM_COMPILER_VC2012)

6
readme.txt
View File

@ -52,6 +52,12 @@ GLM 0.9.5.0: 2013-XX-XX
- Fixed post increment and decrement operators - Fixed post increment and decrement operators
- Fixed perspective with zNear == 0 (#71) - Fixed perspective with zNear == 0 (#71)
================================================================================
GLM 0.9.4.5: 2013-06-XX
--------------------------------------------------------------------------------
- Fixed inclusion of intrinsics in "pure" mode #92
- Fixed language detection on GCC when the C++0x mode isn't enabled #95
================================================================================ ================================================================================
GLM 0.9.4.4: 2013-05-29 GLM 0.9.4.4: 2013-05-29
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------