]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
SDL2 dropped i386 support, so stop compiling against that.
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 14 Mar 2016 16:29:02 +0000 (16:29 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 14 Mar 2016 16:30:39 +0000 (17:30 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12250 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=194e4364ce5893902a33a26393d7817e610c2496

.travis-script-xonotic.sh

index 4aa40a29db039f507025caabb59e0664b793c438..c8e2b8b118461cd1360b0d1a3a29686356b75b53 100755 (executable)
@@ -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 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        CC="gcc -g1 -arch x86_64 -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"