godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[3.x] Misc build system fixes 

(cherry picked from commit 7bf7bd70ac)
This commit is contained in:
Aaron Franke 2021-12-10 11:32:39 -06:00 committed by Rémi Verschelde
parent 37a8a615e5
commit e147fc3428
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gltf/gltf_document.cpp
View File

@ -4608,7 +4608,7 @@ Error GLTFDocument::_parse_lights(Ref<GLTFState> state) {
light->outer_cone_angle = spot["outerConeAngle"]; 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."); 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") { } 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); state->lights.push_back(light);

2
platform/android/detect.py
View File

@ -156,7 +156,7 @@ def configure(env):
abi_subpath = "i686-linux-android" abi_subpath = "i686-linux-android"
arch_subpath = "x86" arch_subpath = "x86"
env["x86_libtheora_opt_gcc"] = True 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: if get_platform(env["ndk_platform"]) < 21:
print( print(
"WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21" "WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21"

2
thirdparty/vhacd/0004-fix-uwp-arm-build.patch vendored
View File

@ -9,7 +9,7 @@ index 3999a71521..4c9e0cf7ab 100644
-#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))
+// -- GODOT start -- +// -- 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))
+#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 -- +// -- GODOT end --
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>

2
thirdparty/vhacd/inc/btScalar.h vendored
View File

@ -74,7 +74,7 @@ inline int32_t btGetVersion()
// -- GODOT start -- // -- 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))
#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 -- // -- GODOT end --
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>