Browse Source

- Fixed simd_mat4 build error #652

Christophe Riccio 8 years ago
parent
commit
24e060894c
5 changed files with 20 additions and 1 deletions
  1. 9 0
      glm/ext.hpp
  2. 1 1
      glm/gtx/simd_mat4.hpp
  3. 1 0
      readme.md
  4. 1 0
      test/gtx/CMakeLists.txt
  5. 8 0
      test/gtx/gtx.cpp

+ 9 - 0
glm/ext.hpp

@@ -96,11 +96,20 @@
 #include "./gtx/quaternion.hpp"
 #include "./gtx/raw_data.hpp"
 #include "./gtx/rotate_vector.hpp"
+
+#if GLM_ARCH & GLM_ARCH_SSE2_BIT
+#	include "./gtx/simd_mat4.hpp"
+#	include "./gtx/simd_quat.hpp"
+#	include "./gtx/simd_vec4.hpp"
+#endif
+
 #include "./gtx/spline.hpp"
 #include "./gtx/std_based_type.hpp"
+
 #if !(GLM_COMPILER & GLM_COMPILER_CUDA)
 #	include "./gtx/string_cast.hpp"
 #endif
+
 #include "./gtx/transform.hpp"
 #include "./gtx/transform2.hpp"
 #include "./gtx/vector_angle.hpp"

+ 1 - 1
glm/gtx/simd_mat4.hpp

@@ -18,7 +18,7 @@
 #if(GLM_ARCH != GLM_ARCH_PURE)
 
 #if(GLM_ARCH & GLM_ARCH_SSE2_BIT)
-#	include "../detail/intrinsic_matrix.hpp"
+#	include "../simd/matrix.h"
 #	include "../gtx/simd_vec4.hpp"
 #else
 #	error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics"

+ 1 - 0
readme.md

@@ -59,6 +59,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed Clang version detection from source #608
 - Fixed packF3x9_E1x5 exponent packing #614
 - Fixed build error min and max specializations with integer #616
+- Fixed simd_mat4 build error #652
 
 #### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-22
 ##### Fixes:

+ 1 - 0
test/gtx/CMakeLists.txt

@@ -1,3 +1,4 @@
+glmCreateTestGTC(gtx)
 glmCreateTestGTC(gtx_associated_min_max)
 glmCreateTestGTC(gtx_closest_point)
 glmCreateTestGTC(gtx_color_space_YCoCg)

+ 8 - 0
test/gtx/gtx.cpp

@@ -0,0 +1,8 @@
+#include <glm/ext.hpp>
+
+int main()
+{
+	int Error(0);
+
+	return Error;
+}