load more font sizes into FONT_USER1 to make CSQC able to use FONT_USER1 for everythi...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index de82d83d3b82efce495fedf1c8c1e8af3518c760..ccb522ff497945b888cdc80a1dd851d3049865af 100755 (executable)
--- a/all
+++ b/all
@@ -1495,7 +1495,7 @@ case "$cmd" in
                fi
                verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
-                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc
+                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id
                        verbose tar xvf -
                        verbose rm -rf misc/builddeps
                        verbose mv misc/buildfiles/win32/* . || true
@@ -1525,6 +1525,14 @@ case "$cmd" in
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }
+               {
+                       verbose cd d0_blind_id
+                       verbose git archive --format=tar HEAD
+               } | {
+                       verbose cd Xonotic/source/d0_blind_id
+                       verbose tar xvf -
+                       verbose sh autogen.sh
+               }
                rm -f Xonotic/key_15.d0pk
                ;;
        release-compile-run)
@@ -1565,7 +1573,7 @@ case "$cmd" in
                        for f in $targetfiles; do
                                #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
                                case "${f##*:}" in
-                                       xonotic*.exe)
+                                       Xonotic/xonotic*.exe)
                                                verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
                                                (
                                                        d=`mktemp -d -t rebrand.XXXXXX`
@@ -1598,7 +1606,7 @@ case "$cmd" in
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        '' ''
                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 -DUSE_WSPIAPI_H -DSUPPORTIPV6" 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 -DUSE_WSPIAPI_H -DSUPPORTIPV6" 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'
                ;;
@@ -1608,7 +1616,7 @@ case "$cmd" in
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        'sv-release sdl-release' 'darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
                verbose "$SELF" release-compile win64 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-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-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \
                        '' '' \
                        cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe'
                ;;
@@ -1729,8 +1737,8 @@ case "$cmd" in
                        verbose rm -rf qcsrc
                        gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
                        major=$(($gv / 10000))
-                       minor=$(($gv / 100 - $major * 100))
-                       patch=$(($gv - $major * 10000 - $minor * 100))
+                       minor=$((($gv / 100) - ($major * 100)))
+                       patch=$(($gv - ($major * 10000) - ($minor * 100)))
                        versionstr="$major.$minor.$patch"
                        case "$RELEASETYPE" in
                                release)
@@ -1813,7 +1821,7 @@ case "$cmd" in
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true
                # let's pass crypto import laws of some nasty countries
-               crypto_libs=`find Xonotic -name \*d0_rijndael\*`
+               crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c`
                if [ -n "$crypto_libs" ]; then
                        verbose mkzip Xonotic-$stamp-crypto.zip \
                                $crypto_libs
@@ -1848,12 +1856,6 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-data-low.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-low.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
-#              verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
-#              verbose mkzip0 Xonotic-$stamp-high.zip \
-#                      Xonotic/data/xonotic-$stamp-data-raw.pk3 \
-#                      Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
-#                      Xonotic/data/xonotic-$stamp-music.pk3 \
-#                      Xonotic/data/xonotic-$stamp-nexcompat.pk3
                verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
                verbose mkzip0 Xonotic-$stamp-lowdds.zip \
                        Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \