adminmerge real fix ;)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index c5914d8e59251a3b4e0a9b3f37b4c34875988e9c..cf7e101d3472e7fd9cf697583f5b1994d7173508 100755 (executable)
--- a/all
+++ b/all
@@ -405,6 +405,15 @@ case "$cmd" in
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
+               case "$1" in
+                       -c)
+                               clean=true
+                               shift
+                               ;;
+                       *)
+                               clean=false
+                               ;;
+               esac
                case "$1" in
                        sdl)
                                TARGETS="sdl-debug"
@@ -426,20 +435,37 @@ case "$cmd" in
                                        MAKEFLAGS=-j$ncpus
                                fi
                        fi
+                       case "`uname`" in
+                               Linux|*BSD)
+                                       MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
+                                       ;;
+                       esac
                fi
                enter "$d0/fteqcc" verbose
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
                verbose make $MAKEFLAGS
                enter "$d0/data/xonotic-data.pk3dir" verbose
-               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
+               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
                enter "$d0/darkplaces" verbose
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
                for T in $TARGETS; do
-                       verbose make $MAKEFLAGS "$T"
+                       verbose make $MAKEFLAGS "$@" "$T"
                done
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
+               elif [ x"`uname`" = x"Darwin" ]; then
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       client=-sdl
                else
                        client=-sdl
                fi
@@ -536,6 +562,9 @@ case "$cmd" in
                rm -rf "$patchdir"
                ;;
        admin-merge)
+               if [ "$#" = 1 ]; then
+                       set -- "${1%%/*}" "${1#*/}"
+               fi
                for d in $repos; do
                        enter "$d0/$d" verbose
                        git rev-parse "$1/$2" || continue
@@ -579,8 +608,8 @@ case "$cmd" in
                echo "  $SELF branch [<remote>] <branchname>"
                echo "  $SELF branch <remote> <branchname> <srcbranchname>"
                echo "  $SELF checkout [<remote>] <branchname>"
-               echo "  $SELF compile"
-               echo "  $SELF run <client> <options>"
+               echo "  $SELF compile [-c] [<client>] <options>"
+               echo "  $SELF run [<client>] <options>"
                echo "  $SELF each <command>"
                ;;
 esac