From 75aa3782069b1b8b0c2eec610ee578fe77952b7d Mon Sep 17 00:00:00 2001 From: divverent Date: Thu, 28 Aug 2014 12:47:55 +0000 Subject: [PATCH] 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 --- .travis-before_install-xonotic.sh | 7 ++++--- .travis-script-xonotic.sh | 2 +- makefile.inc | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh index adb87e90..982de6d8 100755 --- 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 a8a19b97..d2cdafbf 100755 --- 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 c7e98d22..3dfd1c52 100644 --- 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) -- 2.39.2