mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build on GCC

Browse Source
This commit is contained in:
Christophe Riccio 2013-09-17 23:56:46 +02:00
parent 52d86dcc19
commit 08c95429fe
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glm/core/func_common.inl
View File

@ -26,6 +26,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "func_vector_relational.hpp"
#include "type_vec2.hpp" #include "type_vec2.hpp"
#include "type_vec3.hpp" #include "type_vec3.hpp"
#include "type_vec4.hpp" #include "type_vec4.hpp"

3
glm/core/func_geometric.inl
View File

@ -26,6 +26,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "func_common.hpp"
#include "type_vec2.hpp" #include "type_vec2.hpp"
#include "type_vec4.hpp" #include "type_vec4.hpp"
#include "type_float.hpp" #include "type_float.hpp"
@ -308,7 +309,7 @@ namespace glm
if(k < T(0)) if(k < T(0))
return vecType<T, P>(0); return vecType<T, P>(0);
else else
return eta * I - (eta * dotValue + sqrt(k)) * N; return eta * I - (eta * dotValue + std::sqrt(k)) * N;
} }
}//namespace glm }//namespace glm

3
test/core/core_setup_message.cpp
View File

@ -36,9 +36,6 @@ int test_compiler()
case GLM_COMPILER_VC12: case GLM_COMPILER_VC12:
std::cout << "GLM_COMPILER_VC12" << std::endl; std::cout << "GLM_COMPILER_VC12" << std::endl;
break; break;
case GLM_COMPILER_VC2013:
std::cout << "GLM_COMPILER_VC2013" << std::endl;
break;
default: default:
std::cout << "Visual C++ version not detected" << std::endl; std::cout << "Visual C++ version not detected" << std::endl;
Error += 1; Error += 1;