summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2023-01-12 17:08:36 +0100
committerGitHub <noreply@github.com>2023-01-12 17:08:36 +0100
commit2bc2a5d16221347a75f7f775290399ce6e32432f (patch)
treeb7558e4faa11f5e89b2dfadea6fed56708c48c39
parent7d260b1b32e3b46f5c6bcf4645528d4d0759e9ff (diff)
parent717634405674b888f00a2f7e72e48de5a47ed731 (diff)
downloadfork-godot-webrtc-native-2bc2a5d16221347a75f7f775290399ce6e32432f.tar.gz
fork-godot-webrtc-native-2bc2a5d16221347a75f7f775290399ce6e32432f.tar.bz2
fork-godot-webrtc-native-2bc2a5d16221347a75f7f775290399ce6e32432f.zip
Merge pull request #80 from Faless/bump/beta11
Update to Godot 4.0-beta11, libdatachannel v0.18.1
-rw-r--r--SConstruct5
m---------godot-cpp0
m---------godot-cpp-3.x0
m---------thirdparty/libdatachannel0
4 files changed, 0 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index 111caa1..bdb4c64 100644
--- a/SConstruct
+++ b/SConstruct
@@ -24,11 +24,6 @@ if env["godot_version"] == "3":
if "platform" in ARGUMENTS and ARGUMENTS["platform"] == "macos":
ARGUMENTS["platform"] = "osx" # compatibility with old osx name
- scons_cache_path = os.environ.get("SCONS_CACHE")
- if scons_cache_path is not None:
- CacheDir(scons_cache_path)
- Decider("MD5")
-
env = SConscript("godot-cpp-3.x/SConstruct")
# Patch base env
diff --git a/godot-cpp b/godot-cpp
-Subproject 3da6db4fe41b8f3d3aaeb0dc80f1556f83fd7fe
+Subproject 734d9ef092dfd5be08e39af8eaebe7c5cde3bac
diff --git a/godot-cpp-3.x b/godot-cpp-3.x
-Subproject ac572d5f847572ee90e32e014854894dda8b4ce
+Subproject 7c09b5484de21c5be02ffee4fe32e27e9f4b7e1
diff --git a/thirdparty/libdatachannel b/thirdparty/libdatachannel
-Subproject 084445012d6c63c9f2cc250d88df553aed2eb18
+Subproject 595f0ebaac3974f17e5a5c63e7e7dc0c5edd163