From 8e28ff954cf68ebfd15134b1a26736d73691ce18 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sun, 9 Dec 2012 00:25:47 +0000
Subject: [PATCH] - Include Rend2 renderer in MacOSX bundle - Include OpenGL1
 and Rend2 renderers in MacOSX UB

---
 make-macosx-ub.sh | 11 +++++++++++
 make-macosx.sh    |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh
index 17844c8c..5f6229f8 100755
--- a/make-macosx-ub.sh
+++ b/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/make-macosx.sh b/make-macosx.sh
index c4958d11..dbcc5bb8 100755
--- a/make-macosx.sh
+++ b/make-macosx.sh
@@ -8,7 +8,6 @@ ICNS=misc/quake3.icns
 DESTDIR=build/release-darwin-x86_64
 BASEDIR=baseq3
 MPACKDIR=missionpack
-RENDERDIR=build/release-darwin-x86_64
 
 BIN_OBJ="
 	build/release-darwin-x86_64/ioquake3.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`