summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-18 18:01:30 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-19 16:28:30 -0700
commita883ac9253f19a850fe9d60e5479428cfc8fb54d (patch)
tree588488628387ad805b878f2f8da30ddaf948f5fa /platform
parent2d33ae5ed77cbea3dc7352c23fa6a6fa91dc8a02 (diff)
downloadqtlocation-mapboxgl-a883ac9253f19a850fe9d60e5479428cfc8fb54d.tar.gz
[osx] Build output goes to build/osx
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/osx.xcodeproj/project.pbxproj2
-rw-r--r--platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme2
-rw-r--r--platform/osx/osx.xcworkspace/contents.xcworkspacedata2
-rw-r--r--platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme8
-rw-r--r--platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme8
-rw-r--r--platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme8
-rw-r--r--platform/osx/platform.gyp2
-rw-r--r--platform/osx/scripts/osxtest.xcscheme2
8 files changed, 17 insertions, 17 deletions
diff --git a/platform/osx/osx.xcodeproj/project.pbxproj b/platform/osx/osx.xcodeproj/project.pbxproj
index 9db664b25e..4854858df8 100644
--- a/platform/osx/osx.xcodeproj/project.pbxproj
+++ b/platform/osx/osx.xcodeproj/project.pbxproj
@@ -222,7 +222,7 @@
DAE6C3BC1CC31F2E00DB3429 /* mapbox.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = mapbox.pdf; path = src/resources/mapbox.pdf; sourceTree = SOURCE_ROOT; };
DAE6C3BD1CC31F2E00DB3429 /* MGLAnnotationCallout.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MGLAnnotationCallout.xib; path = src/resources/MGLAnnotationCallout.xib; sourceTree = SOURCE_ROOT; };
DAE6C3C11CC31F4500DB3429 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mapbox.h; sourceTree = "<group>"; };
- DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/osx-x86_64/mbgl.xcconfig"; sourceTree = "<group>"; };
+ DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/osx/mbgl.xcconfig"; sourceTree = "<group>"; };
DAE6C3C61CC3499100DB3429 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
DAE6C3C81CC34BD800DB3429 /* MGLGeometryTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLGeometryTests.mm; path = ../../darwin/test/MGLGeometryTests.mm; sourceTree = "<group>"; };
DAE6C3C91CC34BD800DB3429 /* MGLOfflinePackTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLOfflinePackTests.m; path = ../../darwin/test/MGLOfflinePackTests.m; sourceTree = "<group>"; };
diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
index c57f010f7b..2c9e4a3c74 100644
--- a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
+++ b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
@@ -17,7 +17,7 @@
BlueprintIdentifier = "4E8A9455A3A23B7FD2A8FC52"
BuildableName = "All"
BlueprintName = "All"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
diff --git a/platform/osx/osx.xcworkspace/contents.xcworkspacedata b/platform/osx/osx.xcworkspace/contents.xcworkspacedata
index f911e25e9f..3d745d1790 100644
--- a/platform/osx/osx.xcworkspace/contents.xcworkspacedata
+++ b/platform/osx/osx.xcworkspace/contents.xcworkspacedata
@@ -5,6 +5,6 @@
location = "container:osx.xcodeproj">
</FileRef>
<FileRef
- location = "group:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ location = "group:../../build/osx/platform/osx/platform.xcodeproj">
</FileRef>
</Workspace>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
index 16a5edcd04..c88fefb747 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
+++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
@@ -17,7 +17,7 @@
BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
BuildableName = "mbgl-offline"
BlueprintName = "mbgl-offline"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@@ -35,7 +35,7 @@
BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
BuildableName = "mbgl-offline"
BlueprintName = "mbgl-offline"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
@@ -59,7 +59,7 @@
BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
BuildableName = "mbgl-offline"
BlueprintName = "mbgl-offline"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@@ -78,7 +78,7 @@
BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
BuildableName = "mbgl-offline"
BlueprintName = "mbgl-offline"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
index 9760745772..522998bd3c 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
+++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
@@ -17,7 +17,7 @@
BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
BuildableName = "mbgl-render"
BlueprintName = "mbgl-render"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@@ -35,7 +35,7 @@
BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
BuildableName = "mbgl-render"
BlueprintName = "mbgl-render"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
@@ -59,7 +59,7 @@
BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
BuildableName = "mbgl-render"
BlueprintName = "mbgl-render"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@@ -78,7 +78,7 @@
BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
BuildableName = "mbgl-render"
BlueprintName = "mbgl-render"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme
index 678c195a28..f995e74964 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme
+++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme
@@ -17,7 +17,7 @@
BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
BuildableName = "test"
BlueprintName = "test"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@@ -35,7 +35,7 @@
BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
BuildableName = "test"
BlueprintName = "test"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
@@ -59,7 +59,7 @@
BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
BuildableName = "test"
BlueprintName = "test"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@@ -78,7 +78,7 @@
BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
BuildableName = "test"
BlueprintName = "test"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/platform/osx/platform.gyp b/platform/osx/platform.gyp
index 6279f8ca6a..cdea98982a 100644
--- a/platform/osx/platform.gyp
+++ b/platform/osx/platform.gyp
@@ -5,7 +5,7 @@
'coverage': 0,
},
'includes': [
- '../../build/osx-x86_64/config.gypi',
+ '../../build/osx/config.gypi',
'../../mbgl.gypi',
'../../test/test.gypi',
'../../bin/glfw.gypi',
diff --git a/platform/osx/scripts/osxtest.xcscheme b/platform/osx/scripts/osxtest.xcscheme
index dbc0577df8..5060703614 100644
--- a/platform/osx/scripts/osxtest.xcscheme
+++ b/platform/osx/scripts/osxtest.xcscheme
@@ -19,7 +19,7 @@
BlueprintIdentifier = "6EE19CDFBCE7BD04FE561812"
BuildableName = "osxtest.xctest"
BlueprintName = "osxtest"
- ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj">
+ ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
View Lorry Controller Status