UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2023-01-30 12:49:58 +01:00
commit c8d38f2ec4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/spine-godot-v4.yml vendored
View File

@ -183,13 +183,13 @@ jobs:
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: godot-template-windows-debug.zip 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 - name: Upload artifacts release
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: godot-template-windows-release.zip 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: godot-template-android:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04

6
spine-godot/build/build-v4.sh
View File

@ -28,8 +28,8 @@ echo "CPUS: $cpus"
pushd ../godot pushd ../godot
if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then
scons $target arch=x86_64 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" --jobs=$cpus scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
pushd bin pushd bin
cp -r ../misc/dist/macos_tools.app . cp -r ../misc/dist/macos_tools.app .
@ -47,7 +47,7 @@ else
if [ "$dev" = "true" ]; then if [ "$dev" = "true" ]; then
target="$target dev_build=true" target="$target dev_build=true"
fi 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 cp compile_commands.json ../build
if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then
strip bin/godot.linuxbsd.editor.x86_64 strip bin/godot.linuxbsd.editor.x86_64

2
spine-godot/build/install-macos-vulkan-sdk.sh
View File

@ -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 hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
--accept-licenses --default-answer --confirm-command install --accept-licenses --default-answer --confirm-command install
hdiutil detach /Volumes/vulkan-sdk # hdiutil detach /Volumes/vulkan-sdk
rm -f /tmp/vulkan-sdk.dmg rm -f /tmp/vulkan-sdk.dmg