From 368c0bc0acfe4621f21195193633bf7f28cbd4a7 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 10 Dec 2021 10:10:47 -0600 Subject: [PATCH] Misc build system fixes --- .github/workflows/linux_builds.yml | 2 +- modules/gltf/gltf_document.cpp | 2 +- platform/android/detect.py | 2 +- platform/linuxbsd/detect.py | 2 +- platform/osx/detect.py | 2 +- platform/windows/detect.py | 2 +- thirdparty/vhacd/0004-fix-uwp-arm-build.patch | 2 +- thirdparty/vhacd/inc/btScalar.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index c848860bd7b..92c2e3c5160 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -37,7 +37,7 @@ jobs: sconsflags: float=64 use_asan=yes use_ubsan=yes proj-test: true godot-cpp-test: true - bin: "./bin/godot.linuxbsd.double.tools.64s" + bin: "./bin/godot.linuxbsd.double.tools.64.san" build-mono: false # Skip 2GiB artifact speeding up action. artifact: false diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index bdba5130ec1..1c1ee5cd10f 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -4606,7 +4606,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 6f98dab2cc6..3319d5890c8 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -152,7 +152,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" diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 07e16a982b3..ab643b254ae 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -161,7 +161,7 @@ def configure(env): env.Append(LINKFLAGS=["-ftest-coverage", "-fprofile-arcs"]) if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"] or env["use_msan"]: - env.extra_suffix += "s" + env.extra_suffix += ".san" if env["use_ubsan"]: env.Append( diff --git a/platform/osx/detect.py b/platform/osx/detect.py index f5c77313950..c67791b340f 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -124,7 +124,7 @@ def configure(env): env["AS"] = basecmd + "as" if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]: - env.extra_suffix += "s" + env.extra_suffix += ".san" if env["use_ubsan"]: env.Append( diff --git a/platform/windows/detect.py b/platform/windows/detect.py index aaaa50e7298..e9ecc99ef58 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -308,7 +308,7 @@ def configure_msvc(env, manual_msvc_config): # Sanitizers if env["use_asan"]: - env.extra_suffix += ".s" + env.extra_suffix += ".san" env.Append(LINKFLAGS=["/INFERASANLIBS"]) env.Append(CCFLAGS=["/fsanitize=address"]) 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