vhacd: Patch to fix UWP ARM build
This is a very outdated copy of Bullet's btScalar.h, we're probably only discovering the tip of the bad cross-platform compatibility of the unmaintained vhacd.
This commit is contained in:
parent
9432520449
commit
19252d48ed
2 changed files with 20 additions and 1 deletions
16
thirdparty/vhacd/0004-fix-uwp-arm-build.patch
vendored
Normal file
16
thirdparty/vhacd/0004-fix-uwp-arm-build.patch
vendored
Normal file
|
@ -0,0 +1,16 @@
|
|||
diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h
|
||||
index 3999a71521..4c9e0cf7ab 100644
|
||||
--- a/thirdparty/vhacd/inc/btScalar.h
|
||||
+++ b/thirdparty/vhacd/inc/btScalar.h
|
||||
@@ -72,7 +72,10 @@ inline int32_t btGetVersion()
|
||||
#define btFsel(a, b, c) __fsel((a), (b), (c))
|
||||
#else
|
||||
|
||||
-#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
|
||||
+// -- GODOT start --
|
||||
+//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
|
||||
+#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM))
|
||||
+// -- GODOT end --
|
||||
#define BT_USE_SSE
|
||||
#include <emmintrin.h>
|
||||
#endif
|
5
thirdparty/vhacd/inc/btScalar.h
vendored
5
thirdparty/vhacd/inc/btScalar.h
vendored
|
@ -72,7 +72,10 @@ inline int32_t btGetVersion()
|
|||
#define btFsel(a, b, c) __fsel((a), (b), (c))
|
||||
#else
|
||||
|
||||
#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
|
||||
// -- GODOT start --
|
||||
//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
|
||||
#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM))
|
||||
// -- GODOT end --
|
||||
#define BT_USE_SSE
|
||||
#include <emmintrin.h>
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue