Browse Source

Merge pull request #184 from mackron/buildfix

Fix simd_quat build.
Christophe Riccio 11 years ago
parent
commit
6409e4135a
2 changed files with 1 additions and 3 deletions
  1. 0 2
      glm/gtx/simd_quat.hpp
  2. 1 1
      glm/gtx/simd_quat.inl

+ 0 - 2
glm/gtx/simd_quat.hpp

@@ -46,8 +46,6 @@
 #if(GLM_ARCH != GLM_ARCH_PURE)
 
 #if(GLM_ARCH & GLM_ARCH_SSE2)
-#	include "../core/intrinsic_common.hpp"
-#	include "../core/intrinsic_geometric.hpp"
 #   include "../gtx/simd_mat4.hpp"
 #else
 #	error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics"

+ 1 - 1
glm/gtx/simd_quat.inl

@@ -194,7 +194,7 @@ GLM_FUNC_QUALIFIER fvec4SIMD operator* (fquatSIMD const & q, fvec4SIMD const & v
 
 GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, fquatSIMD const & q)
 {
-	return inverse(q) * v;
+	return glm::inverse(q) * v;
 }
 
 GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q, float s)