no longer need to disable JPEG linking on osx
authorRudolf Polzer <divverent@alientrap.org>
Sat, 21 Aug 2010 11:47:55 +0000 (13:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 21 Aug 2010 11:47:55 +0000 (13:47 +0200)
all

diff --git a/all b/all
index 3e120e5b86d489f26a2d9a6c31836ab091141c5d..9a6c6ba179de8e5a29b45a057f670359e2ff3cde 100755 (executable)
--- a/all
+++ b/all
@@ -981,7 +981,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.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks" LIB_JPEG= CFLAGS_LIBJPEG=' \
+                       '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'
                ;;