Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index f22a8b72e501ce722e262b7e2038a0e038563c73..fb15fb02e97833392ec69c0c8ef49f706d42a4f3 100755 (executable)
--- a/all
+++ b/all
@@ -550,18 +550,11 @@ case "$cmd" in
                                cleanqc=true
                                shift
                                ;;
-                       -n)
-                               cleand0=false
-                               cleandp=false
-                               cleanqcc=false
-                               cleanqc=false
-                               shift
-                               ;;
                        *)
                                cleand0=false
                                cleandp=false
                                cleanqcc=false
-                               cleanqc=true # version info
+                               cleanqc=false
                                ;;
                esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -1052,7 +1045,7 @@ case "$cmd" in
                verbose "$SELF" release-compile osx \
                        'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
                        '' '' \
-                       'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+                       'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
                ;;
        release-engine-osx)
                verbose "$SELF" release-engine-osx-sv-sdl