From 569addc4f842c46076f63b981edcf17fc089ef5e Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 29 Oct 2008 09:39:19 +0000 Subject: [PATCH] enable OS X for testing again git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4934 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- misc/makebuild.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/misc/makebuild.sh b/misc/makebuild.sh index 13dbba2bf..b2f8294c3 100755 --- a/misc/makebuild.sh +++ b/misc/makebuild.sh @@ -108,12 +108,12 @@ buildon() build() { - buildon eos.thruhere.net nexuiz-linux-686 fteqcc-linux-686 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-i386/lib' strip + buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"' strip + buildon eos.thruhere.net nexuiz-linux-686 fteqcc-linux-686 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-i386/lib' strip buildon alientrap.org nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib' strip buildon alientrap.org nexuiz fteqcc.exe /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I/home/divverent/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=/home/divverent/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip -# OS X SUPPORT DISCONTINUED buildon mac.alientrap.org nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"' strip -# OS X SUPPORT DISCONTINUED mv "$tmpdir/nexuiz-osx-agl" "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin" -# OS X SUPPORT DISCONTINUED mv "$tmpdir/nexuiz-osx-sdl" "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin" + mv "$tmpdir/nexuiz-osx-agl" "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin" + mv "$tmpdir/nexuiz-osx-sdl" "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin" } # avoid dupes @@ -155,7 +155,7 @@ if [ -s patches/series ]; then fi # prepare directory structure -# OS X SUPPORT DISCONTINUED cp -r "$osxapps"/*.app "$tmpdir" +cp -r "$osxapps"/*.app "$tmpdir" mkdir "$tmpdir/debuginfo" mkdir "$tmpdir/fteqcc" -- 2.39.2