diff options
| author | Dylan Baker <[email protected]> | 2018-04-18 13:17:20 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-10 20:36:47 +0000 |
| commit | 70cac06bbf4944b5d1aebe33a0dd6cbe8a2fdbb7 (patch) | |
| tree | 460929469ad306ef52d42cc076a94baba4ee5c36 | |
| parent | f680cc62f85e66feed2fe0794f415534d3a4df98 (diff) | |
meson: Add a platform for windows
This mirrors the haiku build which uses a platform.
v2: - Fix some rebase problems
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build index c700d64eb97..1ab21dfc2f5 100644 --- a/meson.build +++ b/meson.build @@ -277,10 +277,12 @@ _platforms = get_option('platforms') if _platforms.contains('auto') if system_has_kms_drm _platforms = ['x11', 'wayland', 'drm', 'surfaceless'] - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) + elif ['darwin', 'cygwin'].contains(host_machine.system()) _platforms = ['x11', 'surfaceless'] elif ['haiku'].contains(host_machine.system()) _platforms = ['haiku'] + elif host_machine.system() == 'windows' + _platforms = ['windows'] else error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format( host_machine.system())) @@ -293,6 +295,7 @@ with_platform_wayland = _platforms.contains('wayland') with_platform_drm = _platforms.contains('drm') with_platform_haiku = _platforms.contains('haiku') with_platform_surfaceless = _platforms.contains('surfaceless') +with_platform_windows = _platforms.contains('windows') with_platforms = false if _platforms.length() != 0 and _platforms != [''] diff --git a/meson_options.txt b/meson_options.txt index aadf7fd0721..a2f86be19ae 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,6 +24,7 @@ option( value : ['auto'], choices : [ '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', + 'windows', ], description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.' ) |