mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9.2' into 0.9.3

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-19 00:59:03 +01:00
commit 0727ab02fd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(glm)
enable_testing() enable_testing()
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(/Za) #add_definitions(/Za)
#add_definitions(-pedantic) #add_definitions(-pedantic)
#add_definitions(-S) #add_definitions(-S)
#add_definitions(-s) #add_definitions(-s)

6
glm/core/_detail.hpp
View File

@ -24,15 +24,15 @@ namespace detail
#elif(GLM_COMPILER & GLM_COMPILER_VC) #elif(GLM_COMPILER & GLM_COMPILER_VC)
typedef signed __int64 sint64; typedef signed __int64 sint64;
typedef unsigned __int64 uint64; typedef unsigned __int64 uint64;
#elif(GLM_COMPILER & GLM_COMPILER_GCC) #elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC | GLM_COMPILER_CLANG))
__extension__ typedef signed long long sint64; __extension__ typedef signed long long sint64;
__extension__ typedef unsigned long long uint64; __extension__ typedef unsigned long long uint64;
#elif(GLM_COMPILER & GLM_COMPILER_BC) #elif(GLM_COMPILER & GLM_COMPILER_BC)
typedef Int64 sint64; typedef Int64 sint64;
typedef Uint64 uint64; typedef Uint64 uint64;
#else//unknown compiler #else//unknown compiler
typedef signed long sint64; typedef signed long long sint64;
typedef unsigned long uint64; typedef unsigned long long uint64;
#endif//GLM_COMPILER #endif//GLM_COMPILER
template<bool C> template<bool C>

1
test/gtc/gtc_matrix_access.cpp
View File

@ -7,6 +7,7 @@
// File : test/gtc/matrix_access.cpp // File : test/gtc/matrix_access.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_MESSAGES
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_access.hpp> #include <glm/gtc/matrix_access.hpp>