From 11c34148c59da6954736291396ec5544a5fb2d35 Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:05:20 -0500 Subject: [PATCH 1/2] Fix MacOS export --- .github/workflows/all_builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/all_builds.yml b/.github/workflows/all_builds.yml index 0744ae62..54c3c3eb 100644 --- a/.github/workflows/all_builds.yml +++ b/.github/workflows/all_builds.yml @@ -163,6 +163,7 @@ jobs: - name: Make macOS template if: matrix.platform == 'macos' run: | + cp -R "misc/dist/macos_template.app" "bin/" mkdir -p "bin/macos_template.app/Contents/MacOS" lipo -create bin/godot.macos.template_release.x86_64 bin/godot.macos.template_release.arm64 -output bin/godot.macos.template_release.universal cp "bin/godot.macos.template_release.universal" "bin/macos_template.app/Contents/MacOS/godot_macos_debug.universal" From 59cbae10d223a52cafda08e540f69437ab1e7543 Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:12:37 -0500 Subject: [PATCH 2/2] re-sync @ 4c4e67334412f73c9deba5e5d29afa8651418af2 --- .github/workflows/all_builds.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/all_builds.yml b/.github/workflows/all_builds.yml index 54c3c3eb..55c10ddd 100644 --- a/.github/workflows/all_builds.yml +++ b/.github/workflows/all_builds.yml @@ -26,7 +26,7 @@ on: env: GODOT_BASE_BRANCH: master # Change the README too - GODOT_MAIN_SYNC_REF: 72cff2ed591ca6da76ef287d2afcca35d59402df + GODOT_MAIN_SYNC_REF: 4c4e67334412f73c9deba5e5d29afa8651418af2 SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes debug_symbols=no deprecated=yes SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_camera_enabled=no module_mbedtls_enabled=no module_enet_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_noise_enabled=no module_websocket_enabled=no use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes module_csg_enabled=yes module_gridmap_enabled=yes disable_3d=no SCONS_CACHE_MSVC_CONFIG: true diff --git a/README.md b/README.md index 088a8e67..e4b80660 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ For ease of bootstrapping development, we have included launch, build, and setti ### Requirements -Godot 4.0 (master branch) @ 72cff2ed591ca6da76ef287d2afcca35d59402df +Godot 4.0 (master branch) @ 4c4e67334412f73c9deba5e5d29afa8651418af2 - Support for building on 3.x has been dropped and no new features are being pushed - Godot RE Tools still retains the ability to decompile 3.x and 2.x projects, however.