Changed libgmp to be linked dynamically.

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 8ea9ba089b133bca41b97db7aa8c869a91ee2cd5..525955d55d00ccd4f982c1ca26b4059e97b0e62f 100755 (executable)
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -27,7 +27,7 @@ for os in "$@"; do
         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 @@ for os in "$@"; do
         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"

diff --git a/.travis.yml b/.travis.yml
index 260c86784dea08b4a777ad1463f5fb8e514f65a2..9ea2b34d0fae2eb3b6939fad545b794d456b638c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ 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.
@@ -29,6 +30,7 @@ matrix:
           - libxpm-dev
           - libsdl1.2-dev
           - libxxf86vm-dev
+          - libgmp-dev
   - os: linux
     env: PROJECT=xonotic OS="win32"
     compiler: gcc