Revert "Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS"

This reverts commit f8a41bc69f. This wasn't actually the cause for the crash. The issue is fixed by https://github.com/godotengine/build-containers/pull/134.
Merge pull request #91 from godotengine/linux-arm64-disable-lto
2026-01-01 09:48:47 +03:00 · 2023-12-11 22:21:31 +01:00 · 2023-11-24 12:30:50 +01:00 · 2023-11-24 00:03:24 +01:00 · 2023-11-01 17:47:03 +01:00 · 2023-11-01 17:42:57 +01:00
9 changed files with 128 additions and 63 deletions
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -26,8 +26,6 @@ fi

 # Classical

-dnf -y install gettext
-
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Android..."

@@ -88,9 +86,7 @@ fi

 # Mono

-# No Android support with .NET 6 yet.
-#if [ "${MONO}" == "1" ]; then
-if false; then
+if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for Android..."

  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
@@ -115,7 +111,7 @@ if false; then
  cp bin/android_source.zip /root/out/templates-mono/
  cp bin/android_debug.apk /root/out/templates-mono/
  cp bin/android_release.apk /root/out/templates-mono/
-  cp bin/godot-lib.release.aar /root/out/templates-mono/
+  cp bin/godot-lib.template_release.aar /root/out/templates-mono/
 fi

 echo "Android build successful"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -11,7 +11,7 @@ export OPTIONS="production=yes use_lto=no"
 export OPTIONS_MONO="module_mono_enabled=yes"
 export TERM=xterm

-export IOS_SDK="16.1"
+export IOS_SDK="17.0"
 export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"

 rm -rf godot
@@ -21,8 +21,6 @@ tar xf /root/godot.tar.gz --strip-components=1

 # Classical

-dnf -y install gettext
-
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for iOS..."

@@ -36,15 +34,15 @@ if [ "${CLASSICAL}" == "1" ]; then
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
-  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_release \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_release \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates
  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
@@ -57,9 +55,7 @@ fi

 # Mono

-# No iOS support with .NET 6 yet.
-#if [ "${MONO}" == "1" ]; then
-if false; then
+if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for iOS..."

  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
@@ -74,15 +70,15 @@ if false; then
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_release \
-  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_release \
-    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates-mono

--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -14,11 +14,6 @@ mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
-sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
-
-dnf -y install gettext
-
 # Classical

 if [ "${CLASSICAL}" == "1" ]; then
