[godot] Attempt to fix Windows build on GitHub.

This commit is contained in:
Mario Zechner 2024-05-22 15:53:10 +02:00
parent 330e646c08
commit 77acce777c

View File

@ -10,7 +10,7 @@ if [ ! "$#" -eq 1 ]; then
echo "e.g.:" echo "e.g.:"
echo " ./build.sh release_debug" echo " ./build.sh release_debug"
echo " ./build.sh debug" echo " ./build.sh debug"
echo echo
exit 1 exit 1
fi fi
@ -37,7 +37,7 @@ fi
echo "CPUS: $cpus" 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" --jobs=$cpus
scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
@ -53,14 +53,14 @@ if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then
lipo -create godot.osx.opt.tools.x86_64 godot.osx.opt.tools.arm64 -output godot.osx.opt.tools.universal lipo -create godot.osx.opt.tools.x86_64 godot.osx.opt.tools.arm64 -output godot.osx.opt.tools.universal
strip -S -x godot.osx.opt.tools.universal strip -S -x godot.osx.opt.tools.universal
cp godot.osx.opt.tools.universal Godot.app/Contents/MacOS/Godot cp godot.osx.opt.tools.universal Godot.app/Contents/MacOS/Godot
fi fi
chmod +x Godot.app/Contents/MacOS/Godot chmod +x Godot.app/Contents/MacOS/Godot
popd popd
else else
if [ "$OSTYPE" = "msys" ]; then if [ "$OSTYPE" = "msys" ] || [ "$RUNNER_OS" = "Windows" ]; then
target="$target vsproj=yes livepp=$LIVEPP" target="$target vsproj=yes livepp=$LIVEPP"
fi fi
scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
cp compile_commands.json ../build cp compile_commands.json ../build
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