X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=65b1ecbe9cb2f346f727819eff1a9e21b831075c;hb=233c85117087d5c5d497fb06eab62108da2c8af3;hp=6995ad1b6c96d053aac6f706597dc1bd23fc628a;hpb=9d330c09ab63900342f1977c37a83753e730b794;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 6995ad1b..65b1ecbe 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,19 +4,22 @@ case "$cmd" in
 		misc/tools/xonotic-map-compiler-autobuild download
 		;;
 	compile-map)
-		mapfile="data/xonotic-maps.pk3dir/maps/$1.map"
-		if [ ! -f "netradiant/install/q3map2.x86" ] ; then
-			msg "q3map2 needed! Building netradiant..."
-			cd netradiant
-			make
-			cd ../
+		if [ $# -eq 0 ] ; then
+			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
+			msg "For example: ./all compile-map dance xoylent"
 		fi
-		if [ ! -f "$mapfile" ] ; then
-			msg "ERROR, $mapfile not found!"
-			exit 2
-		else
-			time misc/tools/xonotic-map-compiler_from_all $mapfile
+		if ! [ -f "netradiant/install/q3map2" ] ; then
+			msg "q3map2 needed! Building netradiant..."
+			make -C netradiant install/q3map2
 		fi
+		for mapfile in "$@"; do
+			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
+			if [ ! -f "$mapfile" ] ; then
+				msg "ERROR, $mapfile not found!"
+			else
+				time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
+			fi
+		done
 		;;
 	compile)
 		cleand0=false
@@ -133,10 +136,18 @@ case "$cmd" in
 				MAKEFLAGS=-j$ncpus
 			fi
 			if [ -n "$WE_HATE_OUR_USERS" ]; then
-				MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw LIB_JPEG= CFLAGS_LIBJPEG="
+				MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
 			fi
 		fi
 
+		# win32: don't rely on jpeg includes
+		if [ -n "$WE_HATE_OUR_USERS" ]; then
+			MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
+		fi
+
+		# ODE is optional
+		MAKEFLAGS="$MAKEFLAGS LIB_ODE= CFLAGS_ODE=-DUSEODE"
+
 		# workaround ARM issue in DP's makefile.inc
 		case `uname -m` in
 			x86_64|*86)
@@ -189,13 +200,13 @@ case "$cmd" in
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
-								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_GMP_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared CFLAGS_CRYPTO=-I../../../../misc/builddeps/dp.linux32/include LIB_CRYPTO=../../../../misc/builddeps/dp.linux64/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux64/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux64/lib/libd0_rijndael.a"
 								;;
 							*86)
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
-								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_GMP_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared CFLAGS_CRYPTO=-I../../../../misc/builddeps/dp.linux32/include LIB_CRYPTO=../../../../misc/builddeps/dp.linux32/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux32/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux32/lib/libd0_rijndael.a"
 								;;
 							*)
 								compiled0=true
@@ -339,6 +350,7 @@ case "$cmd" in
 		$ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
 		$ECHO "  $SELF update-maps"
 		$ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+		$ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
 		handled=false
 		;;
 	*)