Skip to content

Commit 6d25f64

Browse files
akien-mgaakien-mga
authored
Merge pull request #72 from godotengine/unify-target-tools
2 parents 872c9bf + f95a426 commit 6d25f64

File tree

8 files changed

+149
-149
lines changed

8 files changed

+149
-149
lines changed

‎build-android/build.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ tar xf /root/godot.tar.gz --strip-components=1
1919
if [ "${CLASSICAL}" == "1" ]; then
2020
echo "Starting classical build for Android..."
2121

22-
$SCONS platform=android arch=arm32 $OPTIONS tools=yes target=release_debug
23-
$SCONS platform=android arch=arm64 $OPTIONS tools=yes target=release_debug
24-
$SCONS platform=android arch=x86_32 $OPTIONS tools=yes target=release_debug
25-
$SCONS platform=android arch=x86_64 $OPTIONS tools=yes target=release_debug
22+
$SCONS platform=android arch=arm32 $OPTIONS target=editor
23+
$SCONS platform=android arch=arm64 $OPTIONS target=editor
24+
$SCONS platform=android arch=x86_32 $OPTIONS target=editor
25+
$SCONS platform=android arch=x86_64 $OPTIONS target=editor
2626

2727
pushd platform/android/java
2828
./gradlew generateGodotEditor
@@ -31,17 +31,17 @@ if [ "${CLASSICAL}" == "1" ]; then
3131
mkdir -p /root/out/tools
3232
cp bin/android_editor.apk /root/out/tools/
3333

34-
$SCONS platform=android arch=arm32 $OPTIONS tools=no target=release_debug
35-
$SCONS platform=android arch=arm32 $OPTIONS tools=no target=release
34+
$SCONS platform=android arch=arm32 $OPTIONS target=template_debug
35+
$SCONS platform=android arch=arm32 $OPTIONS target=template_release
3636

37-
$SCONS platform=android arch=arm64 $OPTIONS tools=no target=release_debug
38-
$SCONS platform=android arch=arm64 $OPTIONS tools=no target=release
37+
$SCONS platform=android arch=arm64 $OPTIONS target=template_debug
38+
$SCONS platform=android arch=arm64 $OPTIONS target=template_release
3939

40-
$SCONS platform=android arch=x86_32 $OPTIONS tools=no target=release_debug
41-
$SCONS platform=android arch=x86_32 $OPTIONS tools=no target=release
40+
$SCONS platform=android arch=x86_32 $OPTIONS target=template_debug
41+
$SCONS platform=android arch=x86_32 $OPTIONS target=template_release
4242

43-
$SCONS platform=android arch=x86_64 $OPTIONS tools=no target=release_debug
44-
$SCONS platform=android arch=x86_64 $OPTIONS tools=no target=release
43+
$SCONS platform=android arch=x86_64 $OPTIONS target=template_debug
44+
$SCONS platform=android arch=x86_64 $OPTIONS target=template_release
4545

4646
pushd platform/android/java
4747
./gradlew generateGodotTemplates
@@ -51,7 +51,7 @@ if [ "${CLASSICAL}" == "1" ]; then
5151
cp bin/android_source.zip /root/out/templates/
5252
cp bin/android_debug.apk /root/out/templates/
5353
cp bin/android_release.apk /root/out/templates/
54-
cp bin/godot-lib.release.aar /root/out/templates/
54+
cp bin/godot-lib.template_release.aar /root/out/templates/
5555
fi
5656

5757
# Mono
@@ -63,17 +63,17 @@ if false; then
6363

6464
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
6565

66-
$SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
67-
$SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO tools=no target=release
66+
$SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
67+
$SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
6868

69-
$SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
70-
$SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO tools=no target=release
69+
$SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
70+
$SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
7171

72-
$SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
73-
$SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release
72+
$SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
73+
$SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
7474

75-
$SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
76-
$SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release
75+
$SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
76+
$SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
7777

7878
pushd platform/android/java
7979
./gradlew generateGodotTemplates

‎build-ios/build.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ if [ "${CLASSICAL}" == "1" ]; then
2525
echo "Starting classical build for iOS..."
2626

2727
# arm64 device
28-
$SCONS platform=ios $OPTIONS arch=arm64 tools=no ios_simulator=no target=release_debug \
28+
$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_debug \
2929
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
30-
$SCONS platform=ios $OPTIONS arch=arm64 tools=no ios_simulator=no target=release \
30+
$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
3131
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
3232

3333
# arm64 simulator
3434
# Disabled for now as it doesn't work with cctools-port and current LLVM.
3535
# See https://github.com/godotengine/build-containers/pull/85.
36-
#$SCONS platform=ios $OPTIONS arch=arm64 tools=no ios_simulator=yes target=release_debug \
36+
#$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
3737
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
38-
#$SCONS platform=ios $OPTIONS arch=arm64 tools=no ios_simulator=no target=release \
38+
#$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
3939
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
4040

4141
# x86_64 simulator
42-
$SCONS platform=ios $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release_debug \
42+
$SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
4343
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
44-
$SCONS platform=ios $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release \
44+
$SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_release \
4545
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
4646

