improve naming of win64 binareis

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bda0c655413daf6142961b7b98762cf5a8a08c21..c77ab6012e60d8ef4115b4c6725faa5c889638eb 100755 (executable)
--- a/all
+++ b/all
@@ -857,14 +857,21 @@ case "$cmd" in
                echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
                ;;
        clean)
+               force=false
+               if [ x"$1" = x"-f" ]; then
+                       force=true
+               fi
                for d in $repos; do
                        enter "$d0/$d" verbose
+                       if $force; then
+                               verbose git checkout-index -fa
+                       fi
                        case "$d" in
                                .)
-                                       git clean -df
+                                       verbose git clean -df
                                        ;;
                                *)
-                                       git clean -xdf
+                                       verbose git clean -xdf
                                        ;;
                        esac
                done
@@ -967,8 +974,8 @@ case "$cmd" in
        release-engine-win64)
                verbose "$SELF" release-compile win64 \
                        'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \
-                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
-                       debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe'
+                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
+                       debug 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                ;;
        release-engine-osx)
                verbose "$SELF" release-compile osx \