diff options
author | Ant <anthony@dervishsoftware.com> | 2014-10-08 20:41:45 +0100 |
---|---|---|
committer | Ant <anthony@dervishsoftware.com> | 2014-10-08 20:41:45 +0100 |
commit | 8d3a71cd9d0b83b7de71fca0e7f91dea1d7bf566 (patch) | |
tree | 08c37be3f7b038b52c3bbcae0ac23af2ec2d4087 | |
parent | 5c95fccab85d182976558e634fd4edf6dd8a0834 (diff) |
Only prepare the pre-requisites for the current SDKROOT
-rwxr-xr-x | build-mac/mailcore2.xcodeproj/project.pbxproj | 2 | ||||
-rwxr-xr-x | scripts/prepare.sh | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index 0f011a20..17898be9 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -4513,6 +4513,7 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_NAME = MailCore; SDKROOT = macosx; }; @@ -4523,6 +4524,7 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_NAME = MailCore; SDKROOT = macosx; }; diff --git a/scripts/prepare.sh b/scripts/prepare.sh index 9b76ec12..6ba0c188 100755 --- a/scripts/prepare.sh +++ b/scripts/prepare.sh @@ -1,4 +1,15 @@ #!/bin/sh -./prepare-mac.sh -./prepare-ios.sh +# If this script is run outside of Xcode, prepare both platforms by default +if [ -z "$SDKROOT" ]; then + SDKROOT="MacOSX iPhone" +fi + +if echo "$SDKROOT" | grep -q "MacOSX"; then + echo "Preparing Mac" + ./prepare-mac.sh +fi +if echo "$SDKROOT" | grep -q "iPhone"; then + echo "Preparing iOS" + ./prepare-ios.sh +fi |