FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use make instead of xcodebuild to compile Mac.

Browse Source 
Xcode seems to be overriding the setting of min-macos-version,
which is causing 10.7 and 10.8 support to fail. See if using
make resolves this.
This commit is contained in:
James Turner
2015-12-08 18:40:02 +00:00
parent 3aacabdfd0
commit 0c36cc3eef
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hudson_mac_build_release.sh
+9 -4
View File
@@ -21,30 +21,35 @@ echo "Build path is: $PATH"
############################################################################### ###############################################################################
echo "Starting on SimGear" echo "Starting on SimGear"
pushd sgBuild pushd sgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear
# compile # compile
xcodebuild -configuration RelWithDebInfo -target install build make $MAKEOPTIONS
if [ $? -ne '0' ]; then if [ $? -ne '0' ]; then
echo "make simgear failed" echo "make simgear failed"
exit 1 exit 1
fi fi
make install
popd popd
################################################################################ ################################################################################
echo "Starting on FlightGear" echo "Starting on FlightGear"
pushd fgBuild pushd fgBuild
cmake -DFG_NIGHTLY=1 -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear cmake -DFG_NIGHTLY=1 -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear
xcodebuild -configuration RelWithDebInfo -target install build make $MAKEOPTIONS
if [ $? -ne '0' ]; then if [ $? -ne '0' ]; then
echo "make flightgear failed" echo "make flightgear failed"
exit 1 exit 1
fi fi
make install
popd popd
chmod +x $WORKSPACE/dist/bin/osgversion chmod +x $WORKSPACE/dist/bin/osgversion