diff --git a/checkin_notes b/checkin_notes index d5a37a11e6..c51238f1d2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -933,13 +933,14 @@ Charlie 24 Jan 2006 Change conditional compile #ifdef __ppc__ in mac_backtrace.C so library links properly for Intel Macs (but backtrace is disabled). Fix compile error by excluding CPDNBBC client code from Mac builds. - Remove obsolete XCode project + Remove obsolete XCode project; update build script to use new project. clientgui/ BOINCGUIApp.cpp lib/ mac_backtrace.C mac_build/ + BuildMacBOINC.sh boinc.xcodeproj/ project.pbxproj boinc.pbproj/ diff --git a/mac_build/BuildMacBOINC.sh b/mac_build/BuildMacBOINC.sh index cfd44c3514..257a71a081 100644 --- a/mac_build/BuildMacBOINC.sh +++ b/mac_build/BuildMacBOINC.sh @@ -29,7 +29,7 @@ echo "Development (debug) build" style="Development" else echo "Deployment (release) build" -style="Deployment" +style="ppc_Deployment" fi if [ "$1" = "-noclean" ] || [ "$2" = "-noclean" ]; then @@ -60,13 +60,10 @@ echo "ERROR: System 10.3.9 SDK is missing. For details, see build instructions echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/mac_build.html" exit 1 fi -elif [ "$major" = "7" ]; then -echo "Building BOINC under System 10.3" -sdkname="" else -echo "ERROR: Building BOINC requires System 10.3 or later. For details, see build instructions at " +echo "ERROR: Building BOINC requires System 10.4 or later. For details, see build instructions at " echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/mac_build.html" exit 1 fi -xcodebuild -project boinc.xcodeproj -target Build_All -buildstyle $style $doclean build NEXTROOT=$sdkname SDKROOT=$sdkname +xcodebuild -project boinc.xcodeproj -target Build_All -configuration $style $doclean build NEXTROOT=$sdkname SDKROOT=$sdkname