From 740be9911ea2bace8addddd08d0373b5d5cf9dc9 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 29 Jan 2022 17:07:09 +0100 Subject: [PATCH] Add the export templates properly to lipo.sh. --- podman_build_all.sh | 2 +- tools/osx/lipo.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/podman_build_all.sh b/podman_build_all.sh index 9f461783..689dfd95 100755 --- a/podman_build_all.sh +++ b/podman_build_all.sh @@ -16,7 +16,7 @@ mkdir -p logs #sudo podman run -i -t -v $(pwd)/files:/root/files godot-osx:bs /bin/bash #sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project godot-osx:bs /bin/bash #sudo podman run -v $(pwd)/:/root/project -w /root/project godot-osx:bs scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 -#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project/tools/osx godot-osx:bs ./lipo.sh +#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project/tools/osx godot-osx:bs bash -c ./lipo.sh rm -f engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew_strip -j4 . 2>&1 | tee logs/bew.log diff --git a/tools/osx/lipo.sh b/tools/osx/lipo.sh index 0a9b6b27..b9d04c7d 100755 --- a/tools/osx/lipo.sh +++ b/tools/osx/lipo.sh @@ -1,4 +1,6 @@ # Tools lipo -create ../../engine/bin/godot.osx.opt.tools.x86_64 ../../engine/bin/godot.osx.opt.tools.arm64 -output ../../engine/bin/godot.osx.opt.tools.universal -lipo -create ../../engine/bin/godot.osx.tools.x86_64 ../../engine/bin/godot.osx.tools.arm64 -output ../../engine/bin/godot.osx.tools.universal +# Export Templates +lipo -create ../../engine/bin/godot.osx.opt.x86_64 ../../engine/bin/godot.osx.opt.arm64 -output ../../engine/bin/godot.osx.opt.universal +lipo -create ../../engine/bin/godot.osx.opt.debug.x86_64 ../../engine/bin/godot.osx.opt.debug.arm64 -output ../../engine/bin/godot.osx.opt.debug.universal