X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=f24a051229f249b9e4c2c9ecfa38fb0de2d2bd04;hp=93c198406ce751afc1cb8cf0d982b20990ad8571;hb=35d70b5ce898799d88ae9a44311d212899dd1390;hpb=0fd1c72025094bb5fee7409ce9251e0ccb435a9a

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 93c19840..f24a0512 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,22 +4,20 @@ case "$cmd" in
 		misc/tools/xonotic-map-compiler-autobuild download
 		;;
 	compile-map)
-		if [ -n "$1" ] ; then
+		if [ $# -eq 0 ] ; then
 			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 			msg "For example: ./all compile-map dance xoylent"
 		fi
-		if [ ! -f "netradiant/install/q3map2.x86" ] ; then
+		if ! [ -f "netradiant/install/q3map2" ] ; then
 			msg "q3map2 needed! Building netradiant..."
-			cd netradiant
-			make
-			cd ../
+			make -C netradiant BUILD=native install/q3map2
 		fi
-		for mapfile in $@ ; do
-				mapfile="data/xonotic-maps.pk3dir/maps/$1.map"
+		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_from_all $mapfile
+				verbose measure_time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
 			fi
 		done
 		;;
@@ -107,6 +105,9 @@ case "$cmd" in
 				case "$X" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
+						if [ -n "$WE_HATE_OUR_USERS" ]; then
+							export PATH="$PATH:$d0/misc/builddeps/win32/sdl/bin"
+						fi
 						;;
 					agl)
 						TARGETS="$TARGETS cl-$debug"
@@ -138,10 +139,15 @@ 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
+
 		# workaround ARM issue in DP's makefile.inc
 		case `uname -m` in
 			x86_64|*86)
@@ -191,16 +197,24 @@ case "$cmd" in
 					Linux)
 						case `uname -m` in
 							x86_64)
-								#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/"
+								# No cp commands, we want to use static linking instead.
+								export CC="$CC -I../../../../misc/builddeps/linux64/d0_blind_id/include"
+								export CC="$CC -L../../../../misc/builddeps/linux64/d0_blind_id/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/d0_blind_id/lib"
+								export CC="$CC -I../../../../misc/builddeps/linux64/gmp/include"
+								export CC="$CC -L../../../../misc/builddeps/linux64/gmp/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/gmp/lib"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux64/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux64/d0_blind_id/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/"
+								# No cp commands, we want to use static linking instead.
+								export CC="$CC -I../../../../misc/builddeps/linux32/d0_blind_id/include"
+								export CC="$CC -L../../../../misc/builddeps/linux32/d0_blind_id/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/d0_blind_id/lib"
+								export CC="$CC -I../../../../misc/builddeps/linux32/gmp/include"
+								export CC="$CC -L../../../../misc/builddeps/linux32/gmp/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/gmp/lib"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux32/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_rijndael.a"
 								;;
 							*)
 								compiled0=true
@@ -322,10 +336,10 @@ case "$cmd" in
 			set -- catchsegv "$@"
 		fi
 		if [ x"$USE_RLWRAP" != x"no" ] && which rlwrap >/dev/null 2>&1; then
-			set -- rlwrap -A -g '^quit' -q "\"" -r -S ']' -w 100 "$@"
+			set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@"
 		fi
 		rm -f xonotic.core
-		"$@" || true
+		verbose measure_time "$@" || true
 		if [ -f xonotic.core ]; then
 			if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
 				gdb "$binary" xonotic.core
@@ -344,6 +358,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
 		;;
 	*)