From 6aa54259cbc0ca62c50e55af6793c11627d5dde3 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 30 Jan 2023 12:49:29 +0100 Subject: [PATCH] [godot] Enable GLES3 backend for Godot 4.0, fix Windows template executable names in GitHub workflow. --- .github/workflows/spine-godot-v4.yml | 4 ++-- spine-godot/build/build-v4.sh | 6 +++--- spine-godot/build/install-macos-vulkan-sdk.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml index e46c56225..8627afcda 100644 --- a/.github/workflows/spine-godot-v4.yml +++ b/.github/workflows/spine-godot-v4.yml @@ -183,13 +183,13 @@ jobs: uses: actions/upload-artifact@v2 with: name: godot-template-windows-debug.zip - path: spine-godot/godot/bin/windows_64_debug.exe + path: spine-godot/godot/bin/windows_debug_x86_64.exe.exe - name: Upload artifacts release uses: actions/upload-artifact@v2 with: name: godot-template-windows-release.zip - path: spine-godot/godot/bin/windows_64_release.exe + path: spine-godot/godot/bin/windows_debug_x86_64.exe.exe godot-template-android: runs-on: ubuntu-20.04 diff --git a/spine-godot/build/build-v4.sh b/spine-godot/build/build-v4.sh index 6d91ec831..6ea29a454 100755 --- a/spine-godot/build/build-v4.sh +++ b/spine-godot/build/build-v4.sh @@ -28,8 +28,8 @@ echo "CPUS: $cpus" pushd ../godot if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then - scons $target arch=x86_64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus - scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus + scons $target arch=x86_64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus + scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus pushd bin cp -r ../misc/dist/macos_tools.app . @@ -47,7 +47,7 @@ else if [ "$dev" = "true" ]; then target="$target dev_build=true" fi - scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus + scons $target compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus cp compile_commands.json ../build if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then strip bin/godot.linuxbsd.editor.x86_64 diff --git a/spine-godot/build/install-macos-vulkan-sdk.sh b/spine-godot/build/install-macos-vulkan-sdk.sh index 7de9fd307..756d38535 100755 --- a/spine-godot/build/install-macos-vulkan-sdk.sh +++ b/spine-godot/build/install-macos-vulkan-sdk.sh @@ -6,5 +6,5 @@ curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/ hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ --accept-licenses --default-answer --confirm-command install -hdiutil detach /Volumes/vulkan-sdk +# hdiutil detach /Volumes/vulkan-sdk rm -f /tmp/vulkan-sdk.dmg \ No newline at end of file