From 368c0bc0acfe4621f21195193633bf7f28cbd4a7 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 10 Dec 2021 10:10:47 -0600 Subject: Misc build system fixes --- thirdparty/vhacd/0004-fix-uwp-arm-build.patch | 2 +- thirdparty/vhacd/inc/btScalar.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'thirdparty/vhacd') 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 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 -- cgit v1.2.3