Fixed merge
This commit is contained in:
commit
52d86dcc19
@ -67,7 +67,7 @@ GLM 0.9.5.0: 2013-XX-XX
|
||||
- Increased unit tests completness
|
||||
|
||||
================================================================================
|
||||
GLM 0.9.4.6: 2013-09-15
|
||||
GLM 0.9.4.6: 2013-09-18
|
||||
--------------------------------------------------------------------------------
|
||||
- Fixed detection to select the last known compiler if newer version #106
|
||||
- Fixed is_int and is_uint code duplication with GCC and C++11 #107
|
||||
@ -75,10 +75,11 @@ GLM 0.9.4.6: 2013-09-15
|
||||
- Added c++1y mode support in CMake test suite
|
||||
- Removed ms extension mode to CMake when no using Visual C++
|
||||
- Added pedantic mode to CMake test suite for Clang and GCC
|
||||
- Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows
|
||||
- Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows
|
||||
for ICC
|
||||
- Added compilation errors for unsupported compiler versions
|
||||
- Fixed glm::orientation with GLM_FORCE_RADIANS defined #112
|
||||
- Fixed const ref issue on assignment operator taking a scalar parameter #116
|
||||
|
||||
================================================================================
|
||||
GLM 0.9.4.5: 2013-08-12
|
||||
|
@ -36,6 +36,9 @@ int test_compiler()
|
||||
case GLM_COMPILER_VC12:
|
||||
std::cout << "GLM_COMPILER_VC12" << std::endl;
|
||||
break;
|
||||
case GLM_COMPILER_VC2013:
|
||||
std::cout << "GLM_COMPILER_VC2013" << std::endl;
|
||||
break;
|
||||
default:
|
||||
std::cout << "Visual C++ version not detected" << std::endl;
|
||||
Error += 1;
|
||||
|
Loading…
Reference in New Issue
Block a user