diff --git a/build-linux/build.sh b/build-linux/build.sh index 6f436d8..4daa33e 100755 --- a/build-linux/build.sh +++ b/build-linux/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no" -export OPTIONS="production=yes" +export OPTIONS="production=yes accesskit_sdk_path=/root/accesskit/accesskit-c" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm diff --git a/build-macos/build.sh b/build-macos/build.sh index 1e49c0d..b4b70b0 100755 --- a/build-macos/build.sh +++ b/build-macos/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no" -export OPTIONS="osxcross_sdk=darwin24.2 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle" +export OPTIONS="osxcross_sdk=darwin24.2 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle accesskit_sdk_path=/root/accesskit/accesskit-c" export OPTIONS_MONO="module_mono_enabled=yes" export TERM=xterm diff --git a/build-windows/build.sh b/build-windows/build.sh index 1d12dc3..f18dc30 100755 --- a/build-windows/build.sh +++ b/build-windows/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no" -export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes" +export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes accesskit_sdk_path=/root/accesskit/accesskit-c" export OPTIONS_MONO="module_mono_enabled=yes" export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw" export TERM=xterm diff --git a/build.sh b/build.sh index 56c4049..97137e9 100755 --- a/build.sh +++ b/build.sh @@ -148,6 +148,17 @@ if [ ! -d "deps/moltenvk" ]; then popd fi +# accesskit-c for 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.15.1/accesskit-c-0.15.1.zip + unzip -o accesskit.zip && rm -f accesskit.zip + mv accesskit-c-* accesskit-c + popd +fi + # Windows and macOS need ANGLE if [ ! -d "deps/angle" ]; then echo "Missing ANGLE libraries, downloading them." @@ -240,16 +251,16 @@ mkdir -p ${basedir}/mono-glue ${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue mkdir -p ${basedir}/out/windows -${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows +${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa -v ${basedir}/deps/accesskit:/root/accesskit --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows mkdir -p ${basedir}/out/linux -${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux +${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out -v ${basedir}/deps/accesskit:/root/accesskit localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux mkdir -p ${basedir}/out/web ${podman_run} -v ${basedir}/build-web:/root/build -v ${basedir}/out/web:/root/out localhost/godot-web:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/web 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 +${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 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