diff options
| author |  Ant <anthony@dervishsoftware.com> | 2014-10-08 21:03:43 +0100 |
|---|---|---|
| committer | Ant <anthony@dervishsoftware.com> | 2014-10-08 21:03:43 +0100 |
| commit | 0b5d682382b50088d0b54a6deefd845f404811e9 (patch) | |
| tree | 0618178e889f57e9afcd4d61b8848903d7222100 | |
| parent | 8d3a71cd9d0b83b7de71fca0e7f91dea1d7bf566 (diff) | |
Revert "Only prepare the pre-requisites for the current SDKROOT"
This reverts commit 8d3a71cd9d0b83b7de71fca0e7f91dea1d7bf566.
| -rwxr-xr-x | build-mac/mailcore2.xcodeproj/project.pbxproj | 2 | ||||
| -rwxr-xr-x | scripts/prepare.sh | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index 17898be9..0f011a20 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -4513,7 +4513,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_NAME = MailCore; SDKROOT = macosx; }; @@ -4524,7 +4523,6 @@ 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 6ba0c188..9b76ec12 100755 --- a/scripts/prepare.sh +++ b/scripts/prepare.sh @@ -1,15 +1,4 @@ #!/bin/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 +./prepare-mac.sh +./prepare-ios.sh |