summaryrefslogtreecommitdiff
path: root/platform/macos
diff options
context:
space:
mode:
Diffstat (limited to 'platform/macos')
-rw-r--r--platform/macos/DEVELOPING.md1
-rw-r--r--platform/macos/config.cmake9
-rw-r--r--platform/macos/core-files.txt206
-rw-r--r--platform/macos/macos.xcodeproj/project.pbxproj8
4 files changed, 212 insertions, 12 deletions
diff --git a/platform/macos/DEVELOPING.md b/platform/macos/DEVELOPING.md
index f4d946c527..8b7857cd62 100644
--- a/platform/macos/DEVELOPING.md
+++ b/platform/macos/DEVELOPING.md
@@ -52,6 +52,7 @@ To add an Objective-C header or implementation file to the macOS maps SDK:
1. Audit new headers for nullability. Typically, you will wrap a header with `NS_ASSUME_NONNULL_BEGIN` and `NS_ASSUME_NONNULL_END`.
1. _(Optional.)_ If it’s a public header, change its visibility from Project to Public and import it in [the macOS SDK’s umbrella header](./src/Mapbox.h).
1. _(Optional.)_ If the file would also be used by the iOS maps SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion iOS document](../ios/DEVELOPING.md#adding-a-source-code-file) for further instructions.
+1. Run `scripts/generate-cmake-files.js` to update the generated source file list for third party build systems.
### Adding a resource
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 6333beaeb5..d53f61f3b3 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -67,13 +67,8 @@ endmacro()
macro(mbgl_filesource)
- target_sources(mbgl-filesource
- # File source
- PRIVATE platform/darwin/src/http_file_source.mm
-
- # Database
- PRIVATE platform/default/sqlite3.cpp
- )
+ # Modify platform/darwin/filesource-files.txt to change the source files for this target.
+ target_sources_from_file(mbgl-filesource PRIVATE platform/darwin/filesource-files.txt)
target_compile_options(mbgl-filesource
PRIVATE -fobjc-arc
diff --git a/platform/macos/core-files.txt b/platform/macos/core-files.txt
new file mode 100644
index 0000000000..3c1d1aa2d0
--- /dev/null
+++ b/platform/macos/core-files.txt
@@ -0,0 +1,206 @@
+# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
+
+# SDK
+platform/macos/src/Mapbox.h
+
+# SDK/Foundation
+platform/darwin/src/MGLAccountManager.h
+platform/darwin/src/MGLAccountManager.m
+platform/darwin/src/MGLAccountManager_Private.h
+platform/darwin/src/MGLAttributionInfo.h
+platform/darwin/src/MGLAttributionInfo.mm
+platform/darwin/src/MGLAttributionInfo_Private.h
+platform/darwin/src/MGLFoundation.h
+platform/darwin/src/MGLFoundation.mm
+platform/darwin/src/MGLFoundation_Private.h
+platform/darwin/src/MGLMapCamera.h
+platform/darwin/src/MGLMapCamera.mm
+platform/darwin/src/MGLMapSnapshotter.h
+platform/darwin/src/MGLMapSnapshotter.mm
+platform/darwin/src/MGLNetworkConfiguration.h
+platform/darwin/src/MGLNetworkConfiguration.m
+platform/darwin/src/MGLRendererConfiguration.h
+platform/darwin/src/MGLRendererConfiguration.mm
+platform/darwin/src/MGLRendererFrontend.h
+platform/darwin/src/MGLStyle.h
+platform/darwin/src/MGLStyle.mm
+platform/darwin/src/MGLStyle_Private.h
+platform/darwin/src/MGLTypes.h
+platform/darwin/src/MGLTypes.m
+platform/darwin/src/MGLValueEvaluator.h
+
+# SDK/Foundation/Categories
+platform/darwin/src/NSArray+MGLAdditions.h
+platform/darwin/src/NSArray+MGLAdditions.mm
+platform/darwin/src/NSBundle+MGLAdditions.h
+platform/darwin/src/NSBundle+MGLAdditions.m
+platform/darwin/src/NSCoder+MGLAdditions.h
+platform/darwin/src/NSCoder+MGLAdditions.mm
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.h
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.h
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm
+platform/darwin/src/NSDate+MGLAdditions.h
+platform/darwin/src/NSDate+MGLAdditions.mm
+platform/darwin/src/NSDictionary+MGLAdditions.h
+platform/darwin/src/NSDictionary+MGLAdditions.mm
+platform/darwin/src/NSException+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.mm
+platform/darwin/src/NSExpression+MGLPrivateAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.mm
+platform/darwin/src/NSPredicate+MGLPrivateAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.m
+platform/darwin/src/NSString+MGLAdditions.h
+platform/darwin/src/NSString+MGLAdditions.m
+platform/darwin/src/NSURL+MGLAdditions.h
+platform/darwin/src/NSURL+MGLAdditions.m
+platform/darwin/src/NSValue+MGLAdditions.h
+platform/darwin/src/NSValue+MGLAdditions.m
+
+# SDK/Foundation/Formatters
+platform/darwin/src/MGLClockDirectionFormatter.h
+platform/darwin/src/MGLClockDirectionFormatter.m
+platform/darwin/src/MGLCompassDirectionFormatter.h
+platform/darwin/src/MGLCompassDirectionFormatter.m
+platform/darwin/src/MGLCoordinateFormatter.h
+platform/darwin/src/MGLCoordinateFormatter.m
+platform/darwin/src/MGLDistanceFormatter.h
+platform/darwin/src/MGLDistanceFormatter.m
+
+# SDK/Foundation/Geometry
+platform/darwin/src/MGLAnnotation.h
+platform/darwin/src/MGLFeature.h
+platform/darwin/src/MGLFeature.mm
+platform/darwin/src/MGLFeature_Private.h
+platform/darwin/src/MGLGeometry.h
+platform/darwin/src/MGLGeometry.mm
+platform/darwin/src/MGLGeometry_Private.h
+platform/darwin/src/MGLMultiPoint.h
+platform/darwin/src/MGLMultiPoint.mm
+platform/darwin/src/MGLMultiPoint_Private.h
+platform/darwin/src/MGLOverlay.h
+platform/darwin/src/MGLPointAnnotation.h
+platform/darwin/src/MGLPointAnnotation.mm
+platform/darwin/src/MGLPointCollection.h
+platform/darwin/src/MGLPointCollection.mm
+platform/darwin/src/MGLPointCollection_Private.h
+platform/darwin/src/MGLPolygon.h
+platform/darwin/src/MGLPolygon.mm
+platform/darwin/src/MGLPolygon_Private.h
+platform/darwin/src/MGLPolyline.h
+platform/darwin/src/MGLPolyline.mm
+platform/darwin/src/MGLPolyline_Private.h
+platform/darwin/src/MGLShape.h
+platform/darwin/src/MGLShape.mm
+platform/darwin/src/MGLShapeCollection.h
+platform/darwin/src/MGLShapeCollection.mm
+platform/darwin/src/MGLShape_Private.h
+
+# SDK/Foundation/Offline Maps
+platform/darwin/src/MGLOfflinePack.h
+platform/darwin/src/MGLOfflinePack.mm
+platform/darwin/src/MGLOfflinePack_Private.h
+platform/darwin/src/MGLOfflineRegion.h
+platform/darwin/src/MGLOfflineRegion_Private.h
+platform/darwin/src/MGLOfflineStorage.h
+platform/darwin/src/MGLOfflineStorage.mm
+platform/darwin/src/MGLOfflineStorage_Private.h
+platform/darwin/src/MGLShapeOfflineRegion.h
+platform/darwin/src/MGLShapeOfflineRegion.mm
+platform/darwin/src/MGLShapeOfflineRegion_Private.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.mm
+platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h
+
+# SDK/Foundation/Styling
+platform/darwin/src/MGLConversion.h
+platform/darwin/src/MGLLight.h
+platform/darwin/src/MGLLight.mm
+platform/darwin/src/MGLLight_Private.h
+platform/darwin/src/MGLStyleValue.h
+platform/darwin/src/MGLStyleValue.mm
+platform/darwin/src/MGLStyleValue_Private.h
+
+# SDK/Foundation/Styling/Categories
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
+
+# SDK/Foundation/Styling/Layers
+platform/darwin/src/MGLBackgroundStyleLayer.h
+platform/darwin/src/MGLBackgroundStyleLayer.mm
+platform/darwin/src/MGLCircleStyleLayer.h
+platform/darwin/src/MGLCircleStyleLayer.mm
+platform/darwin/src/MGLFillExtrusionStyleLayer.h
+platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+platform/darwin/src/MGLFillStyleLayer.h
+platform/darwin/src/MGLFillStyleLayer.mm
+platform/darwin/src/MGLForegroundStyleLayer.h
+platform/darwin/src/MGLForegroundStyleLayer.mm
+platform/darwin/src/MGLHeatmapStyleLayer.h
+platform/darwin/src/MGLHeatmapStyleLayer.mm
+platform/darwin/src/MGLHillshadeStyleLayer.h
+platform/darwin/src/MGLHillshadeStyleLayer.mm
+platform/darwin/src/MGLLineStyleLayer.h
+platform/darwin/src/MGLLineStyleLayer.mm
+platform/darwin/src/MGLOpenGLStyleLayer.h
+platform/darwin/src/MGLOpenGLStyleLayer.mm
+platform/darwin/src/MGLRasterStyleLayer.h
+platform/darwin/src/MGLRasterStyleLayer.mm
+platform/darwin/src/MGLStyleLayer.h
+platform/darwin/src/MGLStyleLayer.mm
+platform/darwin/src/MGLStyleLayer_Private.h
+platform/darwin/src/MGLSymbolStyleLayer.h
+platform/darwin/src/MGLSymbolStyleLayer.mm
+platform/darwin/src/MGLVectorStyleLayer.h
+platform/darwin/src/MGLVectorStyleLayer.m
+
+# SDK/Foundation/Styling/Sources
+platform/darwin/src/MGLComputedShapeSource.h
+platform/darwin/src/MGLComputedShapeSource.mm
+platform/darwin/src/MGLComputedShapeSource_Private.h
+platform/darwin/src/MGLImageSource.h
+platform/darwin/src/MGLImageSource.mm
+platform/darwin/src/MGLRasterDEMSource.h
+platform/darwin/src/MGLRasterDEMSource.mm
+platform/darwin/src/MGLRasterTileSource.h
+platform/darwin/src/MGLRasterTileSource.mm
+platform/darwin/src/MGLRasterTileSource_Private.h
+platform/darwin/src/MGLShapeSource.h
+platform/darwin/src/MGLShapeSource.mm
+platform/darwin/src/MGLShapeSource_Private.h
+platform/darwin/src/MGLSource.h
+platform/darwin/src/MGLSource.mm
+platform/darwin/src/MGLSource_Private.h
+platform/darwin/src/MGLTileSource.h
+platform/darwin/src/MGLTileSource.mm
+platform/darwin/src/MGLTileSource_Private.h
+platform/darwin/src/MGLVectorTileSource.h
+platform/darwin/src/MGLVectorTileSource.mm
+platform/darwin/src/MGLVectorTileSource_Private.h
+
+# SDK/Kit
+platform/macos/src/MGLAnnotationImage.h
+platform/macos/src/MGLAnnotationImage.m
+platform/macos/src/MGLAnnotationImage_Private.h
+platform/macos/src/MGLAttributionButton.h
+platform/macos/src/MGLAttributionButton.mm
+platform/macos/src/MGLCompassCell.h
+platform/macos/src/MGLCompassCell.m
+platform/macos/src/MGLMapView+IBAdditions.h
+platform/macos/src/MGLMapView+IBAdditions.mm
+platform/macos/src/MGLMapView.h
+platform/macos/src/MGLMapView.mm
+platform/macos/src/MGLMapViewDelegate.h
+platform/macos/src/MGLMapView_Private.h
+platform/macos/src/MGLOpenGLLayer.h
+platform/macos/src/MGLOpenGLLayer.mm
+
+# SDK/Kit/Categories
+platform/macos/src/NSColor+MGLAdditions.h
+platform/macos/src/NSColor+MGLAdditions.mm
+platform/macos/src/NSImage+MGLAdditions.h
+platform/macos/src/NSImage+MGLAdditions.mm
+
diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj
index 1785caddb9..656121030c 100644
--- a/platform/macos/macos.xcodeproj/project.pbxproj
+++ b/platform/macos/macos.xcodeproj/project.pbxproj
@@ -24,7 +24,6 @@
1F95931B1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */; };
1F9EF4061FBA1B0E0063FBB0 /* mapbox_helmet.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */; };
1FC481852098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FC481842098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h */; };
- 30E5781B1DAA857E0050F07E /* NSImage+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 30E578141DAA7D920050F07E /* NSImage+MGLAdditions.h */; };
3508EC641D749D39009B0EE4 /* NSExpression+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3508EC621D749D39009B0EE4 /* NSExpression+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
3508EC651D749D39009B0EE4 /* NSExpression+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3508EC631D749D39009B0EE4 /* NSExpression+MGLAdditions.mm */; };
3526EABD1DF9B19800006B43 /* MGLCodingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3526EABC1DF9B19800006B43 /* MGLCodingTests.m */; };
@@ -79,6 +78,7 @@
40E1601D1DF217D6005EA6D9 /* MGLStyleLayerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 40E1601B1DF216E6005EA6D9 /* MGLStyleLayerTests.m */; };
52B5D17F1E5E26DF00BBCB48 /* libmbgl-loop-darwin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5548BE7B1D0ACBBD005DDE81 /* libmbgl-loop-darwin.a */; };
52B5D1801E5E26DF00BBCB48 /* libmbgl-loop-darwin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5548BE7B1D0ACBBD005DDE81 /* libmbgl-loop-darwin.a */; };
+ 55335DF9212EC542000CE5F8 /* NSImage+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 405C03961DB0004E001AC280 /* NSImage+MGLAdditions.h */; };
5548BE781D09E718005DDE81 /* libmbgl-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3451CC31D1200DB3429 /* libmbgl-core.a */; };
556660C61E1BEA0100E2C41B /* MGLFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 556660C51E1BEA0100E2C41B /* MGLFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
556660D61E1D07E400E2C41B /* MGLVersionNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 556660D51E1D07E400E2C41B /* MGLVersionNumber.m */; };
@@ -315,7 +315,6 @@
1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; };
1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mapbox_helmet.pdf; sourceTree = "<group>"; };
1FC481842098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLPrivateAdditions.h"; sourceTree = "<group>"; };
- 30E578141DAA7D920050F07E /* NSImage+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSImage+MGLAdditions.h"; path = "src/NSImage+MGLAdditions.h"; sourceTree = SOURCE_ROOT; };
3508EC621D749D39009B0EE4 /* NSExpression+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSExpression+MGLAdditions.h"; sourceTree = "<group>"; };
3508EC631D749D39009B0EE4 /* NSExpression+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSExpression+MGLAdditions.mm"; sourceTree = "<group>"; };
3526EABC1DF9B19800006B43 /* MGLCodingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLCodingTests.m; path = ../../darwin/test/MGLCodingTests.m; sourceTree = "<group>"; };
@@ -796,7 +795,6 @@
DA33895E1FA3E997001EA329 /* Recovered References */ = {
isa = PBXGroup;
children = (
- 30E578141DAA7D920050F07E /* NSImage+MGLAdditions.h */,
);
name = "Recovered References";
sourceTree = "<group>";
@@ -1221,7 +1219,6 @@
35C5D8471D6DD66D00E95907 /* NSComparisonPredicate+MGLAdditions.h in Headers */,
DAE6C3A31CC31E9400DB3429 /* MGLAnnotationImage.h in Headers */,
DAE6C3A41CC31E9400DB3429 /* MGLMapView.h in Headers */,
- 355BA4ED1D41633E00CCC6D5 /* NSColor+MGLAdditions.h in Headers */,
DAE6C3611CC31E0400DB3429 /* MGLOfflineStorage.h in Headers */,
352742781D4C220900A1ECE6 /* MGLStyleValue.h in Headers */,
DAE6C35E1CC31E0400DB3429 /* MGLMultiPoint.h in Headers */,
@@ -1247,7 +1244,6 @@
DAE6C3991CC31E2A00DB3429 /* NSException+MGLAdditions.h in Headers */,
DA8F25871D51C9E10010E6B5 /* MGLBackgroundStyleLayer.h in Headers */,
4049C2A51DB6CE7F00B3F799 /* MGLPointCollection.h in Headers */,
- 30E5781B1DAA857E0050F07E /* NSImage+MGLAdditions.h in Headers */,
DAE6C3661CC31E0400DB3429 /* MGLShape.h in Headers */,
DA551B831DB496AC0009AFAF /* MGLTileSource_Private.h in Headers */,
DAC25FCA200FD5E2009BE98E /* NSExpression+MGLPrivateAdditions.h in Headers */,
@@ -1268,6 +1264,7 @@
DA8F258B1D51CA540010E6B5 /* MGLLineStyleLayer.h in Headers */,
35C6DF841E214C0400ACA483 /* MGLDistanceFormatter.h in Headers */,
DA8F25B21D51CB270010E6B5 /* NSValue+MGLStyleAttributeAdditions.h in Headers */,
+ 55335DF9212EC542000CE5F8 /* NSImage+MGLAdditions.h in Headers */,
1F7454A31ECFB00300021D39 /* MGLLight_Private.h in Headers */,
359819591E02F611008FC139 /* NSCoder+MGLAdditions.h in Headers */,
DAE6C38E1CC31E2A00DB3429 /* MGLOfflineStorage_Private.h in Headers */,
@@ -1295,6 +1292,7 @@
DAE6C3B91CC31EF300DB3429 /* MGLOpenGLLayer.h in Headers */,
DAF0D80E1DFE0E5D00B28378 /* MGLPointCollection_Private.h in Headers */,
35D65C5A1D65AD5500722C23 /* NSDate+MGLAdditions.h in Headers */,
+ 355BA4ED1D41633E00CCC6D5 /* NSColor+MGLAdditions.h in Headers */,
DAE6C3891CC31E2A00DB3429 /* MGLMultiPoint_Private.h in Headers */,
DAE6C3A51CC31E9400DB3429 /* MGLMapView+IBAdditions.h in Headers */,
DA35A2AD1CCA091800E826B2 /* MGLCompassDirectionFormatter.h in Headers */,
View Lorry Controller Status