More rijndael fixing.

[xonotic/xonotic.git] / misc / tools / all / xonotic.subr

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index ef09a530cc755318bf67c158d799e6984a2e0d53..2d821a35e941b0e848f8f1fd36088fc07203e8bd 100644 (file)
--- 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 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 $mapfile `grep "^-" $mapfile.options`
+                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
                        fi
                done
                ;;
@@ -138,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)
@@ -194,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 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 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