Skip to content

Commit f78e784

Browse files
author
Dennis Felsing
committed
Also fat build
1 parent 049b6f8 commit f78e784

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

release/build.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ build_macos ()
5656
PATH=${PATH:+$PATH:}/home/deen/git/osxcross/target/bin
5757
eval `osxcross-conf`
5858
export OSXCROSS_OSX_VERSION_MIN=10.9
59-
cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DVIDEORECORDER=ON -DDISCORD=OFF -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/darwin-$ARCH.toolchain -DCMAKE_OSX_SYSROOT=/home/deen/git/osxcross/target/SDK/MacOSX11.0.sdk/ $(echo $FLAGS) ../ddnet-source
60-
#cmake -DVERSION=$VERSION -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_BUILD_TYPE=Release -DVIDEORECORDER=ON -DDISCORD=OFF -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/darwin.toolchain -DCMAKE_OSX_SYSROOT=/home/deen/git/osxcross/target/SDK/MacOSX11.0.sdk/ $(echo $2) ../ddnet-source
61-
#cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DVIDEORECORDER=ON -DDISCORD=ON -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/darwin.toolchain -DCMAKE_OSX_SYSROOT=/home/deen/git/osxcross/target/SDK/MacOSX11.0.sdk/ $(echo $2) ../ddnet-source
62-
make -j2 package_default
59+
if [ "$ARCH" = "fat" ]; then
60+
cmake -DVERSION=$VERSION -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_BUILD_TYPE=Release -DVIDEORECORDER=ON -DDISCORD=OFF -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/darwin-arm64.toolchain -DCMAKE_OSX_SYSROOT=/home/deen/git/osxcross/target/SDK/MacOSX11.0.sdk/ $(echo $FLAGS) ../ddnet-source
61+
else
62+
cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DVIDEORECORDER=ON -DDISCORD=OFF -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/darwin-$ARCH.toolchain -DCMAKE_OSX_SYSROOT=/home/deen/git/osxcross/target/SDK/MacOSX11.0.sdk/ $(echo $FLAGS) ../ddnet-source
63+
fi
64+
make -j1 package_default
6365
}
6466

6567
build_macos_website ()
@@ -173,6 +175,7 @@ mv $LIBS_REPO_NAME-$LIBS_REPO_BRANCH ddnet-source/ddnet-libs
173175

174176
(build_macos_website x86_64; build_macos_steam x86_64) &> builds/mac_x86_64.log &
175177
(build_macos_website arm64; build_macos_steam arm64) &> builds/mac_arm64.log &
178+
(build_macos_website fat; build_macos_steam fat) &> builds/mac_fat.log &
176179

177180
build_linux x86_64 $BUILDDIR/debian6 &> builds/linux_x86_64.log &
178181
CFLAGS=-m32 LDFLAGS=-m32 build_linux x86 $BUILDDIR/debian6_x86 &> builds/linux_x86.log &

0 commit comments

Comments
 (0)