Merged remote master

2018-07-31 23:11:45 +02:00
parent fbf3f2016f b4a2eb1407
commit 269ae64128
6 changed files with 10 additions and 7 deletions
--- a/test/core/core_force_aligned_gentypes.cpp
+++ b/test/core/core_force_aligned_gentypes.cpp
@@ -1,5 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
-
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>

--- a/test/gtc/gtc_type_aligned.cpp
+++ b/test/gtc/gtc_type_aligned.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #include <glm/glm.hpp>

 #if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,13 +1,19 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #define GLM_ENABLE_EXPERIMENTAL
+#include <glm/glm.hpp>
+/*
+#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
+
 #include <glm/gtx/common.hpp>
 #include <glm/gtc/integer.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/type_aligned.hpp>
 #include <glm/ext/vector_relational.hpp>
+<<<<<<< HEAD
 #include <glm/glm.hpp>
 /*
 #if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
+=======
+>>>>>>> b4a2eb14070b391370d94b0165681387ff37dc9c

 namespace glm
 {