Skip to content

Commit 0bcbc8f

Browse files
akien-mgaakien-mga
authored
Merge pull request #60 from aaronfranke/use-arch-btw
2 parents 83b71cb + d68cf1a commit 0bcbc8f

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

‎build-linux/build.sh

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

2727
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
2828

29-
$SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug
29+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=yes target=release_debug
3030
mkdir -p /root/out/x86_64/tools
3131
cp -rvp bin/* /root/out/x86_64/tools
3232
rm -rf bin
3333

34-
$SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug
35-
$SCONS platform=linuxbsd $OPTIONS tools=no target=release
34+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=no target=release_debug
35+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS tools=no target=release
3636
mkdir -p /root/out/x86_64/templates
3737
cp -rvp bin/* /root/out/x86_64/templates
3838
rm -rf bin
3939

4040
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
4141

42-
$SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug bits=32
42+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=yes target=release_debug
4343
mkdir -p /root/out/x86_32/tools
4444
cp -rvp bin/* /root/out/x86_32/tools
4545
rm -rf bin
4646

47-
$SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug bits=32
48-
$SCONS platform=linuxbsd $OPTIONS tools=no target=release bits=32
47+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=no target=release_debug
48+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS tools=no target=release
4949
mkdir -p /root/out/x86_32/templates
5050
cp -rvp bin/* /root/out/x86_32/templates
5151
rm -rf bin
@@ -63,27 +63,27 @@ if [ "${MONO}" == "1" ]; then
6363
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
6464
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
6565

66-
$SCONS platform=linuxbsd $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
66+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
6767
mkdir -p /root/out/x86_64/tools-mono
6868
cp -rvp bin/* /root/out/x86_64/tools-mono
6969
rm -rf bin
7070

71-
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug
72-
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release
71+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
72+
$SCONS platform=linuxbsd arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release
7373
mkdir -p /root/out/x86_64/templates-mono
7474
cp -rvp bin/* /root/out/x86_64/templates-mono
7575
rm -rf bin
7676

7777
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
7878
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
7979

80-
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
80+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
8181
mkdir -p /root/out/x86_32/tools-mono
8282
cp -rvp bin/* /root/out/x86_32/tools-mono
8383
rm -rf bin
8484

85-
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
86-
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release bits=32
85+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
86+
$SCONS platform=linuxbsd arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release
8787
mkdir -p /root/out/x86_32/templates-mono
8888
cp -rvp bin/* /root/out/x86_32/templates-mono
8989
rm -rf bin

‎build-release.sh

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -169,31 +169,31 @@ if [ "${build_classical}" == "1" ]; then
169169
## Linux (Classical) ##
170170

171171
# Editor
172-
binname="${godot_basename}_linux.64"
173-
cp out/linux/x86_64/tools/godot.linuxbsd.opt.tools.64 ${binname}
172+
binname="${godot_basename}_linux.x86_64"
173+
cp out/linux/x86_64/tools/godot.linuxbsd.opt.tools.x86_64 ${binname}
174174
strip ${binname}
175175
zip -q -9 "${reldir}/${binname}.zip" ${binname}
176176
rm ${binname}
177177

178-
binname="${godot_basename}_linux.32"
179-
cp out/linux/x86_32/tools/godot.linuxbsd.opt.tools.32 ${binname}
178+
binname="${godot_basename}_linux.x86_32"
179+
cp out/linux/x86_32/tools/godot.linuxbsd.opt.tools.x86_32 ${binname}
180180
strip ${binname}
181181
zip -q -9 "${reldir}/${binname}.zip" ${binname}
182182
rm ${binname}
183183

184184
# Templates
185-
cp out/linux/x86_64/templates/godot.linuxbsd.opt.64 ${templatesdir}/linux_release.x86_64
186-
cp out/linux/x86_64/templates/godot.linuxbsd.opt.debug.64 ${templatesdir}/linux_debug.x86_64
187-
cp out/linux/x86_32/templates/godot.linuxbsd.opt.32 ${templatesdir}/linux_release.x86_32
188-
cp out/linux/x86_32/templates/godot.linuxbsd.opt.debug.32 ${templatesdir}/linux_debug.x86_32
185+
cp out/linux/x86_64/templates/godot.linuxbsd.opt.x86_64 ${templatesdir}/linux_release.x86_64
186+
cp out/linux/x86_64/templates/godot.linuxbsd.opt.debug.x86_64 ${templatesdir}/linux_debug.x86_64
187+
cp out/linux/x86_32/templates/godot.linuxbsd.opt.x86_32 ${templatesdir}/linux_release.x86_32
188+
cp out/linux/x86_32/templates/godot.linuxbsd.opt.debug.x86_32 ${templatesdir}/linux_debug.x86_32
189189
strip ${templatesdir}/linux*
190190

191191
## Windows (Classical) ##
192192

193193
# Editor
194194
binname="${godot_basename}_win64.exe"
195195
batname="${godot_basename}_win64_console.cmd"
196-
cp out/windows/x86_64/tools/godot.windows.opt.tools.64.exe ${binname}
196+
cp out/windows/x86_64/tools/godot.windows.opt.tools.x86_64.exe ${binname}
197197
strip ${binname}
198198
sign_windows ${binname}
199199
echo "@echo off" > ${batname}
@@ -204,7 +204,7 @@ if [ "${build_classical}" == "1" ]; then
204204

205205
binname="${godot_basename}_win32.exe"
206206
batname="${godot_basename}_win32_console.cmd"
207-
cp out/windows/x86_32/tools/godot.windows.opt.tools.32.exe ${binname}
207+
cp out/windows/x86_32/tools/godot.windows.opt.tools.x86_32.exe ${binname}
208208
strip ${binname}
209209
sign_windows ${binname}
210210
echo "@echo off" > ${batname}
@@ -214,10 +214,10 @@ if [ "${build_classical}" == "1" ]; then
214214
rm ${binname} ${batname}
215215

216216
# Templates
217-
cp out/windows/x86_64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_release_x86_64.exe
218-
cp out/windows/x86_64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_debug_x86_64.exe
219-
cp out/windows/x86_32/templates/godot.windows.opt.32.exe ${templatesdir}/windows_release_x86_32.exe
220-
cp out/windows/x86_32/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_debug_x86_32.exe
217+
cp out/windows/x86_64/templates/godot.windows.opt.x86_64.exe ${templatesdir}/windows_release_x86_64.exe
218+
cp out/windows/x86_64/templates/godot.windows.opt.debug.x86_64.exe ${templatesdir}/windows_debug_x86_64.exe
219+
cp out/windows/x86_32/templates/godot.windows.opt.x86_32.exe ${templatesdir}/windows_release_x86_32.exe
220+
cp out/windows/x86_32/templates/godot.windows.opt.debug.x86_32.exe ${templatesdir}/windows_debug_x86_32.exe
221221
strip ${templatesdir}/windows*.exe
222222

223223
## macOS (Classical) ##
@@ -353,30 +353,30 @@ if [ "${build_mono}" == "1" ]; then
353353

354354
# Editor
355355
binbasename="${godot_basename}_mono_linux"
356-
mkdir -p ${binbasename}_64
357-
cp out/linux/x86_64/tools-mono/godot.linuxbsd.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
358-
strip ${binbasename}_64/${binbasename}.64
359-
cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_64/
360-
cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
361-
zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
362-
rm -rf ${binbasename}_64
356+
mkdir -p ${binbasename}_x86_64
357+
cp out/linux/x86_64/tools-mono/godot.linuxbsd.opt.tools.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64
358+
strip ${binbasename}_x86_64/${binbasename}.x86_64
359+
cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/
360+
cp -rp out/aot-compilers ${binbasename}_x86_64/GodotSharp/Tools/
361+
zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64
362+
rm -rf ${binbasename}_x86_64
363363

364364
binbasename="${godot_basename}_mono_linux"
365-
mkdir -p ${binbasename}_32
366-
cp out/linux/x86_32/tools-mono/godot.linuxbsd.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
367-
strip ${binbasename}_32/${binbasename}.32
368-
cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_32/
369-
cp -rp out/aot-compilers ${binbasename}_32/GodotSharp/Tools/
370-
zip -r -q -9 "${reldir_mono}/${binbasename}_32.zip" ${binbasename}_32
371-
rm -rf ${binbasename}_32
365+
mkdir -p ${binbasename}_x86_32
366+
cp out/linux/x86_32/tools-mono/godot.linuxbsd.opt.tools.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32
367+
strip ${binbasename}_x86_32/${binbasename}.x86_32
368+
cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/
369+
cp -rp out/aot-compilers ${binbasename}_x86_32/GodotSharp/Tools/
370+
zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32
371+
rm -rf ${binbasename}_x86_32
372372

373373
# Templates
374-
cp -rp out/linux/x86_64/templates-mono/data.mono.linuxbsd.64.* ${templatesdir_mono}/
375-
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.debug.64.mono ${templatesdir_mono}/linux_debug.x86_64
376-
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.64.mono ${templatesdir_mono}/linux_release.x86_64
377-
cp -rp out/linux/x86_32/templates-mono/data.mono.linuxbsd.32.* ${templatesdir_mono}/
378-
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.debug.32.mono ${templatesdir_mono}/linux_debug.x86_32
379-
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.32.mono ${templatesdir_mono}/linux_release.x86_32
374+
cp -rp out/linux/x86_64/templates-mono/data.mono.linuxbsd.x86_64.* ${templatesdir_mono}/
375+
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64
376+
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.x86_64.mono ${templatesdir_mono}/linux_release.x86_64
377+
cp -rp out/linux/x86_32/templates-mono/data.mono.linuxbsd.x86_32.* ${templatesdir_mono}/
378+
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32
379+
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.x86_32.mono ${templatesdir_mono}/linux_release.x86_32
380380
strip ${templatesdir_mono}/linux*
381381

382382
mkdir -p ${templatesdir_mono}/bcl
@@ -388,7 +388,7 @@ if [ "${build_mono}" == "1" ]; then
388388
binname="${godot_basename}_mono_win64"
389389
batname="${godot_basename}_mono_win64_console.cmd"
390390
mkdir -p ${binname}
391-
cp out/windows/x86_64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
391+
cp out/windows/x86_64/tools-mono/godot.windows.opt.tools.x86_64.mono.exe ${binname}/${binname}.exe
392392
strip ${binname}/${binname}.exe
393393
sign_windows ${binname}/${binname}.exe
394394
cp -rp out/windows/x86_64/tools-mono/GodotSharp ${binname}/
@@ -403,7 +403,7 @@ if [ "${build_mono}" == "1" ]; then
403403
binname="${godot_basename}_mono_win32"
404404
batname="${godot_basename}_mono_win32_console.cmd"
405405
mkdir -p ${binname}
406-
cp out/windows/x86_32/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
406+
cp out/windows/x86_32/tools-mono/godot.windows.opt.tools.x86_32.mono.exe ${binname}/${binname}.exe
407407
strip ${binname}/${binname}.exe
408408
sign_windows ${binname}/${binname}.exe
409409
cp -rp out/windows/x86_32/tools-mono/GodotSharp ${binname}/
@@ -416,12 +416,12 @@ if [ "${build_mono}" == "1" ]; then
416416
rm -rf ${binname}
417417

418418
# Templates
419-
cp -rp out/windows/x86_64/templates-mono/data.mono.windows.64.* ${templatesdir_mono}/
420-
cp out/windows/x86_64/templates-mono/godot.windows.opt.debug.64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe
421-
cp out/windows/x86_64/templates-mono/godot.windows.opt.64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe
422-
cp -rp out/windows/x86_32/templates-mono/data.mono.windows.32.* ${templatesdir_mono}/
423-
cp out/windows/x86_32/templates-mono/godot.windows.opt.debug.32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe
424-
cp out/windows/x86_32/templates-mono/godot.windows.opt.32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe
419+
cp -rp out/windows/x86_64/templates-mono/data.mono.windows.x86_64.* ${templatesdir_mono}/
420+
cp out/windows/x86_64/templates-mono/godot.windows.opt.debug.x86_64.mono.exe ${templatesdir_mono}/windows_debug_x86_64.exe
421+
cp out/windows/x86_64/templates-mono/godot.windows.opt.x86_64.mono.exe ${templatesdir_mono}/windows_release_x86_64.exe
422+
cp -rp out/windows/x86_32/templates-mono/data.mono.windows.x86_32.* ${templatesdir_mono}/
423+
cp out/windows/x86_32/templates-mono/godot.windows.opt.debug.x86_32.mono.exe ${templatesdir_mono}/windows_debug_x86_32.exe
424+
cp out/windows/x86_32/templates-mono/godot.windows.opt.x86_32.mono.exe ${templatesdir_mono}/windows_release_x86_32.exe
425425
strip ${templatesdir_mono}/windows*.exe
426426

427427
mkdir -p ${templatesdir_mono}/bcl

‎build-windows/build.sh

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

24-
$SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
24+
$SCONS platform=windows arch=x86_64 $OPTIONS tools=yes target=release_debug
2525
mkdir -p /root/out/x86_64/tools
2626
cp -rvp bin/* /root/out/x86_64/tools
2727
rm -rf bin
2828

29-
$SCONS platform=windows bits=64 $OPTIONS tools=no target=release_debug
30-
$SCONS platform=windows bits=64 $OPTIONS tools=no target=release
29+
$SCONS platform=windows arch=x86_64 $OPTIONS tools=no target=release_debug
30+
$SCONS platform=windows arch=x86_64 $OPTIONS tools=no target=release
3131
mkdir -p /root/out/x86_64/templates
3232
cp -rvp bin/* /root/out/x86_64/templates
3333
rm -rf bin
3434

35-
$SCONS platform=windows bits=32 $OPTIONS tools=yes target=release_debug
35+
$SCONS platform=windows arch=x86_32 $OPTIONS tools=yes target=release_debug
3636
mkdir -p /root/out/x86_32/tools
3737
cp -rvp bin/* /root/out/x86_32/tools
3838
rm -rf bin
3939

40-
$SCONS platform=windows bits=32 $OPTIONS tools=no target=release_debug
41-
$SCONS platform=windows bits=32 $OPTIONS tools=no target=release
40+
$SCONS platform=windows arch=x86_32 $OPTIONS tools=no target=release_debug
41+
$SCONS platform=windows arch=x86_32 $OPTIONS tools=no target=release
4242
mkdir -p /root/out/x86_32/templates
4343
cp -rvp bin/* /root/out/x86_32/templates
4444
rm -rf bin
@@ -55,26 +55,26 @@ if [ "${MONO}" == "1" ]; then
5555

5656
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
5757

58-
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
58+
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
5959
mkdir -p /root/out/x86_64/tools-mono
6060
cp -rvp bin/* /root/out/x86_64/tools-mono
6161
rm -rf bin
6262

63-
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
64-
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=no target=release
63+
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
64+
$SCONS platform=windows arch=x86_64 $OPTIONS_MONO_PREFIX tools=no target=release
6565
mkdir -p /root/out/x86_64/templates-mono
6666
cp -rvp bin/* /root/out/x86_64/templates-mono
6767
rm -rf bin
6868

6969
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
7070

71-
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
71+
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
7272
mkdir -p /root/out/x86_32/tools-mono
7373
cp -rvp bin/* /root/out/x86_32/tools-mono
7474
rm -rf bin
7575

76-
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
77-
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=no target=release
76+
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
77+
$SCONS platform=windows arch=x86_32 $OPTIONS_MONO_PREFIX tools=no target=release
7878
mkdir -p /root/out/x86_32/templates-mono
7979
cp -rvp bin/* /root/out/x86_32/templates-mono
8080
rm -rf bin

0 commit comments

Comments
 (0)