From 8c176b460ba41d1cb7e7c1a0f03a90a43ea4aeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 8 Nov 2024 10:09:05 +0100 Subject: [PATCH] Android: Download and copy swappy libraries --- build-android/build.sh | 2 ++ build.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build-android/build.sh b/build-android/build.sh index e3485b5..f6c0beb 100755 --- a/build-android/build.sh +++ b/build-android/build.sh @@ -13,6 +13,7 @@ rm -rf godot mkdir godot cd godot tar xf /root/godot.tar.gz --strip-components=1 +cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/ # Environment variables and keystore needed for signing store editor build, # as well as signing and publishing to MavenCentral. @@ -59,6 +60,7 @@ if [ "${CLASSICAL}" == "1" ]; then # outside the container for the MavenCentral upload. rm -rf /root/godot/* tar xf /root/godot.tar.gz --strip-components=1 + cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/ $SCONS platform=android arch=arm32 $OPTIONS target=template_debug $SCONS platform=android arch=arm32 $OPTIONS target=template_release diff --git a/build.sh b/build.sh index 7ec6a66..7054ca4 100755 --- a/build.sh +++ b/build.sh @@ -180,6 +180,15 @@ if [ ! -d "deps/mesa" ]; then popd fi +if [ ! -d "deps/swappy" ]; then + echo "Missing Swappy libraries, downloading them." + mkdir -p deps/swappy + pushd deps/swappy + curl -L -O https://github.com/darksylinc/godot-swappy/releases/download/v2023.3.0.0/godot-swappy.7z + 7z x godot-swappy.7z && rm godot-swappy.7z + popd +fi + # Keystore for Android editor signing # Optional - the config.sh will be copied but if it's not filled in, # it will do an unsigned build. @@ -243,7 +252,7 @@ mkdir -p ${basedir}/out/macos ${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos mkdir -p ${basedir}/out/android -${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/keystore:/root/keystore localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android +${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/swappy:/root/swappy -v ${basedir}/deps/keystore:/root/keystore localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android mkdir -p ${basedir}/out/ios ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios