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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 3eae364dc7156bdbab425cea36d6930f3bad5fdf..c8c59110a9f7c2dd5c5ac3c526f25916e335c67e 100755 (executable)
--- a/all
+++ b/all
@@ -1117,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'
                ;;
@@ -1341,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 \