From 194e4364ce5893902a33a26393d7817e610c2496 Mon Sep 17 00:00:00 2001 From: divverent Date: Mon, 14 Mar 2016 16:29:02 +0000 Subject: [PATCH] SDL2 dropped i386 support, so stop compiling against that. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12250 d7cf8633-e32d-0410-b094-e92efae38249 --- .travis-script-xonotic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index 4aa40a29..c8e2b8b1 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 -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" -- 2.39.2