KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Add a platform for windows 

This mirrors the haiku build which uses a platform.

v2: - Fix some rebase problems

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Dylan Baker 2018-04-18 13:17:20 -07:00
parent f680cc62f8
commit 70cac06bbf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -277,10 +277,12 @@ _platforms = get_option('platforms')
if _platforms.contains('auto') if _platforms.contains('auto')
if system_has_kms_drm if system_has_kms_drm
_platforms = ['x11', 'wayland', 'drm', 'surfaceless'] _platforms = ['x11', 'wayland', 'drm', 'surfaceless']
elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) elif ['darwin', 'cygwin'].contains(host_machine.system())
_platforms = ['x11', 'surfaceless'] _platforms = ['x11', 'surfaceless']
elif ['haiku'].contains(host_machine.system()) elif ['haiku'].contains(host_machine.system())
_platforms = ['haiku'] _platforms = ['haiku']
elif host_machine.system() == 'windows'
_platforms = ['windows']
else else
error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format( error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format(
host_machine.system())) host_machine.system()))
@ -293,6 +295,7 @@ with_platform_wayland = _platforms.contains('wayland')
with_platform_drm = _platforms.contains('drm') with_platform_drm = _platforms.contains('drm')
with_platform_haiku = _platforms.contains('haiku') with_platform_haiku = _platforms.contains('haiku')
with_platform_surfaceless = _platforms.contains('surfaceless') with_platform_surfaceless = _platforms.contains('surfaceless')
with_platform_windows = _platforms.contains('windows')
with_platforms = false with_platforms = false
if _platforms.length() != 0 and _platforms != [''] if _platforms.length() != 0 and _platforms != ['']

1
meson_options.txt
View File

@ -24,6 +24,7 @@ option(
value : ['auto'], value : ['auto'],
choices : [ choices : [
'', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', '', '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.' description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
) )