diff options
| author | Zack Middleton <zturtleman@gmail.com> | 2012-12-09 00:25:47 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-12 21:24:54 +0000 |
| commit | c6e2d8ae54b6f7c92b3fd21415e7222b14f25d38 (patch) | |
| tree | 7fa4e2a2cffaf5ed686a716e6b159d431c8df440 | |
| parent | 03ae82957a7cab0510870bbde51df6fcdabfcbe2 (diff) | |
- Include Rend2 renderer in MacOSX bundle - Include OpenGL1 and Rend2 renderers in MacOSX UB
| -rwxr-xr-x | make-macosx-ub.sh | 11 | ||||
| -rwxr-xr-x | make-macosx.sh | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh index 973fda86..c46c3fd9 100755 --- a/make-macosx-ub.sh +++ b/make-macosx-ub.sh @@ -24,6 +24,16 @@ BASE_OBJ=" build/release-darwin-ppc/$BASEDIR/gameppc.dylib build/release-darwin-x86/$BASEDIR/gamex86.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 @@ -166,6 +176,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 src/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` |