From eee7265c29d7173f25c850187ac48afe58f2ee62 Mon Sep 17 00:00:00 2001
From: Lyberta <lyberta@lyberta.net>
Date: Sat, 26 Aug 2017 23:48:31 +0300
Subject: [PATCH] Changed libgmp to be linked dynamically.
---
.travis-script-xonotic.sh | 4 ++--
.travis.yml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 8ea9ba08..525955d5 100755
--- 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 260c8678..9ea2b34d 100644
--- 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
--
2.39.5