From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 25 Dec 2023 09:06:03 +0000 (+1000)
Subject: Autobuild libd0 for Linux
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25b539acb116e1bd6b8308602139f0a364c5a8e0;p=xonotic%2Fxonotic.git

Autobuild libd0 for Linux

We're already doing this for Windows.
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 4d7f78c9..a7849918 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -277,6 +277,28 @@ case "$cmd" in
 				;;
 		esac
 		;;
+	release-libs-compile)
+		release_common
+		arch=$1
+		makeflags=$2
+		host=$3
+		(
+			verbose cd "$d0/d0_blind_id"
+			verbose ./autogen.sh
+			verbose ./configure --enable-static --disable-shared \
+			                    --host="$host" \
+			                    --prefix="$d0/misc/builddeps/$arch/d0_blind_id"
+			verbose make clean
+			verbose make "$makeflags"
+			verbose make install
+		)
+		;;
+	release-libs-linux64)
+		release_common
+		verbose "$SELF" release-libs-compile linux64 \
+			'CC="gcc -m64 -flto=auto"' \
+			x86_64-pc-linux-gnu
+		;;
 	release-dlls-compile)
 		release_common
 		arch=$1
@@ -300,8 +322,9 @@ case "$cmd" in
 		release_common
 		verbose "$SELF" release-dlls-compile win64 /tmp/dlls Xonotic/bin64
 		;;
-	release-dlls)
+	release-libs)
 		release_common
+		verbose "$SELF" release-libs-linux64
 		verbose "$SELF" release-dlls-win32
 		verbose "$SELF" release-dlls-win64
 		verbose rm -rf /tmp/dlls
@@ -346,7 +369,7 @@ case "$cmd" in
 		#verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
 		#$good
 		verbose "$SELF" release-compile linux64 \
-			'CC="gcc -m64 -flto=auto -I../../../.deps/include -L../../../.deps/lib" DP_LINK_CRYPTO=shared LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_CRYPTO_RIJNDAEL=shared DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \
+			'CC="gcc -m64 -flto=auto -I../../../.deps/include -L../../../.deps/lib" DP_LINK_CRYPTO=static DP_LINK_CRYPTO_RIJNDAEL=static DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \
 			release 'darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
 	release-engine)
@@ -626,7 +649,7 @@ case "$cmd" in
 		release_common
 		verbose "$SELF" release-prepare
 		verbose "$SELF" release-maps
-		verbose "$SELF" release-dlls
+		verbose "$SELF" release-libs
 		verbose "$SELF" release-engine
 		verbose "$SELF" release-qc
 		verbose "$SELF" release-pack