ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-03-04 15:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix specifying minimum mac os version in make-macosx.sh

Browse source 
Use newer method of telling Makefile instead of specifying CFLAGS
and LDFLAGS which results in using both Makefile's and scripts flags.
This commit is contained in:
Zack Middleton 2017-09-14 16:44:20 -05:00
parent 11b3bca555
commit 0a599268bb
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
make-macosx.sh
View file

@ -14,7 +14,6 @@ fi
if [ "$1" == "x86" ]; then if [ "$1" == "x86" ]; then
BUILDARCH=x86 BUILDARCH=x86
DARWIN_GCC_ARCH=i386
elif [ "$1" == "x86_64" ]; then elif [ "$1" == "x86_64" ]; then
BUILDARCH=x86_64 BUILDARCH=x86_64
elif [ "$1" == "ppc" ]; then elif [ "$1" == "ppc" ]; then
@ -25,10 +24,6 @@ else
exit 1 exit 1
fi fi
if [ -z "$DARWIN_GCC_ARCH" ]; then
DARWIN_GCC_ARCH=${BUILDARCH}
fi
CC=gcc-4.0 CC=gcc-4.0
DESTDIR=build/release-darwin-${BUILDARCH} DESTDIR=build/release-darwin-${BUILDARCH}
@ -46,13 +41,12 @@ fi
unset ARCH_SDK unset ARCH_SDK
unset ARCH_CFLAGS unset ARCH_CFLAGS
unset ARCH_LDFLAGS unset ARCH_MACOSX_VERSION_MIN
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk
ARCH_CFLAGS="-arch ${DARWIN_GCC_ARCH} -isysroot /Developer/SDKs/MacOSX10.5.sdk \ ARCH_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
-DMAC_OS_X_VERSION_MIN_REQUIRED=1050" ARCH_MACOSX_VERSION_MIN="10.5"
ARCH_LDFLAGS=" -mmacosx-version-min=10.5"
fi fi
@ -71,7 +65,7 @@ NCPU=`sysctl -n hw.ncpu`
#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 LDFLAGS=$ARCH_LDFLAGS make -j$NCPU) || exit 1; (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
"./make-macosx-app.sh" release ${BUILDARCH} "./make-macosx-app.sh" release ${BUILDARCH}