Revert "use a different name for mingw64 binaries", as the new compiler does not run

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 155cc5e6a701f40eaeac0cc2f60ce3999e47d0c2..58e1ea40bf8011ec3a6b4d971287cbc4df4f3403 100755 (executable)
--- a/all
+++ b/all
@@ -548,16 +548,10 @@ case "$cmd" in
                                cleanqc=true
                                shift
                                ;;
-                       -n)
-                               cleandp=false
-                               cleanqcc=false
-                               cleanqc=false
-                               shift
-                               ;;
                        *)
                                cleandp=false
                                cleanqcc=false
-                               cleanqc=true # version info
+                               cleanqc=false
                                ;;
                esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -937,7 +931,11 @@ case "$cmd" in
                esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
-               verbose date +%Y%m%d > Xonotic/stamp.txt
+               if [ -n "$RELEASEDATE" ]; then
+                       verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+               else
+                       verbose date +%Y%m%d > Xonotic/stamp.txt
+               fi
                verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
@@ -1035,7 +1033,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