Travis/Xonotic: use Ubuntu's mingw-w64 and fix linux32 dependency hell.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12341 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e7409cd1bce830e40bc6d88e2b76a4cd6756e007

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 8b45d4866889dca3dd08dd406c04845c871e4fe0..bf39e00e08503b5c8d5571b319e9e7b86862535f 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -35,13 +35,11 @@ for os in "$@"; do
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
         --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
       mv .icons/xonotic.ico darkplaces.ico
-      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_32.tar.xz | tar xaJvf - -C"$USRLOCAL" opt/cross_toolchain_32
       ;;
     win64)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
         --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
       mv .icons/xonotic.ico darkplaces.ico
-      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_64.tar.xz | tar xvJf - -C"$USRLOCAL" opt/cross_toolchain_64
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 8ea9ba089b133bca41b97db7aa8c869a91ee2cd5..654ef36eef06fe7c5181eb339105eee0ccce74e9 100755 (executable)
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -56,17 +56,16 @@ for os in "$@"; do
       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 @@ for os in "$@"; do
       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 --git a/.travis.yml b/.travis.yml
index 260c86784dea08b4a777ad1463f5fb8e514f65a2..fb35033c232c18da50446f6ae0632cc9a5d7400c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,14 @@ matrix:
           - 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
   - os: linux
     env: PROJECT=xonotic OS="linux64"
     compiler: gcc
@@ -33,10 +36,20 @@ matrix:
     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