mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 18:24:35 +00:00
Fixed build on GCC
This commit is contained in:
parent
52d86dcc19
commit
08c95429fe
@ -26,6 +26,7 @@
|
||||
/// @author Christophe Riccio
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "func_vector_relational.hpp"
|
||||
#include "type_vec2.hpp"
|
||||
#include "type_vec3.hpp"
|
||||
#include "type_vec4.hpp"
|
||||
|
@ -26,6 +26,7 @@
|
||||
/// @author Christophe Riccio
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "func_common.hpp"
|
||||
#include "type_vec2.hpp"
|
||||
#include "type_vec4.hpp"
|
||||
#include "type_float.hpp"
|
||||
@ -308,7 +309,7 @@ namespace glm
|
||||
if(k < T(0))
|
||||
return vecType<T, P>(0);
|
||||
else
|
||||
return eta * I - (eta * dotValue + sqrt(k)) * N;
|
||||
return eta * I - (eta * dotValue + std::sqrt(k)) * N;
|
||||
}
|
||||
|
||||
}//namespace glm
|
||||
|
@ -36,9 +36,6 @@ 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