Skip to content

Commit 8c176b4

Browse files
committed
Android: Download and copy swappy libraries
1 parent e0891e9 commit 8c176b4

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

build-android/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ rm -rf godot
1313
mkdir godot
1414
cd godot
1515
tar xf /root/godot.tar.gz --strip-components=1
16+
cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
1617

1718
# Environment variables and keystore needed for signing store editor build,
1819
# as well as signing and publishing to MavenCentral.
@@ -59,6 +60,7 @@ if [ "${CLASSICAL}" == "1" ]; then
5960
# outside the container for the MavenCentral upload.
6061
rm -rf /root/godot/*
6162
tar xf /root/godot.tar.gz --strip-components=1
63+
cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
6264

6365
$SCONS platform=android arch=arm32 $OPTIONS target=template_debug
6466
$SCONS platform=android arch=arm32 $OPTIONS target=template_release

build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,15 @@ if [ ! -d "deps/mesa" ]; then
180180
popd
181181
fi
182182

183+
if [ ! -d "deps/swappy" ]; then
184+
echo "Missing Swappy libraries, downloading them."
185+
mkdir -p deps/swappy
186+
pushd deps/swappy
187+
curl -L -O https://github.com/darksylinc/godot-swappy/releases/download/v2023.3.0.0/godot-swappy.7z
188+
7z x godot-swappy.7z && rm godot-swappy.7z
189+
popd
190+
fi
191+
183192
# Keystore for Android editor signing
184193
# Optional - the config.sh will be copied but if it's not filled in,
185194
# it will do an unsigned build.
@@ -243,7 +252,7 @@ mkdir -p ${basedir}/out/macos
243252
${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
244253

245254
mkdir -p ${basedir}/out/android
246-
${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
255+
${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
247256

248257
mkdir -p ${basedir}/out/ios
249258
${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

0 commit comments

Comments
 (0)