@@ -37,7 +32,7 @@ if [ "${CLASSICAL}" == "1" ]; then
  cp -rvp bin/* /root/out/x86_64/templates
  rm -rf bin

-  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"

  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=editor
  mkdir -p /root/out/x86_32/tools
@@ -49,6 +44,32 @@ if [ "${CLASSICAL}" == "1" ]; then
  mkdir -p /root/out/x86_32/templates
  cp -rvp bin/* /root/out/x86_32/templates
  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=editor
+  mkdir -p /root/out/arm64/tools
+  cp -rvp bin/* /root/out/arm64/tools
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_debug
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_release
+  mkdir -p /root/out/arm64/templates
+  cp -rvp bin/* /root/out/arm64/templates
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=editor
+  mkdir -p /root/out/arm32/tools
+  cp -rvp bin/* /root/out/arm32/tools
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_debug
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_release
+  mkdir -p /root/out/arm32/templates
+  cp -rvp bin/* /root/out/arm32/templates
+  rm -rf bin
 fi

 # Mono
@@ -73,7 +94,7 @@ if [ "${MONO}" == "1" ]; then
  cp -rvp bin/* /root/out/x86_64/templates-mono
  rm -rf bin

-  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"

  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
@@ -86,6 +107,34 @@ if [ "${MONO}" == "1" ]; then
  mkdir -p /root/out/x86_32/templates-mono
  cp -rvp bin/* /root/out/x86_32/templates-mono
  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
+  mkdir -p /root/out/arm64/tools-mono
+  cp -rvp bin/* /root/out/arm64/tools-mono
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/arm64/templates-mono
+  cp -rvp bin/* /root/out/arm64/templates-mono
+  rm -rf bin
+
+  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=editor
+  ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
+  mkdir -p /root/out/arm32/tools-mono
+  cp -rvp bin/* /root/out/arm32/tools-mono
+  rm -rf bin
+
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
+  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
+  mkdir -p /root/out/arm32/templates-mono
+  cp -rvp bin/* /root/out/arm32/templates-mono
+  rm -rf bin
 fi

 echo "Linux build successful"
--- a/build-macos/build.sh
+++ b/build-macos/build.sh
@@ -5,9 +5,9 @@ set -e
 # Config

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin22 production=yes use_volk=no vulkan_sdk_path=/root/vulkansdk"
+export OPTIONS="osxcross_sdk=darwin23 production=yes use_volk=no vulkan_sdk_path=/root/vulkansdk angle_libs=/root/angle"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export STRIP="x86_64-apple-darwin22-strip -u -r"
+export STRIP="x86_64-apple-darwin23-strip -u -r"
 export TERM=xterm

 rm -rf godot
@@ -17,8 +17,6 @@ tar xf /root/godot.tar.gz --strip-components=1

 # Classical

-dnf -y install gettext
-
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for macOS..."

--- a/build-mono-glue/build.sh
+++ b/build-mono-glue/build.sh
@@ -15,20 +15,12 @@ mkdir godot
 cd godot
 tar xf ../godot.tar.gz --strip-components=1

-# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
-sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
-
-# Temporarily until we make --headless mode actually skip X11.
-dnf install -y libX11 libXcursor libXrandr libXinerama libXi mesa-libGL
-dnf -y install gettext
-
 # Mono

 if [ "${MONO}" == "1" ]; then
  echo "Building and generating Mono glue..."

  dotnet --info
-  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/

  ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes

--- a/build-release.sh
+++ b/build-release.sh
@@ -240,13 +240,21 @@ if [ "${build_classical}" == "1" ]; then
  # Editor
  binname="${godot_basename}_linux.x86_64"
  cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname}
-  strip ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

  binname="${godot_basename}_linux.x86_32"
  cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname}
-  strip ${binname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}
+
+  binname="${godot_basename}_linux.arm64"
+  cp out/linux/arm64/tools/godot.linuxbsd.editor.arm64 ${binname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}
+
+  binname="${godot_basename}_linux.arm32"
+  cp out/linux/arm32/tools/godot.linuxbsd.editor.arm32 ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

@@ -255,7 +263,10 @@ if [ "${build_classical}" == "1" ]; then
  cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64
  cp out/linux/x86_32/templates/godot.linuxbsd.template_release.x86_32 ${templatesdir}/linux_release.x86_32
  cp out/linux/x86_32/templates/godot.linuxbsd.template_debug.x86_32 ${templatesdir}/linux_debug.x86_32
-  strip ${templatesdir}/linux*
+  cp out/linux/arm64/templates/godot.linuxbsd.template_release.arm64 ${templatesdir}/linux_release.arm64
+  cp out/linux/arm64/templates/godot.linuxbsd.template_debug.arm64 ${templatesdir}/linux_debug.arm64
+  cp out/linux/arm32/templates/godot.linuxbsd.template_release.arm32 ${templatesdir}/linux_release.arm32
+  cp out/linux/arm32/templates/godot.linuxbsd.template_debug.arm32 ${templatesdir}/linux_debug.arm32

  ## Windows (Classical) ##

@@ -390,7 +401,6 @@ if [ "${build_mono}" == "1" ]; then
  binbasename="${godot_basename}_mono_linux"
  mkdir -p ${binbasename}_x86_64
  cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64
-  strip ${binbasename}_x86_64/${binbasename}.x86_64
  cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/
  zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
  rm -rf ${binbasename}_x86_64
@@ -398,17 +408,33 @@ if [ "${build_mono}" == "1" ]; then
  binbasename="${godot_basename}_mono_linux"
  mkdir -p ${binbasename}_x86_32
  cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32
-  strip ${binbasename}_x86_32/${binbasename}.x86_32
  cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/
  zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32
  rm -rf ${binbasename}_x86_32

+  binbasename="${godot_basename}_mono_linux"
+  mkdir -p ${binbasename}_arm64
+  cp out/linux/arm64/tools-mono/godot.linuxbsd.editor.arm64.mono ${binbasename}_arm64/${binbasename}.arm64
+  cp -rp out/linux/arm64/tools-mono/GodotSharp/ ${binbasename}_arm64/
+  zip -r -q -9 "${reldir_mono}/${binbasename}_arm64.zip" ${binbasename}_arm64
+  rm -rf ${binbasename}_arm64
+
+  binbasename="${godot_basename}_mono_linux"
+  mkdir -p ${binbasename}_arm32
+  cp out/linux/arm32/tools-mono/godot.linuxbsd.editor.arm32.mono ${binbasename}_arm32/${binbasename}.arm32
+  cp -rp out/linux/arm32/tools-mono/GodotSharp/ ${binbasename}_arm32/
+  zip -r -q -9 "${reldir_mono}/${binbasename}_arm32.zip" ${binbasename}_arm32
+  rm -rf ${binbasename}_arm32
+
  # Templates
  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64
  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64
  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32
  cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32
-  strip ${templatesdir_mono}/linux*
+  cp out/linux/arm64/templates-mono/godot.linuxbsd.template_debug.arm64.mono ${templatesdir_mono}/linux_debug.arm64
+  cp out/linux/arm64/templates-mono/godot.linuxbsd.template_release.arm64.mono ${templatesdir_mono}/linux_release.arm64
+  cp out/linux/arm32/templates-mono/godot.linuxbsd.template_debug.arm32.mono ${templatesdir_mono}/linux_debug.arm32
+  cp out/linux/arm32/templates-mono/godot.linuxbsd.template_release.arm32.mono ${templatesdir_mono}/linux_release.arm32

  ## Windows (Mono) ##

@@ -475,16 +501,6 @@ if [ "${build_mono}" == "1" ]; then
  rm -rf macos_template.app
  sign_macos_template ${templatesdir_mono} 1

-  # No .NET support for those platforms yet.
-
-  if false; then
-
-  ## Web (Mono) ##
-
-  # Templates
-  cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
-  cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip
-
  ## Android (Mono) ##

  # Lib for direct download
@@ -509,6 +525,16 @@ if [ "${build_mono}" == "1" ]; then
  cd ..
  rm -rf ios_xcode

+  # No .NET support for those platforms yet.
+
+  if false; then
+
+  ## Web (Mono) ##
+
+  # Templates
+  cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
+  cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip
+
  fi

  ## Templates TPZ (Mono) ##
--- a/build-web/build.sh
+++ b/build-web/build.sh
@@ -29,8 +29,6 @@ tar xf /root/godot.tar.gz --strip-components=1

 # Classical

-dnf -y install gettext
-
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Web..."

--- 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"
+export OPTIONS="production=yes angle_libs=/root/angle"
 export OPTIONS_MONO="module_mono_enabled=yes"
 export TERM=xterm

@@ -16,8 +16,6 @@ tar xf /root/godot.tar.gz --strip-components=1

 # Classical

-dnf -y install gettext
-
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Windows..."

--- a/build.sh
+++ b/build.sh
@@ -136,6 +136,18 @@ if [ ! -d "deps/vulkansdk-macos" ]; then
  echo "Missing Vulkan SDK for macOS, we're going to run into issues!"
 fi

+# Windows and macOS need ANGLE
+if [ ! -d "deps/angle" ]; then
+  echo "Missing ANGLE libraries, downloading them."
+  mkdir -p deps/angle
+  pushd deps/angle
+  curl -L -o windows.zip https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6029/Windows.6029-1.MinGW_11.x86_64.x86_32.zip
+  curl -L -o macos.zip https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6029/macOS.6029.Xcode_15.arm64.x86_64.zip
+  unzip windows.zip && rm -f windows.zip
+  unzip macos.zip && rm -f macos.zip
+  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.
@@ -187,7 +199,7 @@ 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 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 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
@@ -196,7 +208,7 @@ 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/vulkansdk-macos:/root/vulkansdk 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/vulkansdk-macos:/root/vulkansdk -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
Author	SHA1	Message	Date
Rémi Verschelde	ceadb16e22	Revert "Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS" This reverts commit `f8a41bc69f`. This wasn't actually the cause for the crash. The issue is fixed by https://github.com/godotengine/build-containers/pull/134.	2023-12-11 22:21:31 +01:00
Rémi Verschelde	ee35cb71ca	Merge pull request #91 from godotengine/linux-arm64-disable-lto Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS	2023-11-24 12:30:50 +01:00
Rémi Verschelde	f8a41bc69f	Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS Needs further investigation and reporting the bug upstream.	2023-11-24 00:03:24 +01:00
Rémi Verschelde	2398d61b29	Merge pull request #90 from godotengine/linux-buildroot-update-arm Linux: Update to new SDK with GCC 13, add ARM64 and ARM32	2023-11-01 17:47:03 +01:00
Rémi Verschelde	96b8f89a22	Linux: Update to new SDK with GCC 13, add ARM64 and ARM32	2023-11-01 17:42:57 +01:00
Rémi Verschelde	09b9dcf969	Merge pull request #76 from bruvzg/notarytool [macOS] Use notarytool instead of deprecated altool.	2023-10-31 18:50:31 +01:00
bruvzg	7b9e4271f4	[macOS] Use notarytool instead of deprecated altool.	2023-10-31 19:26:52 +02:00
Rémi Verschelde	93d253330f	Merge pull request #89 from godotengine/f39-images Update scripts for new Fedora 39 based images for 4.2-beta3 and later	2023-10-24 16:31:23 +02:00
Rémi Verschelde	65cca8165a	Update scripts for new Fedora 39 based images for 4.2-beta3 and later Follow-up to https://github.com/godotengine/build-containers/pull/128. Also reverts #88 since these new images include JDK 17, and the closure compiler issue was fixed upstream. And removes the manual install of gettext which is now also part of the images. X11 libs should not be needed to generate the Mono glue anymore (they've been unnecessary for a while already).	2023-10-24 11:45:29 +02:00
Rémi Verschelde	be182f1ed7	Merge pull request #88 from godotengine/4.2-beta2-jdk-17 Android: Install JDK 17 needed for 4.2-beta2 and later	2023-10-19 10:47:04 +02:00
Rémi Verschelde	2c7419a7ed	Android: Install JDK 17 needed for 4.2-beta2 and later Temporary change until we switch to newer build containers with it. Also temporarily disable closure compiler for Web editor, needed for 4.2 beta 1 and beta 2, should be fixed upstream afterwarads.	2023-10-19 10:45:43 +02:00
Rémi Verschelde	ad9e3b238a	Merge pull request #87 from YuriSizov/publish-maven Publish Android library from the main build-release script	2023-10-11 20:43:40 +02:00
Yuri Sizov	9d40b39c01	Publish Android library from the main build-release script	2023-10-11 20:08:40 +02:00
Rémi Verschelde	066ede3602	Merge pull request #86 from godotengine/dotnet-ios .NET: Add support for iOS builds	2023-10-10 08:12:52 +02:00
Rémi Verschelde	75877451f2	.NET: Add support for iOS builds	2023-10-04 01:15:30 +02:00
Rémi Verschelde	02e092ce76	Merge pull request #84 from godotengine/angle-libs Download static ANGLE libs to link them in Windows and macOS builds	2023-09-25 21:49:56 +02:00
Rémi Verschelde	4863750c00	Download static ANGLE libs to link them in Windows and macOS builds	2023-09-25 15:32:14 +02:00
Rémi Verschelde	37938758d8	Merge pull request #83 from godotengine/drop-uwp Drop UWP build scripts since it was removed upstream	2023-09-21 15:35:33 +02:00
Rémi Verschelde	79967d5bb9	Drop UWP build scripts since it was removed upstream	2023-09-21 15:33:31 +02:00
Rémi Verschelde	37876d4d40	Merge pull request #82 from godotengine/dotnet-android .NET: Add support for Android builds	2023-09-05 11:02:27 +02:00
Rémi Verschelde	9f25ceccfb	.NET: Add support for Android builds	2023-09-05 10:03:29 +02:00