vec DECL was changed in recent glm - change the def to match the old …

…expanded version.
BRL-CAD · Jul 10, 2024 · ab640fa · ab640fa
1 parent 920ec5d
commit ab640fa
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/manifold/manifold.patch b/manifold/manifold.patch
@@ -1,6 +1,18 @@
+diff -Naur manifold/src/third_party/glm/glm/detail/setup.hpp MANIFOLD_BLD/src/third_party/glm/glm/detail/setup.hpp
+--- manifold/src/third_party/glm/glm/detail/setup.hpp	2024-06-25 10:59:36.219351152 -0400
++++ MANIFOLD_BLD/src/third_party/glm/glm/detail/setup.hpp	2024-07-09 20:09:07.054278365 -0400
+@@ -493,7 +493,7 @@
+ #	define GLM_NEVER_INLINE
+ #endif//defined(GLM_FORCE_INLINE)
+
+-#define GLM_CTOR_DECL GLM_CUDA_FUNC_DECL GLM_CONSTEXPR
++#define GLM_CTOR_DECL GLM_FUNC_DECL GLM_CONSTEXPR
+ #define GLM_FUNC_DISCARD_DECL GLM_CUDA_FUNC_DECL
+ #define GLM_FUNC_DECL GLM_NODISCARD GLM_CUDA_FUNC_DECL
+ #define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
 diff -Naur manifold/src/utilities/include/optional_assert.h MANIFOLD_BLD/src/utilities/include/optional_assert.h
 --- manifold/src/utilities/include/optional_assert.h	2024-07-02 20:09:19.078438473 -0400
-+++ MANIFOLD_BLD/src/utilities/include/optional_assert.h	2024-07-09 16:59:17.609083445 -0400
++++ MANIFOLD_BLD/src/utilities/include/optional_assert.h	2024-07-09 17:10:40.601974842 -0400
 @@ -15,7 +15,7 @@
  #pragma once