diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-01-10 17:44:27 -0500 |
|---|---|---|
| committer | Julian Rex <julian.rex@mapbox.com> | 2019-01-10 17:44:27 -0500 |
| commit | e678de10ec2afef28b99ca33f7755ef49ab17fc9 (patch) | |
| tree | 9d3d998542fb5c0110eb3a37969d841c56f43068 | |
| parent | 6a31c9987bc8b8f67c20dea8d437d72d109d6be1 (diff) | |
| download | qtlocation-mapboxgl-upstream/jrex/workspace-build-locations.tar.gz | |
Update ios build locations (does not include macos changes).upstream/jrex/workspace-build-locations
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | platform/ios/WorkspaceSettings.xcsettings | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -196,13 +196,14 @@ endif ifeq ($(HOST_PLATFORM), macos) IOS_OUTPUT_PATH = build/ios +IOS_DERIVED_DATA = $(IOS_OUTPUT_PATH)/Build IOS_PROJ_PATH = $(IOS_OUTPUT_PATH)/mbgl.xcodeproj IOS_WORK_PATH = platform/ios/ios.xcworkspace IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad IOS_XCODEBUILD_SIM = xcodebuild \ ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \ - -derivedDataPath $(IOS_OUTPUT_PATH) \ + -derivedDataPath $(IOS_DERIVED_DATA) \ -configuration $(BUILDTYPE) -sdk iphonesimulator \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ -workspace $(IOS_WORK_PATH) diff --git a/platform/ios/WorkspaceSettings.xcsettings b/platform/ios/WorkspaceSettings.xcsettings index 20a7accf01..b7018a7ccc 100644 --- a/platform/ios/WorkspaceSettings.xcsettings +++ b/platform/ios/WorkspaceSettings.xcsettings @@ -5,13 +5,13 @@ <key>BuildLocationStyle</key> <string>CustomLocation</string> <key>CustomBuildIntermediatesPath</key> - <string>../../build/ios</string> + <string>../../build/ios/Build/Intermediates</string> <key>CustomBuildLocationType</key> <string>RelativeToWorkspace</string> <key>CustomBuildProductsPath</key> - <string>../../build/ios</string> + <string>../../build/ios/Build/Products</string> <key>DerivedDataCustomLocation</key> - <string>../../build/ios</string> + <string>../../build/ios/DerivedData</string> <key>DerivedDataLocationStyle</key> <string>WorkspaceRelativePath</string> <key>IssueFilterStyle</key> |