diff --git a/platform/macos/common.xcconfig b/platform/darwin/darwin.xcconfig similarity index 100% rename from platform/macos/common.xcconfig rename to platform/darwin/darwin.xcconfig diff --git a/platform/ios/common.xcconfig b/platform/ios/common.xcconfig deleted file mode 100644 index 9240a6f42..000000000 --- a/platform/ios/common.xcconfig +++ /dev/null @@ -1,82 +0,0 @@ -ALWAYS_SEARCH_USER_PATHS = NO - -CLANG_ANALYZER_GCD_PERFORMANCE = YES -CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES -CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES -CLANG_ANALYZER_NONNULL = YES -CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES -CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES -CLANG_CXX_LANGUAGE_STANDARD = c++14 -CLANG_CXX_LIBRARY = libc++ -CLANG_ENABLE_OBJC_ARC = YES -CLANG_WARN__DUPLICATE_METHOD_MATCH = YES -CLANG_WARN__DUPLICATE_METHOD_MATCH = YES -CLANG_WARN_ASSIGN_ENUM = YES -CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES -CLANG_WARN_BOOL_CONVERSION = YES -CLANG_WARN_COMMA = YES -CLANG_WARN_CONSTANT_CONVERSION = YES -CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES -CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR -CLANG_WARN_DOCUMENTATION_COMMENTS = YES -CLANG_WARN_EMPTY_BODY = YES -CLANG_WARN_ENUM_CONVERSION = YES -CLANG_WARN_INFINITE_RECURSION = YES -CLANG_WARN_INT_CONVERSION = YES -CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES -CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES -CLANG_WARN_OBJC_INTERFACE_IVARS = YES -CLANG_WARN_OBJC_LITERAL_CONVERSION = YES -CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR -CLANG_WARN_RANGE_LOOP_ANALYSIS = YES -CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES -CLANG_WARN_STRICT_PROTOTYPES = YES -CLANG_WARN_SUSPICIOUS_MOVE = YES -CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE -CLANG_WARN_UNREACHABLE_CODE = YES - -ENABLE_STRICT_OBJC_MSGSEND = YES - -GCC_C_LANGUAGE_STANDARD = gnu99 -GCC_DYNAMIC_NO_PIC = NO -GCC_ENABLE_CPP_RTTI = NO -GCC_NO_COMMON_BLOCKS = YES -GCC_TREAT_WARNINGS_AS_ERRORS = YES -GCC_WARN_64_TO_32_BIT_CONVERSION = YES -GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES -GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR -GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES -GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES -GCC_WARN_SHADOW = YES -GCC_WARN_SIGN_COMPARE = YES -GCC_WARN_UNDECLARED_SELECTOR = YES -GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE -GCC_WARN_UNKNOWN_PRAGMAS = YES -GCC_WARN_UNUSED_FUNCTION = YES -GCC_WARN_UNUSED_LABEL = YES -GCC_WARN_UNUSED_VARIABLE = YES - -HEADER_SEARCH_PATHS = $(inherited) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include" "$(PROJECT_DIR)/../../platform/darwin/include" "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/darwin/include" - -LD_GENERATE_MAP_FILE = YES - -LIBRARY_SEARCH_PATHS = $(inherited) $(PROJECT_DIR) $(PROJECT_DIR)/vendor/mapbox-accounts-ios - -OTHER_CFLAGS = $(inherited) -fvisibility=hidden -OTHER_CPLUSPLUSFLAGS = $(inherited) -fvisibility=hidden -fcxx-modules -OTHER_SWIFT_FLAGS = -warnings-as-errors - -// User defined -BITCODE_GENERATION_MODE = bitcode -CURRENT_COMMIT_HASH = deadbeef -CURRENT_SEMANTIC_VERSION = 1.0.0 -CURRENT_SHORT_VERSION = 1.0 - -// TODO: -CLANG_USE_OPTIMIZATION_PROFILE = NO -CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO -CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO -CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO - -// Add developer config -#include? "developer.xcconfig" diff --git a/platform/ios/ios.xcconfig b/platform/ios/ios.xcconfig new file mode 100644 index 000000000..609539315 --- /dev/null +++ b/platform/ios/ios.xcconfig @@ -0,0 +1,3 @@ +#include "../darwin/darwin.xcconfig" + +LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS) $(PROJECT_DIR)/vendor/mapbox-accounts-ios diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index bb814fa15..a73b7377f 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -1080,7 +1080,7 @@ CAB36C3A2374D11600592F74 /* libMapboxMobileEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMapboxMobileEvents.a; sourceTree = BUILT_PRODUCTS_DIR; }; CAB36C3D2374D7DE00592F74 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = ../../build/ios/pkg/static/Mapbox.framework; sourceTree = ""; }; CAD9D0A922A86D6F001B25EE /* MGLResourceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLResourceTests.mm; path = ../../darwin/test/MGLResourceTests.mm; sourceTree = ""; }; - CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = ""; }; + CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ios.xcconfig; sourceTree = ""; }; CAE7AD5320F46EF5003B6782 /* integration-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "integration-Bridging-Header.h"; sourceTree = ""; }; CAE7AD5420F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MGLMapSnapshotterSwiftTests.swift; sourceTree = ""; }; CAFB3C13234505D500399265 /* MGLMapSnapshotter_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLMapSnapshotter_Private.h; sourceTree = ""; }; @@ -1289,6 +1289,8 @@ DABCABC01CB80717000A7C39 /* locations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locations.hpp; sourceTree = ""; }; DAC25FCB200FD83E009BE98E /* NSExpression+MGLPrivateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSExpression+MGLPrivateAdditions.h"; sourceTree = ""; }; DAC49C621CD07D74009E1AA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; + DAC832642404AF9000A61BF8 /* darwin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = darwin.xcconfig; path = ../darwin/darwin.xcconfig; sourceTree = ""; }; + DAC832672404AFBB00A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; DACA86242019218500E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA86252019218500E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACBC60B20118ABE00C4D7E2 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; @@ -1745,7 +1747,6 @@ DA1DC9411CB6C1C2006E619F = { isa = PBXGroup; children = ( - CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */, 1F7839A5235E137000D4D606 /* sideload_sat.db */, 402E9DE21CD3A56500FD4519 /* Playground */, DA1DC94C1CB6C1C2006E619F /* Demo App */, @@ -2100,6 +2101,9 @@ isa = PBXGroup; children = ( 9C6E284822A984120056B7BE /* Makefile */, + DAC832672404AFBB00A61BF8 /* ci.xcconfig */, + DAC832642404AF9000A61BF8 /* darwin.xcconfig */, + CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */, DA35A2D11CCAB25200E826B2 /* jazzy.yml */, ); name = Configuration; @@ -3494,7 +3498,7 @@ /* Begin XCBuildConfiguration section */ 16376B0E1FFD9DAF0000563E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3524,7 +3528,7 @@ }; 16376B0F1FFD9DAF0000563E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3553,7 +3557,7 @@ }; 16376B431FFDB4B40000563E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3579,7 +3583,7 @@ }; 16376B441FFDB4B40000563E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3625,7 +3629,7 @@ }; 96AF1AA421B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = NO; @@ -3667,7 +3671,7 @@ }; 96AF1AA621B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -3691,7 +3695,7 @@ }; 96AF1AA721B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; @@ -3741,7 +3745,7 @@ }; 96AF1AA921B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; INFOPLIST_FILE = test/Info.plist; @@ -3767,7 +3771,7 @@ }; 96AF1AAA21B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3796,7 +3800,7 @@ }; 96AF1AAB21B615A3007CB696 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3864,7 +3868,7 @@ }; DA1DC9621CB6C1C2006E619F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = NO; @@ -3879,7 +3883,7 @@ }; DA1DC9631CB6C1C2006E619F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = NO; @@ -3894,7 +3898,7 @@ }; DA2E885A1CC036F400F24E7B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; INFOPLIST_FILE = test/Info.plist; @@ -3921,7 +3925,7 @@ }; DA2E885B1CC036F400F24E7B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; INFOPLIST_FILE = test/Info.plist; @@ -3947,7 +3951,7 @@ }; DA8847DB1CBAF91600AB86E3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -3969,7 +3973,7 @@ }; DA8847DC1CBAF91600AB86E3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -4017,7 +4021,7 @@ }; DAA4E41A1CBB71D500178DFB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; @@ -4055,7 +4059,7 @@ }; DAA4E41B1CBB71D500178DFB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* common.xcconfig */; + baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; diff --git a/platform/macos/macos.xcconfig b/platform/macos/macos.xcconfig new file mode 100644 index 000000000..c917dee7e --- /dev/null +++ b/platform/macos/macos.xcconfig @@ -0,0 +1 @@ +#include "../darwin/darwin.xcconfig" diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 4f5d12b96..30b15aab9 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -600,7 +600,11 @@ DAA999001E9F5EC5002E6EA6 /* MGLFillExtrusionStyleLayerTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLFillExtrusionStyleLayerTests.mm; sourceTree = ""; }; DAC25FC9200FD5E2009BE98E /* NSExpression+MGLPrivateAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSExpression+MGLPrivateAdditions.h"; sourceTree = ""; }; DAC2ABC41CC6D343006D18C4 /* MGLAnnotationImage_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationImage_Private.h; sourceTree = ""; }; - DAC8325E240497AC00A61BF8 /* common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = ""; }; + DAC832622404AF4300A61BF8 /* macos.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macos.xcconfig; sourceTree = ""; }; + DAC832632404AF7F00A61BF8 /* darwin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = darwin.xcconfig; path = ../darwin/darwin.xcconfig; sourceTree = ""; }; + DAC832652404AF9E00A61BF8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../Makefile; sourceTree = ""; }; + DAC832662404AFB400A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; + DAC832682404B26400A61BF8 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = jazzy.yml; sourceTree = ""; }; DACA8620201920BE00E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA8621201920BE00E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACB0C371E18DFFD005DDBEA /* MGLStyle+MBXAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLStyle+MBXAdditions.h"; sourceTree = ""; }; @@ -1291,7 +1295,11 @@ DAE6C3C41CC31F7800DB3429 /* Configuration */ = { isa = PBXGroup; children = ( - DAC8325E240497AC00A61BF8 /* common.xcconfig */, + DAC832652404AF9E00A61BF8 /* Makefile */, + DAC832662404AFB400A61BF8 /* ci.xcconfig */, + DAC832632404AF7F00A61BF8 /* darwin.xcconfig */, + DAC832622404AF4300A61BF8 /* macos.xcconfig */, + DAC832682404B26400A61BF8 /* jazzy.yml */, ); name = Configuration; sourceTree = ""; @@ -2071,7 +2079,7 @@ }; DA839EAA1CC2E3400062CAFB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -2088,7 +2096,7 @@ }; DA839EAB1CC2E3400062CAFB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -2129,7 +2137,7 @@ }; DAE6C33F1CC30DB200DB3429 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -2152,7 +2160,7 @@ }; DAE6C3401CC30DB200DB3429 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -2179,7 +2187,7 @@ }; DAE6C3411CC30DB200DB3429 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; @@ -2203,7 +2211,7 @@ }; DAE6C3421CC30DB200DB3429 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAC8325E240497AC00A61BF8 /* common.xcconfig */; + baseConfigurationReference = DAC832622404AF4300A61BF8 /* macos.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES;