Merge branch '4.1' into 4.2-beta

This commit is contained in:
Mario Zechner 2022-09-13 10:31:41 +02:00
commit b658634785
2 changed files with 4 additions and 1 deletions

View File

@ -116,6 +116,8 @@ elif [ "$platform" = "linux" ]; then
scons platform=x11 tools=no target=release_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus scons platform=x11 tools=no target=release_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus
strip bin/godot.x11.opt.64 strip bin/godot.x11.opt.64
strip bin/godot.x11.opt.debug.64 strip bin/godot.x11.opt.debug.64
chmod a+x bin/godot.x11.opt.64
chmod a+x bin/godot.x11.opt.debug.64
cp bin/godot.x11.opt.64 bin/linux_x11_64_release cp bin/godot.x11.opt.64 bin/linux_x11_64_release
cp bin/godot.x11.opt.debug.64 bin/linux_x11_64_debug cp bin/godot.x11.opt.debug.64 bin/linux_x11_64_debug
else else

View File

@ -63,6 +63,7 @@ else
scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
if [ -f "bin/godot.x11.opt.tools.64" ]; then if [ -f "bin/godot.x11.opt.tools.64" ]; then
strip bin/godot.x11.opt.tools.64 strip bin/godot.x11.opt.tools.64
chmod a+x bin/godot.x11.opt.tools.64
fi fi
fi fi
popd popd