mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-11-10 06:31:47 +00:00
make-macosx-ub.sh now parallelizes make across all available CPUs/cores.
This commit is contained in:
parent
0403ca2260
commit
fc060fbebb
1 changed files with 6 additions and 3 deletions
|
@ -151,6 +151,9 @@ if [ ! -d $DESTDIR ]; then
|
||||||
mkdir -p $DESTDIR
|
mkdir -p $DESTDIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# For parallel make on multicore boxes...
|
||||||
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
|
|
||||||
# ppc dedicated server
|
# ppc dedicated server
|
||||||
echo "Building Dedicated Server using $PPC_SERVER_SDK"
|
echo "Building Dedicated Server using $PPC_SERVER_SDK"
|
||||||
sleep 2
|
sleep 2
|
||||||
|
@ -158,7 +161,7 @@ if [ -d build/release-darwin-ppc ]; then
|
||||||
rm -r build/release-darwin-ppc
|
rm -r build/release-darwin-ppc
|
||||||
fi
|
fi
|
||||||
(ARCH=ppc BUILD_CLIENT_SMP=0 BUILD_CLIENT=0 BUILD_GAME_VM=0 BUILD_GAME_SO=0 \
|
(ARCH=ppc BUILD_CLIENT_SMP=0 BUILD_CLIENT=0 BUILD_GAME_VM=0 BUILD_GAME_SO=0 \
|
||||||
CFLAGS=$PPC_SERVER_CFLAGS LDFLAGS=$PPC_SERVER_LDFLAGS make) || exit 1;
|
CFLAGS=$PPC_SERVER_CFLAGS LDFLAGS=$PPC_SERVER_LDFLAGS make -j$NCPU) || exit 1;
|
||||||
cp build/release-darwin-ppc/ioq3ded.ppc $DESTDIR
|
cp build/release-darwin-ppc/ioq3ded.ppc $DESTDIR
|
||||||
|
|
||||||
# ppc client
|
# ppc client
|
||||||
|
@ -166,13 +169,13 @@ if [ -d build/release-darwin-ppc ]; then
|
||||||
rm -r build/release-darwin-ppc
|
rm -r build/release-darwin-ppc
|
||||||
fi
|
fi
|
||||||
(ARCH=ppc USE_OPENAL_DLOPEN=1 BUILD_SERVER=0 CC=$PPC_CLIENT_CC \
|
(ARCH=ppc USE_OPENAL_DLOPEN=1 BUILD_SERVER=0 CC=$PPC_CLIENT_CC \
|
||||||
CFLAGS=$PPC_CLIENT_CFLAGS LDFLAGS=$PPC_CLIENT_LDFLAGS make) || exit 1;
|
CFLAGS=$PPC_CLIENT_CFLAGS LDFLAGS=$PPC_CLIENT_LDFLAGS make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
# intel client and server
|
# intel client and server
|
||||||
if [ -d build/release-darwin-i386 ]; then
|
if [ -d build/release-darwin-i386 ]; then
|
||||||
rm -r build/release-darwin-i386
|
rm -r build/release-darwin-i386
|
||||||
fi
|
fi
|
||||||
(ARCH=i386 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make) || exit 1;
|
(ARCH=i386 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
|
echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
|
||||||
if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
|
if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
|
||||||
|
|
Loading…
Reference in a new issue