Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ef3cdd55e11d71ed9ff631dec7de42cba26c8e01..ffb7769702a3454682d670fc3b0e82ebd9542230 100755 (executable)
--- a/all
+++ b/all
@@ -1133,17 +1133,23 @@ 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)
                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 \
                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-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=1' \

                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \

+                       '' ''
+               verbose "$SELF" release-compile win32 \
+                       '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' \
+                       '' '' \

                        release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
                ;;
        release-engine-win64)
                        release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
                ;;
        release-engine-win64)

-               # TODO change to g++ and D3D=1 when D3D gets added

                verbose "$SELF" release-compile win64 \
                verbose "$SELF" release-compile win64 \

-                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \

                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \

+                       '' ''
+               verbose "$SELF" release-compile win64 \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \
+                       '' '' \

                        release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
                ;;
        release-engine-osx-sv-sdl)
                        release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
                ;;
        release-engine-osx-sv-sdl)


@@ -1364,10 +1370,12 @@ case "$cmd" in
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
                        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 \
                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 \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \