From cb2be8723a16f9fdb13582562cb630c945dcd0a7 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Fri, 30 Jun 2023 11:44:33 +0200
Subject: Support building for Godot 4.1 (new default).

---
 misc/patches/scons_path.diff    | 6 +++---
 misc/scripts/package_release.sh | 7 ++++---
 misc/webrtc.gdextension         | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/patches/scons_path.diff b/misc/patches/scons_path.diff
index d7273ea..0fab302 100644
--- a/misc/patches/scons_path.diff
+++ b/misc/patches/scons_path.diff
@@ -1,7 +1,7 @@
-diff --git a/godot-cpp/SConstruct b/godot-cpp/SConstruct
+diff --git a/godot-cpp-4.0/SConstruct b/godot-cpp-4.0/SConstruct
 index 27ee137..32b425e 100644
---- a/godot-cpp/SConstruct
-+++ b/godot-cpp/SConstruct
+--- a/godot-cpp-4.0/SConstruct
++++ b/godot-cpp-4.0/SConstruct
 @@ -54,6 +54,8 @@ else:
  # Default tools with no platform defaults to gnu toolchain.
  # We apply platform specific toolchains via our custom tools.
diff --git a/misc/scripts/package_release.sh b/misc/scripts/package_release.sh
index a08f441..3ca5a2b 100755
--- a/misc/scripts/package_release.sh
+++ b/misc/scripts/package_release.sh
@@ -10,6 +10,7 @@ TYPE=${TYPE:-"webrtc"}
 
 mkdir -p ${DESTINATION}
 ls -R ${DESTINATION}
+ls -R ${ARTIFACTS}
 
 DESTDIR="${DESTINATION}/${VERSION}/${TYPE}"
 
@@ -18,10 +19,10 @@ mkdir -p ${DESTDIR}/lib
 find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/lib/*" | xargs cp -t "${DESTDIR}/lib/"
 find "${ARTIFACTS}" -wholename "*/LICENSE*" | xargs cp -t "${DESTDIR}/"
 
-if [ $VERSION = "extension" ]; then
-    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.gdextension" | head -n 1 | xargs cp -t "${DESTDIR}/"
-else
+if [ $VERSION = "gdnative" ]; then
     find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.tres" | head -n 1 | xargs cp -t "${DESTDIR}/"
+else
+    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.gdextension" | head -n 1 | xargs cp -t "${DESTDIR}/"
 fi
 
 CURDIR=$(pwd)
diff --git a/misc/webrtc.gdextension b/misc/webrtc.gdextension
index 9fe979a..8f930bf 100644
--- a/misc/webrtc.gdextension
+++ b/misc/webrtc.gdextension
@@ -1,6 +1,7 @@
 [configuration]
 
 entry_symbol = "webrtc_extension_init"
+compatibility_minimum = {GODOT_VERSION}
 
 [libraries]
 
-- 
cgit v1.2.3