diff --git a/build-macosx/build.sh b/build-macosx/build.sh index 1a5e791..f3196c6 100755 --- a/build-macosx/build.sh +++ b/build-macosx/build.sh @@ -5,7 +5,7 @@ set -e # Config export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no" -export OPTIONS="osxcross_sdk=darwin21.4 production=yes" +export OPTIONS="osxcross_sdk=darwin21.4 production=yes use_static_mvk=yes VULKAN_SDK_PATH=/root/vulkansdk" export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes" export MONO_PREFIX_X86_64="/root/mono-installs/desktop-osx-x86_64-release" export MONO_PREFIX_ARM64="/root/mono-installs/desktop-osx-arm64-release" diff --git a/build-release.sh b/build-release.sh index d50b80c..625abf6 100755 --- a/build-release.sh +++ b/build-release.sh @@ -284,6 +284,8 @@ if [ "${build_classical}" == "1" ]; then cp out/ios/templates/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp out/ios/templates/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a cp out/ios/templates/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a + cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/ + rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}* cd ios_xcode zip -q -9 -r "${templatesdir}/iphone.zip" * cd .. @@ -486,6 +488,8 @@ if [ "${build_mono}" == "1" ]; then cp out/ios/templates-mono/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp out/ios/templates-mono/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a cp out/ios/templates-mono/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a + cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/ + rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}* cd ios_xcode zip -q -9 -r "${templatesdir_mono}/iphone.zip" * cd .. diff --git a/build.sh b/build.sh index b5fcddb..066620f 100755 --- a/build.sh +++ b/build.sh @@ -145,6 +145,11 @@ if [ $skip_download == 0 ]; then fi fi +# macOS and iOS need the Vulkan SDK +if [ ! -d "deps/vulkansdk-macos" ]; then + echo "Missing Vulkan SDK for macOS, we're going to run into issues!" +fi + if [ "${skip_git_checkout}" == 0 ]; then git clone https://github.com/godotengine/godot git || /bin/true pushd git @@ -197,7 +202,7 @@ ${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/roo #${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out localhost/godot-javascript:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript mkdir -p ${basedir}/out/macosx -${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx:/root/out localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx +${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx:/root/out -v ${basedir}/deps/vulkansdk-macos:/root/vulkansdk localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx mkdir -p ${basedir}/out/android ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android