diff --git a/.gitignore b/.gitignore index 09216b63e..16fd24510 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ xcuserdata /platform/ios/benchmark/assets/glyphs/DIN* /platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6 **/token -/platform/osx/osx.xcworkspace/xcshareddata/osx.xcscmblueprint +/platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index 632686f3d..f9b40af23 100644 --- a/.ycm_extra_conf.py +++ b/.ycm_extra_conf.py @@ -37,7 +37,7 @@ import ycm_core compilation_database_folders = [ 'build/linux-x86_64/Release', - 'build/osx/Release', + 'build/macos/Release', ] subprocess.call(['make compdb'], shell=True) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index a4405e6ba..590ea9772 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -2,7 +2,7 @@ This document aims to outline at a high level the various parts that make up map # Repository structure -mapbox-gl-native uses a monolithic that houses both core C++ code and code that wraps the C++ core with SDKs for Android, iOS, OS X, Node.js, and Qt. A "monorepo" allows us to: +mapbox-gl-native uses a monolithic that houses both core C++ code and code that wraps the C++ core with SDKs for Android, iOS, macOS, Node.js, and Qt. A "monorepo" allows us to: * Make changes to the core API and SDKs simultaneously, ensuring no platform falls behind. * Ensure that core changes do not inadvertently break SDK tests. @@ -42,7 +42,7 @@ We track mason dependencies for a given platform in the file `platform/