From 3470e1323d4fe070840046d93d616d3a16b840a5 Mon Sep 17 00:00:00 2001
From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 9 Jan 2015 09:02:03 +0000
Subject: [PATCH] Fix static linking.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12133 d7cf8633-e32d-0410-b094-e92efae38249
---
.travis-before_install-xonotic.sh | 4 ----
.travis-script-xonotic.sh | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 30489d31..a36b141c 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -47,13 +47,9 @@ for os in "$@"; do
;;
win32)
wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_32.tar.xz | sudo tar xaJvf - -C/ opt/cross_toolchain_32
- # Easiest way to statically link to libwinpthread is to delete the shared version.
- sudo rm /opt/cross_toolchain_32/bin/libwinpthread-1.dll /opt/cross_toolchain_32/i686-w64-mingw32/lib/libwinpthread.dll.a
;;
win64)
wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_64.tar.xz | sudo tar xvJf - -C/ opt/cross_toolchain_64
- # Easiest way to statically link to libwinpthread is to delete the shared version.
- sudo rm /opt/cross_toolchain_64/bin/libwinpthread-1.dll /opt/cross_toolchain_64/x86_64-w64-mingw32/lib/libwinpthread.dll.a
;;
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 5c2c4e34..e229928a 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -62,7 +62,7 @@ for os in "$@"; do
DP_MAKE_TARGET=mingw
UNAME=MINGW32
WIN32RELEASE=1
- CC="/opt/cross_toolchain_32/bin/i686-w64-mingw32-gcc -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
+ CC="/opt/cross_toolchain_32/bin/i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
WINDRES="/opt/cross_toolchain_32/bin/i686-w64-mingw32-windres"
SDL_CONFIG="../../../${deps}/bin/sdl2-config"
DP_LINK_CRYPTO=dlopen
@@ -80,7 +80,7 @@ for os in "$@"; do
DP_MAKE_TARGET=mingw
UNAME=MINGW32
WIN64RELEASE=1
- CC="/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+ CC="/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
WINDRES="/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-windres"
SDL_CONFIG="../../../${deps}/bin/sdl2-config"
DP_LINK_CRYPTO=dlopen
--
2.39.5