From 24e060894c4488207fcdab400a5674b57286e1a2 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Wed, 16 Aug 2017 12:01:23 +0200
Subject: [PATCH] - Fixed simd_mat4 build error #652

---
 glm/ext.hpp             | 9 +++++++++
 glm/gtx/simd_mat4.hpp   | 2 +-
 readme.md               | 1 +
 test/gtx/CMakeLists.txt | 1 +
 test/gtx/gtx.cpp        | 8 ++++++++
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/gtx/gtx.cpp

diff --git a/glm/ext.hpp b/glm/ext.hpp
index 0c9f9f9e..7e7e9866 100644
--- a/glm/ext.hpp
+++ b/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"
diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp
index a68220c2..5f8df6f2 100644
--- a/glm/gtx/simd_mat4.hpp
+++ b/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"
diff --git a/readme.md b/readme.md
index 4e405db2..3ea3cfa4 100644
--- a/readme.md
+++ b/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:
diff --git a/test/gtx/CMakeLists.txt b/test/gtx/CMakeLists.txt
index 7b40dce2..19a123fe 100644
--- a/test/gtx/CMakeLists.txt
+++ b/test/gtx/CMakeLists.txt
@@ -1,3 +1,4 @@
+glmCreateTestGTC(gtx)
 glmCreateTestGTC(gtx_associated_min_max)
 glmCreateTestGTC(gtx_closest_point)
 glmCreateTestGTC(gtx_color_space_YCoCg)
diff --git a/test/gtx/gtx.cpp b/test/gtx/gtx.cpp
new file mode 100644
index 00000000..a61c33ff
--- /dev/null
+++ b/test/gtx/gtx.cpp
@@ -0,0 +1,8 @@
+#include <glm/ext.hpp>
+
+int main()
+{
+	int Error(0);
+
+	return Error;
+}