diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-21 09:53:54 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-11-09 18:12:25 +0000 |
| commit | a5bf211e128b4fb916edcf5f46bd23d3ff222711 (patch) | |
| tree | 12ee77e7630c4995bc2060445936b8bbe1096c57 /osdep | |
| parent | 051ba909b4107240d643e4793efa2ceb714fd1b4 (diff) | |
| download | mpv-a5bf211e128b4fb916edcf5f46bd23d3ff222711.tar.bz2 mpv-a5bf211e128b4fb916edcf5f46bd23d3ff222711.tar.xz | |
meson: remove several macos-10-* build options
These have been build options since the waf build, but that doesn't
really make sense. The build can detect whatever macOS sdk version is
available and then use that information to determine whether to enable
the features or not. Potentially disabling multiple sdk versions doesn't
really make any sense. Because f5ca11e12bc55d14bd6895b619c4abfd470c6452
effectively made macOS 10.15 the minimum supported version, we can drop
all of these checks and bump the required sdk version to 10.15. The rest
of the build simplifies from there.
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/macos/swift_compat.swift | 17 | ||||
| -rw-r--r-- | osdep/meson.build | 8 |
2 files changed, 0 insertions, 25 deletions
diff --git a/osdep/macos/swift_compat.swift b/osdep/macos/swift_compat.swift index 24c00b0ae1..1c8f28f810 100644 --- a/osdep/macos/swift_compat.swift +++ b/osdep/macos/swift_compat.swift @@ -15,23 +15,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#if !HAVE_MACOS_10_14_FEATURES -extension NSAppearance.Name { - static let darkAqua: NSAppearance.Name = NSAppearance.Name(rawValue: "NSAppearanceNameDarkAqua") - static let accessibilityHighContrastAqua: NSAppearance.Name = NSAppearance.Name(rawValue: "NSAppearanceNameAccessibilityAqua") - static let accessibilityHighContrastDarkAqua: NSAppearance.Name = NSAppearance.Name(rawValue: "NSAppearanceNameAccessibilityDarkAqua") - static let accessibilityHighContrastVibrantLight: NSAppearance.Name = NSAppearance.Name(rawValue: "NSAppearanceNameAccessibilityVibrantLight") - static let accessibilityHighContrastVibrantDark: NSAppearance.Name = NSAppearance.Name(rawValue: "NSAppearanceNameAccessibilityVibrantDark") -} - -@available(OSX 10.12, *) -extension String { - static let RGBA16Float: String = kCAContentsFormatRGBA16Float - static let RGBA8Uint: String = kCAContentsFormatRGBA8Uint - static let gray8Uint: String = kCAContentsFormatGray8Uint -} -#endif - extension NSPasteboard.PasteboardType { static let fileURLCompat: NSPasteboard.PasteboardType = { if #available(OSX 10.13, *) { diff --git a/osdep/meson.build b/osdep/meson.build index 60fc2f6d57..21baafccdd 100644 --- a/osdep/meson.build +++ b/osdep/meson.build @@ -19,14 +19,6 @@ if get_option('optimization') != '0' swift_flags += '-O' endif -if macos_10_11_features.allowed() - swift_flags += ['-D', 'HAVE_MACOS_10_11_FEATURES'] -endif - -if macos_10_14_features.allowed() - swift_flags += ['-D', 'HAVE_MACOS_10_14_FEATURES'] -endif - extra_flags = get_option('swift-flags').split() swift_flags += extra_flags |