win32: enable D3D9 (win64 not yet, have no working win64 C++ compiler here)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 12e4501f82fd92aabf5797b47691342d80b9271b..c8c59110a9f7c2dd5c5ac3c526f25916e335c67e 100755 (executable)
--- a/all
+++ b/all
@@ -895,15 +895,18 @@ case "$cmd" in
        clean)
                force=false
                gotoupstream=false
+               fetchupstream=false
                gotomaster=false
                rmuntracked=false
                killbranches=false
                # usage:
-               #   ./all clean [-m] [-f | -fu] [-r] [-D]
+               #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
                #   ./all clean --reclone
+               found=false
                while :; do
                        if [ x"$1" = x"--reclone" ]; then
                                force=true
+                               fetchupstream=true
                                gotoupstream=true
                                gotomaster=true
                                rmuntracked=true
@@ -912,9 +915,16 @@ case "$cmd" in
                                force=true
                        elif [ x"$1" = x"-u" ]; then
                                gotoupstream=true
+                       elif [ x"$1" = x"-U" ]; then
+                               gotoupstream=true
+                               fetchupstream=true
                        elif [ x"$1" = x"-fu" ]; then
                                force=true
                                gotoupstream=true
+                       elif [ x"$1" = x"-fU" ]; then
+                               force=true
+                               gotoupstream=true
+                               fetchupstream=true
                        elif [ x"$1" = x"-m" ]; then
                                gotomaster=true
                        elif [ x"$1" = x"-r" ]; then
@@ -924,8 +934,12 @@ case "$cmd" in
                        else
                                break
                        fi
+                       found=true
                        shift
                done
+               if ! $found; then
+                       rmuntracked=true
+               fi
                for d in $repos; do
                        verbose cd "$d0/$d"
                        if $gotoupstream; then
@@ -934,6 +948,9 @@ case "$cmd" in
                                        exit 1
                                fi
                                if $gotomaster; then
+                                       if $fetchupstream; then
+                                               verbose git fetch origin
+                                       fi
                                        verbose git checkout -f "`repobranch "$d"`"
                                        verbose git reset --hard origin/"`repobranch "$d"`"
                                else
@@ -942,6 +959,9 @@ case "$cmd" in
                                        rem=`git config "branch.$r.remote" || echo origin`
                                        bra=`git config "branch.$r.merge" || echo "$r"`
                                        upstream="$rem/${bra#refs/heads/}"
+                                       if $fetchupstream; then
+                                               verbose git fetch "$rem"
+                                       fi
                                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                                upstream="origin/`repobranch "$d"`"
                                        fi
@@ -950,6 +970,7 @@ case "$cmd" in
                        elif $gotomaster; then
                                if $force; then
                                        verbose git checkout -f "`repobranch "$d"`"
+                                       verbose git reset --hard
                                else
                                        verbose git checkout "`repobranch "$d"`"
                                fi
@@ -1096,9 +1117,8 @@ case "$cmd" in
                verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/dp.$suffix" "$darkplaces_files"
                ;;
        release-engine-win32)
-               # TODO change to g++ and D3D=1 when D3D gets added
                verbose "$SELF" release-compile win32 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
                ;;
@@ -1320,10 +1340,12 @@ case "$cmd" in
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
-                       Xonotic/xonotic.exe
+                       Xonotic/xonotic.exe \
+                       Xonotic/source/darkplaces/
                verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
                verbose mkzip Xonotic-$stamp-common.zip \
-                       Xonotic/source/*/ \
+                       Xonotic/source/fteqcc/ \
+                       Xonotic/source/qcsrc/ \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \
@@ -1363,15 +1385,24 @@ case "$cmd" in
 
        *)
                echo "Usage:"
-               echo "  $SELF pull"
-               echo "  $SELF merge"
-               echo "  $SELF push [-s]"
+               echo "  $SELF admin-merge [<branch>]"
+               echo "  $SELF branch <branch>"
+               echo "  $SELF branch <remote> <branch> [<srcbranch>]"
                echo "  $SELF branches"
-               echo "  $SELF branch [<remote>] <branchname>"
-               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
-               echo "  $SELF checkout [<remote>] <branchname>"
-               echo "  $SELF compile [-c|-n] [<client>] <options>"
-               echo "  $SELF run [<client>] <options>"
-               echo "  $SELF each <command>"
+               echo "  $SELF checkout|switch <branch>"
+               echo "  $SELF checkout|switch <remote>/<branch>"
+               echo "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
+               echo "  $SELF clean --reclone"
+               echo "  $SELF compile [-c]"
+               echo "  $SELF each|foreach [-k] command..."
+               echo "  $SELF fix_upstream_rebase"
+               echo "  $SELF merge"
+               echo "  $SELF push|commit [-s]"
+               echo "  $SELF release"
+               echo "  $SELF restore-patches"
+               echo "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+               echo "  $SELF save-patches"
+               echo "  $SELF update-maps"
+               echo "  $SELF update|pull [-N]"
                ;;
 esac