Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
1  2 
all

diff --combined all
index e9ac3d3c5fc15899411a5d734ff013d079cdfd92,e9098393b09b2e0df91e7d3d49449a246018ecfe..282a69033a903d5c1672866fbb02b1c6bd489149
--- 1/all
--- 2/all
+++ b/all
@@@ -341,7 -341,7 +341,7 @@@ case "$cmd" i
                        pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
                        if [ -d "$d0/$d" ]; then
-                               enter "$d0/$d" verbose
+                               verbose cd "$d0/$d"
                                fix_git_config "$url" "$pushurl"
                                cd "$d0"
                        fi
                done
                ;;
        compile)
 +              cleandp=false
 +              cleanqcc=false
 +              cleanqc=false
 +              debug=debug
 +              while :; do
 +                      case "$1" in
 +                              -c)
 +                                      cleandp=true
 +                                      cleanqcc=true
 +                                      cleanqc=true
 +                                      shift
 +                                      ;;
 +                              -r)
 +                                      debug=release
 +                                      shift
 +                                      ;;
 +                              *)
 +                                      break
 +                                      ;;
 +                      esac
 +              done
                if [ -z "$CC" ]; then
                        export CC="gcc -DSUPPORTIPV6"
                fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
 -                      TARGETS="sv-debug cl-debug"
 +                      TARGETS="sv-$debug cl-$debug"
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)
 -                                      TARGETS="sv-debug cl-debug sdl-debug"
 +                                      TARGETS="sv-$debug cl-$debug sdl-$debug"
                                        ;;
                                *)
                                        # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
 -                                      TARGETS="sv-debug sdl-debug"
 +                                      TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
                        export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
 -                      TARGETS="sv-debug cl-debug sdl-debug"
 +                      TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
 -              case "$1" in
 -                      -c)
 -                              cleandp=true
 -                              cleanqcc=true
 -                              cleanqc=true
 -                              shift
 -                              ;;
 -                      *)
 -                              cleandp=false
 -                              cleanqcc=false
 -                              cleanqc=false
 -                              ;;
 -              esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
                        # if we give the command make the arg "", it will surely fail (invalid filename),
                        # so better handle it as an empty client option