X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5d38877d75f0f98390a6206f80bf65ed0bb919d5;hp=d5757dd249f1acdf7bb1111c2efa608172fb1c91;hb=2e038533ccd483126b253da1df44035e50d00eb5;hpb=35a0d303e709a86c3598584df52cb990490fa4ff diff --git a/all b/all index d5757dd2..5d38877d 100755 --- a/all +++ b/all @@ -953,7 +953,7 @@ case "$cmd" in esac # now rebrand the binaries... for f in $targetfiles; do - verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true + verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true done fi ;; @@ -985,7 +985,7 @@ case "$cmd" in verbose "$SELF" release-compile osx \ 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \ - 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:xonotic-osx-dedicated' + 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-osx-agl) # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed