Skip to content

Commit

Permalink
- Include Rend2 renderer in MacOSX bundle
Browse files Browse the repository at this point in the history
- Include OpenGL1 and Rend2 renderers in MacOSX UB
  • Loading branch information
zturtleman committed Dec 9, 2012
1 parent b356dac commit 8e28ff9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions make-macosx-ub.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions make-macosx.sh
Expand Up @@ -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
Expand All @@ -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`
Expand Down

0 comments on commit 8e28ff9

Please sign in to comment.