diff options
Diffstat (limited to 'platform/macos')
-rw-r--r-- | platform/macos/config.cmake | 37 | ||||
-rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 6 |
2 files changed, 8 insertions, 35 deletions
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 7a179b8218..8dc3c38245 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -74,7 +74,14 @@ macro(mbgl_platform_core) ) target_link_libraries(mbgl-core - PUBLIC -lz + PUBLIC "-lz" + PUBLIC "-framework Foundation" + PUBLIC "-framework CoreGraphics" + PUBLIC "-framework OpenGL" + PUBLIC "-framework ImageIO" + PUBLIC "-framework CoreServices" + PUBLIC "-framework SystemConfiguration" + PUBLIC "-lsqlite3" ) endmacro() @@ -82,8 +89,6 @@ endmacro() macro(mbgl_platform_glfw) target_link_libraries(mbgl-glfw PRIVATE mbgl-loop-darwin - PRIVATE "-framework OpenGL" - PRIVATE "-lsqlite3" ) endmacro() @@ -91,12 +96,6 @@ endmacro() macro(mbgl_platform_render) target_link_libraries(mbgl-render PRIVATE mbgl-loop-darwin - PRIVATE "-framework Foundation" - PRIVATE "-framework CoreGraphics" - PRIVATE "-framework OpenGL" - PRIVATE "-framework ImageIO" - PRIVATE "-framework CoreServices" - PRIVATE "-lsqlite3" ) endmacro() @@ -104,12 +103,6 @@ endmacro() macro(mbgl_platform_offline) target_link_libraries(mbgl-offline PRIVATE mbgl-loop-darwin - PRIVATE "-framework Foundation" - PRIVATE "-framework CoreGraphics" - PRIVATE "-framework OpenGL" - PRIVATE "-framework ImageIO" - PRIVATE "-framework CoreServices" - PRIVATE "-lsqlite3" ) endmacro() @@ -131,12 +124,6 @@ macro(mbgl_platform_test) target_link_libraries(mbgl-test PRIVATE mbgl-loop-darwin - PRIVATE "-framework Foundation" - PRIVATE "-framework CoreGraphics" - PRIVATE "-framework OpenGL" - PRIVATE "-framework ImageIO" - PRIVATE "-framework CoreServices" - PRIVATE "-lsqlite3" ) endmacro() @@ -157,12 +144,6 @@ macro(mbgl_platform_benchmark) target_link_libraries(mbgl-benchmark PRIVATE mbgl-loop-darwin - PRIVATE "-framework Foundation" - PRIVATE "-framework CoreGraphics" - PRIVATE "-framework OpenGL" - PRIVATE "-framework ImageIO" - PRIVATE "-framework CoreServices" - PRIVATE "-lsqlite3" ) endmacro() @@ -172,8 +153,6 @@ macro(mbgl_platform_node) ) target_link_libraries(mbgl-node - PRIVATE "-framework Foundation" - PRIVATE "-framework OpenGL" PRIVATE "-Wl,-bind_at_load" ) endmacro() diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 2c28da298b..ce4317c264 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -64,13 +64,11 @@ 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 */; }; - 52BECB0A1CC5A26F009CD791 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BECB091CC5A26F009CD791 /* SystemConfiguration.framework */; }; 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 */; }; 558DE7A61E56161C00C7916D /* MGLFoundation_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 558DE7A41E56161C00C7916D /* MGLFoundation_Private.h */; }; 558DE7A71E56161C00C7916D /* MGLFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 558DE7A51E56161C00C7916D /* MGLFoundation.mm */; }; - 55D9B4B11D005D3900C1CCE2 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 55D9B4B01D005D3900C1CCE2 /* libz.tbd */; }; 55E2AD111E5B0A6900E8C587 /* MGLOfflineStorageTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55E2AD101E5B0A6900E8C587 /* MGLOfflineStorageTests.mm */; }; 920A3E591E6F859D00C16EFC /* MGLSourceQueryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 920A3E581E6F859D00C16EFC /* MGLSourceQueryTests.m */; }; 920A3E5B1E6F8E0700C16EFC /* query-style.json in Resources */ = {isa = PBXBuildFile; fileRef = 920A3E5A1E6F8E0700C16EFC /* query-style.json */; }; @@ -215,7 +213,6 @@ DAE6C3BE1CC31F2E00DB3429 /* default_marker.pdf in Resources */ = {isa = PBXBuildFile; fileRef = DAE6C3BB1CC31F2E00DB3429 /* default_marker.pdf */; }; DAE6C3BF1CC31F2E00DB3429 /* mapbox.pdf in Resources */ = {isa = PBXBuildFile; fileRef = DAE6C3BC1CC31F2E00DB3429 /* mapbox.pdf */; }; DAE6C3C21CC31F4500DB3429 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE6C3C11CC31F4500DB3429 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DAE6C3C71CC3499100DB3429 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3C61CC3499100DB3429 /* libsqlite3.tbd */; }; DAE6C3D21CC34C9900DB3429 /* MGLGeometryTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C3C81CC34BD800DB3429 /* MGLGeometryTests.mm */; }; DAE6C3D31CC34C9900DB3429 /* MGLOfflinePackTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C3C91CC34BD800DB3429 /* MGLOfflinePackTests.m */; }; DAE6C3D41CC34C9900DB3429 /* MGLOfflineRegionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C3CA1CC34BD800DB3429 /* MGLOfflineRegionTests.m */; }; @@ -573,11 +570,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 52BECB0A1CC5A26F009CD791 /* SystemConfiguration.framework in Frameworks */, 5548BE781D09E718005DDE81 /* libmbgl-core.a in Frameworks */, - DAE6C3C71CC3499100DB3429 /* libsqlite3.tbd in Frameworks */, 52B5D17F1E5E26DF00BBCB48 /* libmbgl-loop-darwin.a in Frameworks */, - 55D9B4B11D005D3900C1CCE2 /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; |