diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-18 18:08:54 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-19 16:28:30 -0700 |
commit | 4bc4d35c602cc8f51db9491f4aae31facd6b7644 (patch) | |
tree | 8384d43560c878f3f61fb5472d692e6a904c8d8e /platform | |
parent | a883ac9253f19a850fe9d60e5479428cfc8fb54d (diff) | |
download | qtlocation-mapboxgl-4bc4d35c602cc8f51db9491f4aae31facd6b7644.tar.gz |
[ios] Build output goes to build/ios
Diffstat (limited to 'platform')
-rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme | 2 | ||||
-rw-r--r-- | platform/ios/ios.xcworkspace/contents.xcworkspacedata | 2 | ||||
-rw-r--r-- | platform/ios/platform.gyp | 2 | ||||
-rwxr-xr-x | platform/ios/scripts/package.sh | 2 | ||||
-rw-r--r-- | platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 8af6159418..776fea3889 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -377,7 +377,7 @@ DABCABBB1CB80692000A7C39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; DABCABBF1CB80717000A7C39 /* locations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locations.cpp; sourceTree = "<group>"; }; DABCABC01CB80717000A7C39 /* locations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locations.hpp; sourceTree = "<group>"; }; - DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/ios-all/mbgl.xcconfig"; sourceTree = "<group>"; }; + DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/ios/mbgl.xcconfig"; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1188,7 +1188,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SYMROOT = "../../build/ios-all"; + SYMROOT = "../../build/ios"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1227,7 +1227,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SYMROOT = "../../build/ios-all"; + SYMROOT = "../../build/ios"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index b22ae3c001..26982c0747 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "4E8A9455A3A23B7FD2A8FC52" BuildableName = "All" BlueprintName = "All" - ReferencedContainer = "container:../../build/ios-all/platform/ios/platform.xcodeproj"> + ReferencedContainer = "container:../../build/ios/platform/ios/platform.xcodeproj"> </BuildableReference> </BuildActionEntry> <BuildActionEntry diff --git a/platform/ios/ios.xcworkspace/contents.xcworkspacedata b/platform/ios/ios.xcworkspace/contents.xcworkspacedata index 3853c3fce1..929ade2fee 100644 --- a/platform/ios/ios.xcworkspace/contents.xcworkspacedata +++ b/platform/ios/ios.xcworkspace/contents.xcworkspacedata @@ -11,6 +11,6 @@ location = "group:uitest/KIF/KIF.xcodeproj"> </FileRef> <FileRef - location = "group:../../build/ios-all/platform/ios/platform.xcodeproj"> + location = "group:../../build/ios/platform/ios/platform.xcodeproj"> </FileRef> </Workspace> diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp index 0f744691c4..9fd2b3de8f 100644 --- a/platform/ios/platform.gyp +++ b/platform/ios/platform.gyp @@ -5,7 +5,7 @@ 'coverage': 0, }, 'includes': [ - '../../build/ios-all/config.gypi', + '../../build/ios/config.gypi', '../../mbgl.gypi', '../../test/test.gypi', ], diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index 5396ee7667..e1f07ff435 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -6,7 +6,7 @@ set -u NAME=Mapbox OUTPUT=build/ios/pkg -DERIVED_DATA=build/DerivedData/ios +DERIVED_DATA=build/ios PRODUCTS=${DERIVED_DATA}/Build/Products BUILDTYPE=${BUILDTYPE:-Release} diff --git a/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj b/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj index 0bc0eb5482..f033d51da3 100644 --- a/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj +++ b/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SYMROOT = "../../../build/ios-all"; + SYMROOT = "../../../build/ios"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -434,7 +434,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; - SYMROOT = "../../../build/ios-all"; + SYMROOT = "../../../build/ios"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; |