More Travis changes :) Use SDL2 in all builds now.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12092 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9a2612ff0270451436ef081994bb20dcb4299916

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index adb87e901bc0830d2ce054c569a9cea7c0939264..982de6d8a59999c5516894da1f10255cd2b54260 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -7,6 +7,9 @@ if [ "`uname`" = 'Linux' ]; then
 fi
 
 for os in "$@"; do
+  git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+    --prefix=".deps/${os}/" master:"misc/builddeps/${os}" | tar xvf -
+
   case "$os" in
     linux32)
       # Prepare an i386 chroot. This is required as we otherwise can't install
@@ -52,13 +55,11 @@ for os in "$@"; do
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-        --prefix=SDL.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework | tar xvf -
+        --prefix=SDL2.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL2.framework | tar xvf -
       ;;
   esac
 done
 
-git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-  --prefix=.deps/ master:misc/builddeps | tar xvf -
 for X in .deps/*; do
   rsync --remove-source-files -aL "$X"/*/ "$X"/ || true
 done

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index a8a19b977522bd0331ce2280855fdaf1bfcc32dd..d2cdafbfd3aaddc81af4f16692bf14a1600a31aa 100755 (executable)
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -44,7 +44,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 -I${PWD}/SDL.framework/Headers -F${PWD} -DSUPPORTIPV6" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen'
+      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" 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" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen'
       maketargets='sv-release sdl-release'
       outputs='darkplaces-sdl:xonotic-osx-sdl-bin darkplaces-dedicated:xonotic-osx-dedicated'
       ;;

diff --git a/makefile.inc b/makefile.inc
index c7e98d22ab8a1d60112496e8cf9c31067972c9a3..3dfd1c525fde9ff2c5854ea43e6e6bed4978ed13 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -241,7 +241,7 @@ OBJ_MACOSXCD=$(OBJ_NOCD)
 # Link
 LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND)
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS)
 
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o thread_null.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)