fi
if ! [ -f "netradiant/install/q3map2" ] ; then
msg "q3map2 needed! Building netradiant..."
- make -C netradiant install/q3map2
+ make -C netradiant BUILD=native 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"
+ verbose measure_time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
fi
done
;;
cleanqc=false
compiled0=false
debug=debug
- snowleopardhack=false
if [ -z "$CC" ]; then
export CC="gcc"
fi
if [ -n "$WE_HATE_OUR_USERS" ]; then
TARGETS="sv-$debug cl-$debug"
elif [ x"`uname`" = x"Darwin" ]; then
- case "`uname -r`" in
- ?.*)
- TARGETS="sv-$debug cl-$debug sdl-$debug"
- ;;
- *)
- # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
- snowleopardhack=true
- TARGETS="sv-$debug sdl-$debug"
- ;;
- esac
+ TARGETS="sv-$debug sdl-$debug"
export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
else
TARGETS="sv-$debug cl-$debug sdl-$debug"
case "$X" in
sdl)
TARGETS="$TARGETS sdl-$debug"
- ;;
- agl)
- TARGETS="$TARGETS cl-$debug"
- if $snowleopardhack; then
- export CC="$CC -arch i386"
+ if [ -n "$WE_HATE_OUR_USERS" ]; then
+ export PATH="$PATH:$d0/misc/builddeps/win32/sdl/bin"
fi
;;
glx|wgl)
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)
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_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"
+ # 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_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"
+ # 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
client=-$1
shift
;;
- sdl|glx|agl)
+ sdl|glx)
USE_RLWRAP=no
client=-$1
shift
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
fi
;;
help)
- $ECHO " $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
+ $ECHO " $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
$ECHO " $SELF update-maps"
- $ECHO " $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+ $ECHO " $SELF run [sdl|glx|wgl|dedicated] options..."
$ECHO " $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
handled=false
;;