summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/glm/glm/detail/setup.hpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-05-05 20:48:39 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-05-05 20:48:39 +0200
commitb27adb7b7ccf06e2061eb8e6d30de346b6ab74cf (patch)
tree01344ce2f73a0d60f8f4b1ae22cd4bec69506bc7 /3rdparty/glm/glm/detail/setup.hpp
parentd3c0199769184210d2f9e9fdcd78bd8fa3920d8d (diff)
Sync with latest GLM, fixes issue with MINGW (nw)
Diffstat (limited to '3rdparty/glm/glm/detail/setup.hpp')
-rw-r--r--3rdparty/glm/glm/detail/setup.hpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/3rdparty/glm/glm/detail/setup.hpp b/3rdparty/glm/glm/detail/setup.hpp
index 4bae915050a..43083743b31 100644
--- a/3rdparty/glm/glm/detail/setup.hpp
+++ b/3rdparty/glm/glm/detail/setup.hpp
@@ -723,16 +723,31 @@
# define GLM_DEFAULT_CTOR
#endif
-#if GLM_HAS_CONSTEXPR_PARTIAL
+#if GLM_HAS_CONSTEXPR
+# define GLM_CONSTEXPR constexpr
+# define GLM_CONSTEXPR_CTOR constexpr
+# define GLM_RELAXED_CONSTEXPR constexpr
+#elif GLM_HAS_CONSTEXPR_PARTIAL
# define GLM_CONSTEXPR constexpr
+# define GLM_CONSTEXPR_CTOR
+# define GLM_RELAXED_CONSTEXPR const
#else
# define GLM_CONSTEXPR
+# define GLM_CONSTEXPR_CTOR
+# define GLM_RELAXED_CONSTEXPR const
#endif
-#if GLM_HAS_CONSTEXPR
-# define GLM_RELAXED_CONSTEXPR constexpr
+#if GLM_ARCH == GLM_ARCH_PURE
+# define GLM_CONSTEXPR_SIMD GLM_CONSTEXPR
#else
-# define GLM_RELAXED_CONSTEXPR const
+# define GLM_CONSTEXPR_SIMD
+#endif
+
+// GCC 4.6 has a bug causing a compiler crash
+#if GLM_COMPILER & GLM_COMPILER_GCC
+# define GLM_CONSTEXPR_GCC
+#else
+# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR
#endif
#ifdef GLM_FORCE_EXPLICIT_CTOR
1024bce8e1eade4fdd'>Grammar police (nw) Olivier Galibert2018-02-2412-34/+34 * xtal.h is dead, long live to xtal.cpp [O. Galibert] Olivier Galibert2018-01-234-5/+5 * Fixes for Coverity "Resource leak" warnings (#3089) Oliver Stöneberg2018-01-211-1/+1 * bus/ti99/gromport/cartridges: Really eliminate core_strdup (nw) AJR2018-01-202-14/+11 * removed core_strdup() usage from ti99 cartridge code (nw)