From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 27 Jan 2015 13:30:15 +0000 (+0000)
Subject: Set the proper @rpath in the OS X binaries.
X-Git-Tag: xonotic-v0.8.1~29^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff3dd9fb1d97b89dd888147c692cb1b582a506c6;p=xonotic%2Fdarkplaces.git

Set the proper @rpath in the OS X binaries.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12137 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 5ea3fb82..4aa40a29 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -94,7 +94,7 @@ for os in "$@"; do
     osx)
       chroot=
       makeflags='STRIP=:
-        CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
         SDLCONFIG_MACOSXCFLAGS="-I${PWD}/SDL2.framework/Headers"
         SDLCONFIG_MACOSXLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"
         SDLCONFIG_MACOSXSTATICLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"