summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2022-07-06 13:24:04 +0200
committerGitHub <noreply@github.com>2022-07-06 13:24:04 +0200
commit2ad1bf171653c3fb72d8f987b403ab65c9ad6a46 (patch)
treea2d73b9e1de9bfd41b348eef629e026ca20126dc
parent426ca6cc8e46eeb5ba66f151f531303babc24267 (diff)
parente683c7993837f55918e84a35ffe6f3782cfa4f67 (diff)
downloadfork-godot-webrtc-native-2ad1bf171653c3fb72d8f987b403ab65c9ad6a46.tar.gz
fork-godot-webrtc-native-2ad1bf171653c3fb72d8f987b403ab65c9ad6a46.tar.bz2
fork-godot-webrtc-native-2ad1bf171653c3fb72d8f987b403ab65c9ad6a46.zip
Merge pull request #57 from Faless/bump/4.0_alpha11
Bump godot-cpp to alpha11.
-rw-r--r--SConstruct8
m---------godot-cpp0
2 files changed, 2 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct
index e79913e..d352db5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -60,12 +60,8 @@ if env["godot_version"] == "3":
}[env["android_arch"]]
env["arch_suffix"] = env["arch"]
else:
- env = SConscript("godot-cpp/SConstruct")
- replace_flags(env["CCFLAGS"], {
- "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0",
- "-miphoneos-version-min=10.0": "-miphoneos-version-min=11.0",
- })
- env = env.Clone()
+ ARGUMENTS["ios_min_version"] = "11.0"
+ env = SConscript("godot-cpp/SConstruct").Clone()
# Patch mingw SHLIBSUFFIX.
if env["platform"] == "windows" and env["use_mingw"]:
diff --git a/godot-cpp b/godot-cpp
-Subproject 40f5bfda226b71b629742c8314f2f175da7b523
+Subproject 666a378336a45d01eed2d9172b9a2990bc3d555