diff --git a/build-linux/build.sh b/build-linux/build.sh index a52cd19..6f436d8 100755 --- a/build-linux/build.sh +++ b/build-linux/build.sh @@ -14,9 +14,6 @@ mkdir godot cd godot tar xf /root/godot.tar.gz --strip-components=1 -# pkg-config wrongly points to lib instead of lib64 for arch-dependent header. -sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g" - # Classical if [ "${CLASSICAL}" == "1" ]; then @@ -35,7 +32,7 @@ if [ "${CLASSICAL}" == "1" ]; then cp -rvp bin/* /root/out/x86_64/templates rm -rf bin - export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}" + export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}" $SCONS platform=linuxbsd arch=x86_32 $OPTIONS target=editor mkdir -p /root/out/x86_32/tools @@ -47,6 +44,32 @@ if [ "${CLASSICAL}" == "1" ]; then mkdir -p /root/out/x86_32/templates cp -rvp bin/* /root/out/x86_32/templates rm -rf bin + + export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}" + + $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=editor + mkdir -p /root/out/arm64/tools + cp -rvp bin/* /root/out/arm64/tools + rm -rf bin + + $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_debug + $SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_release + mkdir -p /root/out/arm64/templates + cp -rvp bin/* /root/out/arm64/templates + rm -rf bin + + export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}" + + $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=editor + mkdir -p /root/out/arm32/tools + cp -rvp bin/* /root/out/arm32/tools + rm -rf bin + + $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_debug + $SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_release + mkdir -p /root/out/arm32/templates + cp -rvp bin/* /root/out/arm32/templates + rm -rf bin fi # Mono @@ -71,7 +94,7 @@ if [ "${MONO}" == "1" ]; then cp -rvp bin/* /root/out/x86_64/templates-mono rm -rf bin - export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}" + export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}" $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_MONO target=editor ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd @@ -84,6 +107,34 @@ if [ "${MONO}" == "1" ]; then mkdir -p /root/out/x86_32/templates-mono cp -rvp bin/* /root/out/x86_32/templates-mono rm -rf bin + + export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}" + + $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=editor + ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd + mkdir -p /root/out/arm64/tools-mono + cp -rvp bin/* /root/out/arm64/tools-mono + rm -rf bin + + $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug + $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release + mkdir -p /root/out/arm64/templates-mono + cp -rvp bin/* /root/out/arm64/templates-mono + rm -rf bin + + export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}" + + $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=editor + ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd + mkdir -p /root/out/arm32/tools-mono + cp -rvp bin/* /root/out/arm32/tools-mono + rm -rf bin + + $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug + $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release + mkdir -p /root/out/arm32/templates-mono + cp -rvp bin/* /root/out/arm32/templates-mono + rm -rf bin fi echo "Linux build successful" diff --git a/build-mono-glue/build.sh b/build-mono-glue/build.sh index f7a8b9a..9c983ad 100755 --- a/build-mono-glue/build.sh +++ b/build-mono-glue/build.sh @@ -15,16 +15,12 @@ mkdir godot cd godot tar xf ../godot.tar.gz --strip-components=1 -# pkg-config wrongly points to lib instead of lib64 for arch-dependent header. -sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g" - # Mono if [ "${MONO}" == "1" ]; then echo "Building and generating Mono glue..." dotnet --info - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/ ${SCONS} platform=linuxbsd ${OPTIONS} target=editor module_mono_enabled=yes diff --git a/build-release.sh b/build-release.sh index bd9e0e4..cbd2791 100755 --- a/build-release.sh +++ b/build-release.sh @@ -240,13 +240,21 @@ if [ "${build_classical}" == "1" ]; then # Editor binname="${godot_basename}_linux.x86_64" cp out/linux/x86_64/tools/godot.linuxbsd.editor.x86_64 ${binname} - strip ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} binname="${godot_basename}_linux.x86_32" cp out/linux/x86_32/tools/godot.linuxbsd.editor.x86_32 ${binname} - strip ${binname} + zip -q -9 "${reldir}/${binname}.zip" ${binname} + rm ${binname} + + binname="${godot_basename}_linux.arm64" + cp out/linux/arm64/tools/godot.linuxbsd.editor.arm64 ${binname} + zip -q -9 "${reldir}/${binname}.zip" ${binname} + rm ${binname} + + binname="${godot_basename}_linux.arm32" + cp out/linux/arm32/tools/godot.linuxbsd.editor.arm32 ${binname} zip -q -9 "${reldir}/${binname}.zip" ${binname} rm ${binname} @@ -255,7 +263,10 @@ if [ "${build_classical}" == "1" ]; then cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64 cp out/linux/x86_32/templates/godot.linuxbsd.template_release.x86_32 ${templatesdir}/linux_release.x86_32 cp out/linux/x86_32/templates/godot.linuxbsd.template_debug.x86_32 ${templatesdir}/linux_debug.x86_32 - strip ${templatesdir}/linux* + cp out/linux/arm64/templates/godot.linuxbsd.template_release.arm64 ${templatesdir}/linux_release.arm64 + cp out/linux/arm64/templates/godot.linuxbsd.template_debug.arm64 ${templatesdir}/linux_debug.arm64 + cp out/linux/arm32/templates/godot.linuxbsd.template_release.arm32 ${templatesdir}/linux_release.arm32 + cp out/linux/arm32/templates/godot.linuxbsd.template_debug.arm32 ${templatesdir}/linux_debug.arm32 ## Windows (Classical) ## @@ -390,7 +401,6 @@ if [ "${build_mono}" == "1" ]; then binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_x86_64 cp out/linux/x86_64/tools-mono/godot.linuxbsd.editor.x86_64.mono ${binbasename}_x86_64/${binbasename}.x86_64 - strip ${binbasename}_x86_64/${binbasename}.x86_64 cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_x86_64/ zip -r -q -9 "${reldir_mono}/${binbasename}_x86_64.zip" ${binbasename}_x86_64 rm -rf ${binbasename}_x86_64 @@ -398,17 +408,33 @@ if [ "${build_mono}" == "1" ]; then binbasename="${godot_basename}_mono_linux" mkdir -p ${binbasename}_x86_32 cp out/linux/x86_32/tools-mono/godot.linuxbsd.editor.x86_32.mono ${binbasename}_x86_32/${binbasename}.x86_32 - strip ${binbasename}_x86_32/${binbasename}.x86_32 cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_x86_32/ zip -r -q -9 "${reldir_mono}/${binbasename}_x86_32.zip" ${binbasename}_x86_32 rm -rf ${binbasename}_x86_32 + binbasename="${godot_basename}_mono_linux" + mkdir -p ${binbasename}_arm64 + cp out/linux/arm64/tools-mono/godot.linuxbsd.editor.arm64.mono ${binbasename}_arm64/${binbasename}.arm64 + cp -rp out/linux/arm64/tools-mono/GodotSharp/ ${binbasename}_arm64/ + zip -r -q -9 "${reldir_mono}/${binbasename}_arm64.zip" ${binbasename}_arm64 + rm -rf ${binbasename}_arm64 + + binbasename="${godot_basename}_mono_linux" + mkdir -p ${binbasename}_arm32 + cp out/linux/arm32/tools-mono/godot.linuxbsd.editor.arm32.mono ${binbasename}_arm32/${binbasename}.arm32 + cp -rp out/linux/arm32/tools-mono/GodotSharp/ ${binbasename}_arm32/ + zip -r -q -9 "${reldir_mono}/${binbasename}_arm32.zip" ${binbasename}_arm32 + rm -rf ${binbasename}_arm32 + # Templates cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64 cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64 cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_debug.x86_32.mono ${templatesdir_mono}/linux_debug.x86_32 cp out/linux/x86_32/templates-mono/godot.linuxbsd.template_release.x86_32.mono ${templatesdir_mono}/linux_release.x86_32 - strip ${templatesdir_mono}/linux* + cp out/linux/arm64/templates-mono/godot.linuxbsd.template_debug.arm64.mono ${templatesdir_mono}/linux_debug.arm64 + cp out/linux/arm64/templates-mono/godot.linuxbsd.template_release.arm64.mono ${templatesdir_mono}/linux_release.arm64 + cp out/linux/arm32/templates-mono/godot.linuxbsd.template_debug.arm32.mono ${templatesdir_mono}/linux_debug.arm32 + cp out/linux/arm32/templates-mono/godot.linuxbsd.template_release.arm32.mono ${templatesdir_mono}/linux_release.arm32 ## Windows (Mono) ##