X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5ec251958e7e43311d5fcca4614500ccfd3db4c0;hp=fe9bb4168184dd660edb417edd9a628354dcac10;hb=93f2e0cb850680420256ab9360be35d8bfe90dbb;hpb=9d2449295f95cee984723793823afc3515afcfa2 diff --git a/all b/all index fe9bb416..5ec25195 100755 --- a/all +++ b/all @@ -120,6 +120,7 @@ darkplaces | fteqcc | git://github.com/Blub/qclib.git | master | div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master | netradiant | | master | +d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -138,14 +139,14 @@ esac repourl() { - t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` - if [ -n "$t" ]; then - case "$t" in + repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` + if [ -n "$repo_t" ]; then + case "$repo_t" in *://*) - echo "$t" + echo "$repo_t" ;; *) - echo "$base$t" + echo "$base$repo_t" ;; esac else @@ -159,9 +160,9 @@ repourl() repobranch() { - t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` - if [ -n "$t" ]; then - echo "$t" + repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` + if [ -n "$repo_t" ]; then + echo "$repo_t" else echo "master" fi @@ -170,7 +171,6 @@ repobranch() repoflags() { echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' - echo "$t" } repos=`for d in $repos; do @@ -426,7 +426,7 @@ case "$cmd" in if [ -z "$CC" ]; then export CC=gcc fi - elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then + elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then # AGL is broken in Snow Leopard, so let's default to SDL if it is available. TARGETS="sv-debug sdl-debug" else @@ -451,20 +451,23 @@ case "$cmd" in cleanqc=true # version info ;; esac - case "$1" in - sdl) - TARGETS="sdl-debug" - shift - ;; - glx|agl|wgl) - TARGETS="cl-debug" - shift - ;; - dedicated) - TARGETS="sv-debug" - shift - ;; - esac + if [ -n "$1" ]; then + TARGETS= + for X in $1; do + case "$X" in + sdl) + TARGETS="sdl-debug $TARGETS" + ;; + glx|agl|wgl) + TARGETS="cl-debug $TARGETS" + ;; + dedicated) + TARGETS="sv-debug $TARGETS" + ;; + esac + done + shift + fi if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) @@ -729,6 +732,7 @@ case "$cmd" in reportecho4 "--> test failed, postponed" fi else + echo "MERGING" case ",`repoflags "$d"`," in *,svn,*) # we do quite a mess here... luckily we know $org @@ -813,33 +817,33 @@ case "$cmd" in release-engine-win32) rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ "$SELF" release-compile win32 \ - '"DP_MAKE_TARGET=mingw CC="i586-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="i586-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \ + '"DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/db.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe' ;; release-engine-win64) rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ "$SELF" release-compile win32 \ - '"DP_MAKE_TARGET=mingw CC="amd64-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="amd64-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \ + '"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/db.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe' ;; release-engine-osx) rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/ "$SELF" release-compile osx \ - 'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"' \ + 'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib"' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \ sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' ;; release-engine-linux32) "$SELF" release-compile linux32 \ - 'CC="gcc -m32 -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \ + 'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \ debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated' ;; release-engine-linux64) "$SELF" release-compile linux64 \ - 'CC="gcc -m64 -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \ + 'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \ debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated' ;;