Merge branch 'div0-stable' into Lyberta/libgmp

diff --combined .travis-script-xonotic.sh
index 525955d55d00ccd4f982c1ca26b4059e97b0e62f,654ef36eef06fe7c5181eb339105eee0ccce74e9..4bc251bfe7b0dce83096fb42bda0e6cacf590bf6
--- 1/.travis-script-xonotic.sh
--- 2/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@@ -27,7 -27,7 +27,7 @@@ for os in "$@"; d
          CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
          SDL_CONFIG=$USRLOCAL/bin/sdl2-config
          DP_LINK_CRYPTO=shared
 -          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
 +          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a"
          DP_LINK_CRYPTO_RIJNDAEL=dlopen
          DP_LINK_JPEG=shared
            LIB_JPEG=../../../${deps}/lib/libjpeg.a
@@@ -44,7 -44,7 +44,7 @@@
          CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
          SDL_CONFIG=$USRLOCAL/bin/sdl2-config
          DP_LINK_CRYPTO=shared
 -          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
 +          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a"
          DP_LINK_CRYPTO_RIJNDAEL=dlopen
          DP_LINK_JPEG=shared
            LIB_JPEG="../../../${deps}/lib/libjpeg.a"
@@@ -56,17 -56,16 +56,16 @@@
        outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated'
        ;;
      win32)
-       # other Win32 DLLs - including SDL2 - retain 16 bytes alignment.
-       export LD_LIBRARY_PATH="$USRLOCAL/opt/cross_toolchain_32/x86_64-slackware-linux/i686-w64-mingw32/lib:$USRLOCAL/opt/cross_toolchain_32/libexec/gcc/i686-w64-mingw32/4.8.3"
        chroot=
        # Need to use -mstackrealign as nothing guarantees that callbacks from
+       # other Win32 DLLs - including SDL2 - retain 16 bytes alignment.
        makeflags='STRIP=:
          D3D=1
          DP_MAKE_TARGET=mingw
          UNAME=MINGW32
          WIN32RELEASE=1
-         CC="$USRLOCAL/opt/cross_toolchain_32/bin/i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
-         WINDRES="$USRLOCAL/opt/cross_toolchain_32/bin/i686-w64-mingw32-windres"
+         CC="i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+         WINDRES="i686-w64-mingw32-windres"
          SDL_CONFIG="../../../${deps}/bin/sdl2-config"
          DP_LINK_CRYPTO=dlopen
          DP_LINK_CRYPTO_RIJNDAEL=dlopen
@@@ -77,15 -76,14 +76,14 @@@
        outputs='darkplaces.exe:darkplaces-x86-wgl.exe darkplaces-sdl.exe:darkplaces-x86.exe darkplaces-dedicated.exe:darkplaces-x86-dedicated.exe'
        ;;
      win64)
-       export LD_LIBRARY_PATH="$USRLOCAL/opt/cross_toolchain_64/x86_64-slackware-linux/x86_64-w64-mingw32/lib:$USRLOCAL/opt/cross_toolchain_64/libexec/gcc/x86_64-w64-mingw32/4.8.3"
        chroot=
        makeflags='STRIP=:
          D3D=1
          DP_MAKE_TARGET=mingw
          UNAME=MINGW32
          WIN64RELEASE=1
-         CC="$USRLOCAL/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
-         WINDRES="$USRLOCAL/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-windres"
+         CC="x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+         WINDRES="x86_64-w64-mingw32-windres"
          SDL_CONFIG="../../../${deps}/bin/sdl2-config"
          DP_LINK_CRYPTO=dlopen
          DP_LINK_CRYPTO_RIJNDAEL=dlopen

diff --combined .travis.yml
index 9ea2b34d0fae2eb3b6939fad545b794d456b638c,fbea9bb77b3696aca588f713738e0bafffab8032..6cab6239fcd74e293651056721873e170af3688e
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -11,15 -11,19 +11,20 @@@ matrix
            - libxpm-dev:i386
            - libsdl1.2-dev:i386
            - libxxf86vm-dev:i386
 +          - libgmp-dev:i386
            - gcc-multilib
            - g++-multilib
            # Workaround packages to install to fix dependency hell.
-           - libglu1-mesa-dev:i386
            - libcaca-dev:i386
-           - libxext-dev:i386
-           - libslang2-dev:i386
+           - libgl1-mesa-dev:i386
+           - libglib2.0-dev:i386
+           - libglu1-mesa-dev:i386
            - libpng-dev:i386
+           - libpulse-dev:i386
+           - libslang2-dev:i386
+           - libxext-dev:i386
+           - libxi-dev:i386
+           - libxrandr-dev:i386
    - os: linux
      env: PROJECT=xonotic OS="linux64"
      compiler: gcc
@@@ -29,16 -33,27 +34,28 @@@
          packages:
            - libxpm-dev
            - libsdl1.2-dev
+           - libxi-dev
+           - libxrandr-dev
            - libxxf86vm-dev
 +          - libgmp-dev
    - os: linux
      env: PROJECT=xonotic OS="win32"
      compiler: gcc
      sudo: false
+     addons:
+       apt:
+         packages:
+           - gcc-mingw-w64-i686
+           - binutils-mingw-w64-i686
    - os: linux
      env: PROJECT=xonotic OS="win64"
      compiler: gcc
      sudo: false
+     addons:
+       apt:
+         packages:
+           - gcc-mingw-w64-x86-64
+           - binutils-mingw-w64-x86-64
    - os: osx
      env: PROJECT=xonotic OS="osx"
      compiler: gcc