wtf, but I had fixed this bug before

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ee2758e7cfb341687d9cb2f4b5332b3ad9f7e52a..ed7e1b07bfc7312df63eebd30b3ab7c4e7d0a222 100755 (executable)
--- a/all
+++ b/all
@@ -250,7 +250,7 @@ case "$cmd" in
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
-                                       verbose git config remote.origin.autocrlf input
+                                       verbose git config core.autocrlf input
 
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
@@ -980,7 +980,7 @@ case "$cmd" in
        release-engine-osx)
                # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
                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.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -I$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks -fno-reorder-blocks"' \
+                       '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'
                ;;
@@ -999,7 +999,7 @@ case "$cmd" in
        release-engine)
                verbose "$SELF" release-engine-osx
                verbose "$SELF" release-engine-win32
-               verbose "$SELF" release-engine-win64
+               # verbose "$SELF" release-engine-win64
                verbose "$SELF" release-engine-linux32
                verbose "$SELF" release-engine-linux64
                ;;