Skip to content

Commit 74cc8c7

Browse files
committed
macOS: Temporarily build Mono without ARM64
We don't have containers with ARM64 Mono yet. This can be reverted once we do.
1 parent 0d85e09 commit 74cc8c7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

build-macosx/build.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ if [ "${MONO}" == "1" ]; then
5050
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
5151

5252
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=x86_64 tools=yes target=release_debug copy_mono_root=yes
53-
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=yes target=release_debug copy_mono_root=yes
54-
lipo -create bin/godot.osx.opt.tools.x86_64.mono bin/godot.osx.opt.tools.arm64.mono -output bin/godot.osx.opt.tools.universal.mono
53+
#$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=yes target=release_debug copy_mono_root=yes
54+
#lipo -create bin/godot.osx.opt.tools.x86_64.mono bin/godot.osx.opt.tools.arm64.mono -output bin/godot.osx.opt.tools.universal.mono
5555

5656
mkdir -p /root/out/tools-mono
5757
cp -rvp bin/* /root/out/tools-mono
5858
rm -rf bin
5959

6060
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=x86_64 tools=no target=release_debug
61-
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release_debug
62-
lipo -create bin/godot.osx.opt.debug.x86_64.mono bin/godot.osx.opt.debug.arm64.mono -output bin/godot.osx.opt.debug.universal.mono
61+
#$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release_debug
62+
#lipo -create bin/godot.osx.opt.debug.x86_64.mono bin/godot.osx.opt.debug.arm64.mono -output bin/godot.osx.opt.debug.universal.mono
6363
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=x86_64 tools=no target=release
64-
$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release
65-
lipo -create bin/godot.osx.opt.x86_64.mono bin/godot.osx.opt.arm64.mono -output bin/godot.osx.opt.universal.mono
64+
#$SCONS platform=osx $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release
65+
#lipo -create bin/godot.osx.opt.x86_64.mono bin/godot.osx.opt.arm64.mono -output bin/godot.osx.opt.universal.mono
6666

6767
mkdir -p /root/out/templates-mono
6868
cp -rvp bin/* /root/out/templates-mono

build-release.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,11 @@ if [ "${build_mono}" == "1" ]; then
330330
## OSX (Mono) ##
331331

332332
# Editor
333-
binname="${godot_basename}_mono_osx.universal"
333+
binname="${godot_basename}_mono_osx.64"
334334
rm -rf Godot_mono.app
335335
cp -r git/misc/dist/osx_tools.app Godot_mono.app
336336
mkdir -p Godot_mono.app/Contents/MacOS
337-
cp out/macosx/tools-mono/godot.osx.opt.tools.universal.mono Godot_mono.app/Contents/MacOS/Godot
337+
cp out/macosx/tools-mono/godot.osx.opt.tools.x86_64.mono Godot_mono.app/Contents/MacOS/Godot
338338
mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}
339339
mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}/GodotSharp
340340
mkdir -p Godot_mono.app/Contents/{Frameworks,Resources}/GodotSharp/Mono
@@ -352,9 +352,9 @@ if [ "${build_mono}" == "1" ]; then
352352
cp -r git/misc/dist/osx_template.app .
353353
mkdir -p osx_template.app/Contents/MacOS
354354

355-
cp out/macosx/templates-mono/godot.osx.opt.debug.universal.mono osx_template.app/Contents/MacOS/godot_osx_debug.64
356-
cp out/macosx/templates-mono/godot.osx.opt.universal.mono osx_template.app/Contents/MacOS/godot_osx_release.64
357-
cp -rp out/macosx/templates-mono/data.mono.osx.universal.* osx_template.app/Contents/MacOS/
355+
cp out/macosx/templates-mono/godot.osx.opt.debug.x86_64.mono osx_template.app/Contents/MacOS/godot_osx_debug.64
356+
cp out/macosx/templates-mono/godot.osx.opt.x86_64.mono osx_template.app/Contents/MacOS/godot_osx_release.64
357+
cp -rp out/macosx/templates-mono/data.mono.osx.64.* osx_template.app/Contents/MacOS/
358358
chmod +x osx_template.app/Contents/MacOS/godot_osx*
359359
zip -q -9 -r "${templatesdir_mono}/osx.zip" osx_template.app
360360
rm -rf osx_template.app

0 commit comments

Comments
 (0)