From 05465092a839eb8aa8f0918b5833e3e47042a8ed Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Wed, 12 Dec 2012 20:10:06 +0000 Subject: [PATCH] IOQ3 commit 2374 --- reaction/make-macosx-ub.sh | 11 +++++++++++ reaction/make-macosx.sh | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/reaction/make-macosx-ub.sh b/reaction/make-macosx-ub.sh index 4c9c71f3..f4e7d16f 100755 --- a/reaction/make-macosx-ub.sh +++ b/reaction/make-macosx-ub.sh @@ -33,6 +33,16 @@ MPACK_OBJ=" build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib build/release-darwin-i386/$MPACKDIR/qagamei386.dylib " +RENDER_OBJ=" + build/release-darwin-ppc/renderer_opengl1_smp_ppc.dylib + build/release-darwin-i386/renderer_opengl1_smp_i386.dylib + build/release-darwin-ppc/renderer_opengl1_ppc.dylib + build/release-darwin-i386/renderer_opengl1_i386.dylib + build/release-darwin-ppc/renderer_rend2_smp_ppc.dylib + build/release-darwin-i386/renderer_rend2_smp_i386.dylib + build/release-darwin-ppc/renderer_rend2_ppc.dylib + build/release-darwin-i386/renderer_rend2_i386.dylib +" cd `dirname $0` if [ ! -f Makefile ]; then @@ -175,6 +185,7 @@ echo " lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ +cp $RENDER_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/ cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/ cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/ cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/ diff --git a/reaction/make-macosx.sh b/reaction/make-macosx.sh index 2d959290..721a4201 100644 --- a/reaction/make-macosx.sh +++ b/reaction/make-macosx.sh @@ -8,7 +8,6 @@ ICNS=misc/quake3.icns DESTDIR=build/release-darwin-x86_64 BASEDIR=Boomstick MPACKDIR=missionpack -RENDERDIR=build/release-darwin-x86_64 BIN_OBJ=" build/release-darwin-x86_64/Reaction.x86_64 @@ -26,10 +25,11 @@ MPACK_OBJ=" build/release-darwin-x86_64/$MPACKDIR/uix86_64.dylib build/release-darwin-x86_64/$MPACKDIR/qagamex86_64.dylib " - RENDER_OBJ=" build/release-darwin-x86_64/renderer_opengl1_smp_x86_64.dylib build/release-darwin-x86_64/renderer_opengl1_x86_64.dylib + build/release-darwin-x86_64/renderer_rend2_smp_x86_64.dylib + build/release-darwin-x86_64/renderer_rend2_x86_64.dylib " cd `dirname $0`