add a feature to run the game. NOTE: the option -xonotic is not implemented yet.

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d22618ee96b3c215c9957dce3de46ff28f18078d..4e1a63e1ca38c17b472a1eb0af37838c6e8dc69f 100755 (executable)
--- a/all
+++ b/all
@@ -7,6 +7,7 @@ repos="
        data/xonotic-data.pk3dir
        data/xonotic-maps.pk3dir
        data/xonotic-music.pk3dir
+       data/xonotic-nexcompat.pk3dir
        darkplaces
 "
 
@@ -38,7 +39,7 @@ case "$cmd" in
                        fi
                done
                ;;
-       checkout)
+       checkout|switch)
                remote=$1
                branch=$2
                if [ -z "$branch" ]; then
@@ -97,7 +98,7 @@ case "$cmd" in
                for d in $repos; do
                        cd "$d0/$d"
                        echo "In $d:"
-                       git branch -a | sed 's/^/  /'
+                       git branch -a | sed 's/^/  /; /->/d'
                        cd "$d0"
                done
                ;;
@@ -119,12 +120,56 @@ case "$cmd" in
                        cd "$d0"
                done
                ;;
+       compile)
+               (
+                       cd data/xonotic-data.pk3dir
+                       make $MAKEFLAGS
+               ) || exit $?
+               (
+                       if [ -z "$MAKEFLAGS" ]; then
+                               if [ -f /proc/cpuinfo ]; then
+                                       ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
+                                       if [ $ncpus -gt 1 ]; then
+                                               MAKEFLAGS=-j$ncpus
+                                       fi
+                               fi
+                       fi
+                       cd darkplaces
+                       make $MAKEFLAGS sv-debug
+                       make $MAKEFLAGS cl-debug
+                       make $MAKEFLAGS sdl-debug
+               ) || exit $?
+               ;;
+       run)
+               client=-sdl
+               case "$1" in
+                       sdl|glx|agl|dedicated)
+                               client=-$1
+                               shift
+                               ;;
+                       wgl)
+                               client=
+                               shift
+                               ;;
+               esac
+               if ! [ -x "darkplaces/darkplaces$client" ]; then
+                       if [ -x "darkplaces/darkplaces$client.exe" ]; then
+                               client=$client.exe
+                       else
+                               echo "Client darkplaces/darkplaces$client not found, aborting"
+                               exit 1
+                       fi
+               fi
+               exec "darkplaces/darkplaces$client" -xonotic $@
+               ;;
        *)
                echo "Usage:"
                echo "  $0 pull"
                echo "  $0 push"
                echo "  $0 branches"
-               echo "  $0 branch"
+               echo "  $0 branch <remote> <branchname>"
                echo "  $0 checkout"
+               echo "  $0 compile"
+               echo "  $0 run <client> <options>"
                ;;
 esac