[quake3-commits] r2374 - trunk

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-12-08 19:25:47 -0500 (Sat, 08 Dec 2012)
New Revision: 2374

Modified:
   trunk/make-macosx-ub.sh
   trunk/make-macosx.sh
Log:
- Include Rend2 renderer in MacOSX bundle
- Include OpenGL1 and Rend2 renderers in MacOSX UB

Modified: trunk/make-macosx-ub.sh
===================================================================
--- trunk/make-macosx-ub.sh	2012-12-06 21:53:52 UTC (rev 2373)
+++ trunk/make-macosx-ub.sh	2012-12-09 00:25:47 UTC (rev 2374)
@@ -33,6 +33,16 @@
 	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 @@
 
 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/

Modified: trunk/make-macosx.sh
===================================================================
--- trunk/make-macosx.sh	2012-12-06 21:53:52 UTC (rev 2373)
+++ trunk/make-macosx.sh	2012-12-09 00:25:47 UTC (rev 2374)
@@ -8,7 +8,6 @@
 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 @@
 	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`