File tree Expand file tree Collapse file tree 3 files changed +11
-2
lines changed Expand file tree Collapse file tree 3 files changed +11
-2
lines changed Original file line number Diff line number Diff line change 5
5
# Config
6
6
7
7
export SCONS=" scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
8
- export OPTIONS=" osxcross_sdk=darwin21.4 production=yes"
8
+ export OPTIONS=" osxcross_sdk=darwin21.4 production=yes use_static_mvk=yes VULKAN_SDK_PATH=/root/vulkansdk "
9
9
export OPTIONS_MONO=" module_mono_enabled=yes mono_static=yes"
10
10
export MONO_PREFIX_X86_64=" /root/mono-installs/desktop-osx-x86_64-release"
11
11
export MONO_PREFIX_ARM64=" /root/mono-installs/desktop-osx-arm64-release"
Original file line number Diff line number Diff line change @@ -284,6 +284,8 @@ if [ "${build_classical}" == "1" ]; then
284
284
cp out/ios/templates/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
285
285
cp out/ios/templates/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a
286
286
cp out/ios/templates/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a
287
+ cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
288
+ rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
287
289
cd ios_xcode
288
290
zip -q -9 -r " ${templatesdir} /iphone.zip" *
289
291
cd ..
@@ -486,6 +488,8 @@ if [ "${build_mono}" == "1" ]; then
486
488
cp out/ios/templates-mono/libgodot.iphone.debug.simulator.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
487
489
cp out/ios/templates-mono/libgodot.iphone.a ios_xcode/libgodot.iphone.release.xcframework/ios-arm64/libgodot.a
488
490
cp out/ios/templates-mono/libgodot.iphone.debug.a ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/libgodot.a
491
+ cp -r deps/vulkansdk-macos/MoltenVK/MoltenVK.xcframework ios_xcode/
492
+ rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
489
493
cd ios_xcode
490
494
zip -q -9 -r " ${templatesdir_mono} /iphone.zip" *
491
495
cd ..
Original file line number Diff line number Diff line change @@ -145,6 +145,11 @@ if [ $skip_download == 0 ]; then
145
145
fi
146
146
fi
147
147
148
+ # macOS and iOS need the Vulkan SDK
149
+ if [ ! -d " deps/vulkansdk-macos" ]; then
150
+ echo " Missing Vulkan SDK for macOS, we're going to run into issues!"
151
+ fi
152
+
148
153
if [ " ${skip_git_checkout} " == 0 ]; then
149
154
git clone https://github.com/godotengine/godot git || /bin/true
150
155
pushd git
@@ -197,7 +202,7 @@ ${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/roo
197
202
# ${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
198
203
199
204
mkdir -p ${basedir} /out/macosx
200
- ${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
205
+ ${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
201
206
202
207
mkdir -p ${basedir} /out/android
203
208
${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
You can’t perform that action at this time.
0 commit comments