4747
mkdir -p /root/out/templates
48-
cp bin/libgodot.ios.opt.arm64.a /root/out/templates/libgodot.ios.a
49-
cp bin/libgodot.ios.opt.debug.arm64.a /root/out/templates/libgodot.ios.debug.a
50-
#$IOS_LIPO -create bin/libgodot.ios.opt.arm64.simulator.a bin/libgodot.ios.opt.x86_64.simulator.a -output /root/out/templates/libgodot.ios.simulator.a
51-
#$IOS_LIPO -create bin/libgodot.ios.opt.debug.arm64.simulator.a bin/libgodot.ios.opt.debug.x86_64.simulator.a -output /root/out/templates/libgodot.ios.debug.simulator.a
52-
cp bin/libgodot.ios.opt.x86_64.simulator.a /root/out/templates/libgodot.ios.simulator.a
53-
cp bin/libgodot.ios.opt.debug.x86_64.simulator.a /root/out/templates/libgodot.ios.debug.simulator.a
48+
cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
49+
cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates/libgodot.ios.debug.a
50+
#$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates/libgodot.ios.simulator.a
51+
#$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates/libgodot.ios.debug.simulator.a
52+
cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates/libgodot.ios.simulator.a
53+
cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates/libgodot.ios.debug.simulator.a
5454
fi
5555

5656
# Mono
@@ -63,33 +63,33 @@ if false; then
6363
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
6464

6565
# arm64 device
66-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no tools=no target=release_debug \
66+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_debug \
6767
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
68-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no tools=no target=release \
68+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_release \
6969
IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
7070

7171
# arm64 simulator
7272
# Disabled for now as it doesn't work with cctools-port and current LLVM.
7373
# See https://github.com/godotengine/build-containers/pull/85.
74-
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes tools=no target=release_debug \
74+
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
7575
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
76-
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes tools=no target=release \
76+
#$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_release \
7777
# IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
7878

7979
# x86_64 simulator
80-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes tools=no target=release_debug \
80+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
8181
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
82-
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes tools=no target=release \
82+
$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_release \
8383
IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
8484

8585
mkdir -p /root/out/templates-mono
8686

87-
cp bin/libgodot.ios.opt.arm64.a /root/out/templates-mono/libgodot.ios.a
88-
cp bin/libgodot.ios.opt.debug.arm64.a /root/out/templates-mono/libgodot.ios.debug.a
89-
#$IOS_LIPO -create bin/libgodot.ios.opt.arm64.simulator.a bin/libgodot.ios.opt.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.simulator.a
90-
#$IOS_LIPO -create bin/libgodot.ios.opt.debug.arm64.simulator.a bin/libgodot.ios.opt.debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
91-
cp bin/libgodot.ios.opt.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
92-
cp bin/libgodot.ios.opt.debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
87+
cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-mono/libgodot.ios.a
88+
cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-mono/libgodot.ios.debug.a
89+
#$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.simulator.a
90+
#$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
91+
cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
92+
cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
9393
fi
9494

9595
echo "iOS build successful"

‎build-linux/build.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ if [ "${CLASSICAL}" == "1" ]; then
2424

2525
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
2626

