From e147fc34282723afaa71b1b4c94330f1c2c64aee Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 10 Dec 2021 11:32:39 -0600 Subject: [PATCH] [3.x] Misc build system fixes (cherry picked from commit 7bf7bd70ac0625d1b5fe6cd008f01400a35fec70) --- modules/gltf/gltf_document.cpp | 2 +- platform/android/detect.py | 2 +- thirdparty/vhacd/0004-fix-uwp-arm-build.patch | 2 +- thirdparty/vhacd/inc/btScalar.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 8e369525466..390b5379e0d 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -4608,7 +4608,7 @@ Error GLTFDocument::_parse_lights(Ref state) { light->outer_cone_angle = spot["outerConeAngle"]; ERR_CONTINUE_MSG(light->inner_cone_angle >= light->outer_cone_angle, "The inner angle must be smaller than the outer angle."); } else if (type != "point" && type != "directional") { - ERR_CONTINUE_MSG(ERR_PARSE_ERROR, "Light type is unknown."); + ERR_CONTINUE_MSG(true, "Light type is unknown."); } state->lights.push_back(light); diff --git a/platform/android/detect.py b/platform/android/detect.py index 4befd84dff9..49b66b12420 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -156,7 +156,7 @@ def configure(env): abi_subpath = "i686-linux-android" arch_subpath = "x86" env["x86_libtheora_opt_gcc"] = True - if env["android_arch"] == "x86_64": + elif env["android_arch"] == "x86_64": if get_platform(env["ndk_platform"]) < 21: print( "WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21" diff --git a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch index a5bba3fd7da..8a57aae7fd6 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 4c9e0cf7abb..da2a5993cab 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