diff --git a/build-android/build.sh b/build-android/build.sh index 9a5e530..82d037c 100755 --- a/build-android/build.sh +++ b/build-android/build.sh @@ -7,7 +7,7 @@ set -e # Debug symbols are enabled for the Android builds so we can generate a separate debug symbols file. # Gradle will strip them out of the final artifacts. export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" -export OPTIONS="production=yes debug_symbols=yes" +export OPTIONS="production=yes debug_symbols=yes accesskit_sdk_path=/root/accesskit/accesskit-c" export OPTIONS_MONO="module_mono_enabled=yes" export OPTIONS_DOTNET="module_dotnet_enabled=yes" export TERM=xterm diff --git a/build.sh b/build.sh index a6eaa47..b8ca394 100755 --- a/build.sh +++ b/build.sh @@ -165,12 +165,12 @@ if [ ! -d "deps/moltenvk" ]; then popd fi -# accesskit-c for Windows, macOS and Linux +# accesskit-c for Android, Windows, macOS and Linux if [ ! -d "deps/accesskit" ]; then echo "Missing accesskit, downloading it." mkdir -p deps/accesskit pushd deps/accesskit - curl -L -o accesskit.zip https://github.com/godotengine/godot-accesskit-c-static/releases/download/0.21.2/accesskit-c-0.21.2.zip + curl -L -o accesskit.zip https://github.com/godotengine/godot-accesskit-c-static/releases/download/0.21.2-1/accesskit-c-0.21.2-1.zip unzip -o accesskit.zip && rm -f accesskit.zip mv accesskit-c-* accesskit-c popd @@ -290,7 +290,7 @@ mkdir -p ${basedir}/out/macos ${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/accesskit:/root/accesskit -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle --env STEAM=${build_steam} 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/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 +${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/accesskit:/root/accesskit -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-appleembedded:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios