diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2021-12-10 10:10:47 -0600 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2021-12-10 12:14:27 -0600 |
| commit | 368c0bc0acfe4621f21195193633bf7f28cbd4a7 (patch) | |
| tree | 9b06a59bd5e71f8527df49e5b081541df4e85161 /thirdparty/vhacd | |
| parent | 4f9b6d9a3f7ba9315312c563ca6f805b60b635ab (diff) | |
Misc build system fixes
Diffstat (limited to 'thirdparty/vhacd')
| -rw-r--r-- | thirdparty/vhacd/0004-fix-uwp-arm-build.patch | 2 | ||||
| -rw-r--r-- | thirdparty/vhacd/inc/btScalar.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch index a5bba3fd7d..8a57aae7fd 100644 --- a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch +++ b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch @@ -9,7 +9,7 @@ index 3999a71521..4c9e0cf7ab 100644 -#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)) ++#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64)) +// -- GODOT end -- #define BT_USE_SSE #include <emmintrin.h> diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h index 4c9e0cf7ab..da2a5993ca 100644 --- a/thirdparty/vhacd/inc/btScalar.h +++ b/thirdparty/vhacd/inc/btScalar.h @@ -74,7 +74,7 @@ inline int32_t btGetVersion() // -- 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)) +#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64)) // -- GODOT end -- #define BT_USE_SSE #include <emmintrin.h> |