From d6938987577a2ccb6e50695dbf119223caef6adb Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Mon, 7 Apr 2025 17:49:38 +0200 Subject: [PATCH] Add MLNDefines.h to make sure Metal backend is available in headers (#3363) --- platform/ios/BUILD.bazel | 14 +++++++++++++- platform/ios/CHANGELOG.md | 4 ++++ platform/ios/VERSION | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/platform/ios/BUILD.bazel b/platform/ios/BUILD.bazel index a87208953..18f05e9b2 100644 --- a/platform/ios/BUILD.bazel +++ b/platform/ios/BUILD.bazel @@ -82,7 +82,17 @@ info_plist( base_info_plist = "app/Info.plist", ) +genrule( + name = "mln_defines", + outs = ["MLNDefines.h"], + cmd = select({ + "//:metal_renderer": "echo '#define MLN_RENDER_BACKEND_METAL 1' > $@", + "//conditions:default": "echo '' > $@", + }), +) + public_hdrs = [ + ":mln_defines", ":ios_public_hdrs", ":ios_sdk_hdrs", "//platform/darwin:darwin_objc_hdrs", @@ -123,8 +133,10 @@ apple_xcframework( data = glob([ "resources/*.lproj/**", "resources/*.xcassets/**", + ]) + [ + "PrivacyInfo.xcprivacy", "resources/metal-cpp-ignores.txt", - ]) + ["PrivacyInfo.xcprivacy"], + ], infoplists = ["info_plist"], ios = { "simulator": [ diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index a120e5189..46b89df38 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,6 +4,10 @@ MapLibre welcomes participation and contributions from everyone. Please read [`M ## main +## 6.12.3 + +- add MLNDefines.h to make sure Metal backend is available in headers ([#3335](https://github.com/maplibre/maplibre-native/issues/3335)). + ## 6.12.2 - Strip punctuation from attribution ([#3287](https://github.com/maplibre/maplibre-native/pull/3287)). diff --git a/platform/ios/VERSION b/platform/ios/VERSION index f867e2993..ffd41f5c6 100644 --- a/platform/ios/VERSION +++ b/platform/ios/VERSION @@ -1 +1 @@ -6.12.2 +6.12.3