27-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=yes target=release_debug
27+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=editor
2828
mkdir -p /root/out/x86_64/tools
2929
cp -rvp bin/* /root/out/x86_64/tools
3030
rm -rf bin
3131

32-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=no target=release_debug
33-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=no target=release
32+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=template_debug
33+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS target=template_release
3434
mkdir -p /root/out/x86_64/templates
3535
cp -rvp bin/* /root/out/x86_64/templates
3636
rm -rf bin
3737

3838
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
3939

40-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=yes target=release_debug
40+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=editor
4141
mkdir -p /root/out/x86_32/tools
4242
cp -rvp bin/* /root/out/x86_32/tools
4343
rm -rf bin
4444

45-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=no target=release_debug
46-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=no target=release
45+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=template_debug
46+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=template_release
4747
mkdir -p /root/out/x86_32/templates
4848
cp -rvp bin/* /root/out/x86_32/templates
4949
rm -rf bin
@@ -59,28 +59,28 @@ if [ "${MONO}" == "1" ]; then
5959

6060
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
6161

62-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
62+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=editor
6363
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
6464
mkdir -p /root/out/x86_64/tools-mono
6565
cp -rvp bin/* /root/out/x86_64/tools-mono
6666
rm -rf bin
6767

68-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
69-
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=no target=release
68+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_debug
69+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO target=template_release
7070
mkdir -p /root/out/x86_64/templates-mono
7171
cp -rvp bin/* /root/out/x86_64/templates-mono
7272
rm -rf bin
7373

7474
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
7575

76-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug
76+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor
7777
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
7878
mkdir -p /root/out/x86_32/tools-mono
7979
cp -rvp bin/* /root/out/x86_32/tools-mono
8080
rm -rf bin
8181

82-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release_debug
83-
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO tools=no target=release
82+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_debug
83+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=template_release
8484
mkdir -p /root/out/x86_32/templates-mono
8585
cp -rvp bin/* /root/out/x86_32/templates-mono
8686
rm -rf bin

‎build-macos/build.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ tar xf /root/godot.tar.gz --strip-components=1
2020
if [ "${CLASSICAL}" == "1" ]; then
2121
echo "Starting classical build for macOS..."
2222

23-
$SCONS platform=macos $OPTIONS arch=x86_64 tools=yes target=release_debug
24-
$SCONS platform=macos $OPTIONS arch=arm64 tools=yes target=release_debug
25-
lipo -create bin/godot.macos.opt.tools.x86_64 bin/godot.macos.opt.tools.arm64 -output bin/godot.macos.opt.tools.universal
26-
$STRIP bin/godot.macos.opt.tools.universal
23+
$SCONS platform=macos $OPTIONS arch=x86_64 target=editor
24+
$SCONS platform=macos $OPTIONS arch=arm64 target=editor
25+
lipo -create bin/godot.macos.editor.x86_64 bin/godot.macos.editor.arm64 -output bin/godot.macos.editor.universal
26+
$STRIP bin/godot.macos.editor.universal
2727

2828
mkdir -p /root/out/tools
2929
cp -rvp bin/* /root/out/tools
3030
rm -rf bin
3131

32-
$SCONS platform=macos $OPTIONS arch=x86_64 tools=no target=release_debug
33-
$SCONS platform=macos $OPTIONS arch=arm64 tools=no target=release_debug
34-
lipo -create bin/godot.macos.opt.debug.x86_64 bin/godot.macos.opt.debug.arm64 -output bin/godot.macos.opt.debug.universal
35-
$STRIP bin/godot.macos.opt.debug.universal
36-
$SCONS platform=macos $OPTIONS arch=x86_64 tools=no target=release
37-
$SCONS platform=macos $OPTIONS arch=arm64 tools=no target=release
38-
lipo -create bin/godot.macos.opt.x86_64 bin/godot.macos.opt.arm64 -output bin/godot.macos.opt.universal
39-
$STRIP bin/godot.macos.opt.universal
32+
$SCONS platform=macos $OPTIONS arch=x86_64 target=template_debug
33+
$SCONS platform=macos $OPTIONS arch=arm64 target=template_debug
34+
lipo -create bin/godot.macos.template_debug.x86_64 bin/godot.macos.template_debug.arm64 -output bin/godot.macos.template_debug.universal
35+
$STRIP bin/godot.macos.template_debug.universal
36+
$SCONS platform=macos $OPTIONS arch=x86_64 target=template_release
37+
$SCONS platform=macos $OPTIONS arch=arm64 target=template_release
38+
lipo -create bin/godot.macos.template_release.x86_64 bin/godot.macos.template_release.arm64 -output bin/godot.macos.template_release.universal
39+
$STRIP bin/godot.macos.template_release.universal
4040

4141
mkdir -p /root/out/templates
4242
cp -rvp bin/* /root/out/templates
@@ -51,24 +51,24 @@ if [ "${MONO}" == "1" ]; then
5151
cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
5252
cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
5353

54-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 tools=yes target=release_debug
55-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 tools=yes target=release_debug
56-
lipo -create bin/godot.macos.opt.tools.x86_64.mono bin/godot.macos.opt.tools.arm64.mono -output bin/godot.macos.opt.tools.universal.mono
57-
$STRIP bin/godot.macos.opt.tools.universal.mono
54+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=editor
55+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=editor
56+
lipo -create bin/godot.macos.editor.x86_64.mono bin/godot.macos.editor.arm64.mono -output bin/godot.macos.editor.universal.mono
57+
$STRIP bin/godot.macos.editor.universal.mono
5858
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos
5959

6060
mkdir -p /root/out/tools-mono
6161
cp -rvp bin/* /root/out/tools-mono
6262
rm -rf bin
6363

64-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 tools=no target=release_debug
65-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release_debug
66-
lipo -create bin/godot.macos.opt.debug.x86_64.mono bin/godot.macos.opt.debug.arm64.mono -output bin/godot.macos.opt.debug.universal.mono
67-
$STRIP bin/godot.macos.opt.debug.universal.mono
68-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 tools=no target=release
69-
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 tools=no target=release
70-
lipo -create bin/godot.macos.opt.x86_64.mono bin/godot.macos.opt.arm64.mono -output bin/godot.macos.opt.universal.mono
71-
$STRIP bin/godot.macos.opt.universal.mono
64+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_debug
65+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug
66+
lipo -create bin/godot.macos.template_debug.x86_64.mono bin/godot.macos.template_debug.arm64.mono -output bin/godot.macos.template_debug.universal.mono
67+
$STRIP bin/godot.macos.template_debug.universal.mono
68+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_release
69+
$SCONS platform=macos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release
70+
lipo -create bin/godot.macos.template_release.x86_64.mono bin/godot.macos.template_release.arm64.mono -output bin/godot.macos.template_release.universal.mono
71+
$STRIP bin/godot.macos.template_release.universal.mono
7272

7373
mkdir -p /root/out/templates-mono
7474
cp -rvp bin/* /root/out/templates-mono

0 commit comments

Comments
 (0)