instead, exclude background_l2 from that hashing stuff

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 1d0e4633fbf591155e078c188e5c04026798e2c2..ccb522ff497945b888cdc80a1dd851d3049865af 100755 (executable)
--- a/all
+++ b/all
@@ -1573,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`
@@ -1606,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'
                ;;
@@ -1616,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'
                ;;
@@ -1737,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)