mirror of https://github.com/ioquake/ioq3.git
Fix running make-macosx{,-ub2}.sh on Linux
osxcross doesn't support ppc so it's not possible to compile Universal Binary 1.
This commit is contained in:
parent
819e9830d8
commit
847dfe1211
|
@ -73,13 +73,19 @@ echo "Building PPC Client/Dedicated Server against \"$PPC_SDK\""
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# For parallel make on multicore boxes...
|
# For parallel make on multicore boxes...
|
||||||
NCPU=`sysctl -n hw.ncpu`
|
SYSCTL_PATH=`command -v sysctl 2> /dev/null`
|
||||||
|
if [ -n "$SYSCTL_PATH" ]; then
|
||||||
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
|
else
|
||||||
|
# osxcross on linux
|
||||||
|
NCPU=`nproc`
|
||||||
|
fi
|
||||||
|
|
||||||
# x86_64 client and server
|
# x86_64 client and server
|
||||||
#if [ -d build/release-release-x86_64 ]; then
|
#if [ -d build/release-release-x86_64 ]; then
|
||||||
# rm -r build/release-darwin-x86_64
|
# rm -r build/release-darwin-x86_64
|
||||||
#fi
|
#fi
|
||||||
(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS MACOSX_VERSION_MIN=$X86_64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS MACOSX_VERSION_MIN=$X86_64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo;echo
|
echo;echo
|
||||||
|
|
||||||
|
@ -87,7 +93,7 @@ echo;echo
|
||||||
#if [ -d build/release-darwin-x86 ]; then
|
#if [ -d build/release-darwin-x86 ]; then
|
||||||
# rm -r build/release-darwin-x86
|
# rm -r build/release-darwin-x86
|
||||||
#fi
|
#fi
|
||||||
(ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS MACOSX_VERSION_MIN=$X86_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS MACOSX_VERSION_MIN=$X86_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo;echo
|
echo;echo
|
||||||
|
|
||||||
|
@ -95,7 +101,7 @@ echo;echo
|
||||||
#if [ -d build/release-darwin-ppc ]; then
|
#if [ -d build/release-darwin-ppc ]; then
|
||||||
# rm -r build/release-darwin-ppc
|
# rm -r build/release-darwin-ppc
|
||||||
#fi
|
#fi
|
||||||
(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS MACOSX_VERSION_MIN=$PPC_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS MACOSX_VERSION_MIN=$PPC_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
|
@ -28,13 +28,19 @@ if [ "$1" == "" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# For parallel make on multicore boxes...
|
# For parallel make on multicore boxes...
|
||||||
NCPU=`sysctl -n hw.ncpu`
|
SYSCTL_PATH=`command -v sysctl 2> /dev/null`
|
||||||
|
if [ -n "$SYSCTL_PATH" ]; then
|
||||||
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
|
else
|
||||||
|
# osxcross on linux
|
||||||
|
NCPU=`nproc`
|
||||||
|
fi
|
||||||
|
|
||||||
# x86_64 client and server
|
# x86_64 client and server
|
||||||
#if [ -d build/release-release-x86_64 ]; then
|
#if [ -d build/release-release-x86_64 ]; then
|
||||||
# rm -r build/release-darwin-x86_64
|
# rm -r build/release-darwin-x86_64
|
||||||
#fi
|
#fi
|
||||||
(ARCH=x86_64 CFLAGS=$X86_64_CFLAGS MACOSX_VERSION_MIN=$X86_64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=x86_64 CFLAGS=$X86_64_CFLAGS MACOSX_VERSION_MIN=$X86_64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo;echo
|
echo;echo
|
||||||
|
|
||||||
|
@ -42,7 +48,7 @@ echo;echo
|
||||||
#if [ -d build/release-release-arm64 ]; then
|
#if [ -d build/release-release-arm64 ]; then
|
||||||
# rm -r build/release-darwin-arm64
|
# rm -r build/release-darwin-arm64
|
||||||
#fi
|
#fi
|
||||||
(ARCH=arm64 CFLAGS=$ARM64_CFLAGS MACOSX_VERSION_MIN=$ARM64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=arm64 CFLAGS=$ARM64_CFLAGS MACOSX_VERSION_MIN=$ARM64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
|
@ -106,14 +106,19 @@ if [ ! -d $DESTDIR ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# For parallel make on multicore boxes...
|
# For parallel make on multicore boxes...
|
||||||
NCPU=`sysctl -n hw.ncpu`
|
SYSCTL_PATH=`command -v sysctl 2> /dev/null`
|
||||||
|
if [ -n "$SYSCTL_PATH" ]; then
|
||||||
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
|
else
|
||||||
|
# osxcross on linux
|
||||||
|
NCPU=`nproc`
|
||||||
|
fi
|
||||||
|
|
||||||
# intel client and server
|
# intel client and server
|
||||||
#if [ -d build/release-darwin-${BUILDARCH} ]; then
|
#if [ -d build/release-darwin-${BUILDARCH} ]; then
|
||||||
# rm -r build/release-darwin-${BUILDARCH}
|
# rm -r build/release-darwin-${BUILDARCH}
|
||||||
#fi
|
#fi
|
||||||
(ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS MACOSX_VERSION_MIN=$ARCH_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
(PLATFORM=darwin ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS MACOSX_VERSION_MIN=$ARCH_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
||||||
|
|
||||||
# use the following shell script to build an application bundle
|
# use the following shell script to build an application bundle
|
||||||
export MACOSX_DEPLOYMENT_TARGET="${ARCH_MACOSX_VERSION_MIN}"
|
export MACOSX_DEPLOYMENT_TARGET="${ARCH_MACOSX_VERSION_MIN}"
|
||||||
|
|
Loading…
Reference in New Issue