diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-31 16:16:22 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-09-10 20:36:47 +0000 |
| commit | 8424209a421274552d7eed42154750df40a3f87a (patch) | |
| tree | f8e396ec5831c24be6a3059933b5094930ca7dfe | |
| parent | a1a870319951f49c4169040e5efb3d550c6882f0 (diff) | |
meson: Make shared-glapi a combo
So it can auto off for windows, but on elsewhere.
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | meson_options.txt | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/meson.build b/meson.build index db21d4dbce4..2d6ac036475 100644 --- a/meson.build +++ b/meson.build @@ -89,7 +89,14 @@ if host_machine.system() == 'windows' endif endif with_opengl = get_option('opengl') -with_shared_glapi = get_option('shared-glapi') + +# Default shared glapi off for windows, on elsewhere. +_sg = get_option('shared-glapi') +if _sg == 'auto' + with_shared_glapi = host_machine.system() != 'windows' +else + with_shared_glapi = _sg == 'true' +endif # shared-glapi is required if at least two OpenGL APIs are being built if not with_shared_glapi @@ -115,7 +122,7 @@ with_gles1 = with_gles1 != 'false' with_gles2 = with_gles2 != 'false' with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled -with_shared_glapi = get_option('shared-glapi') and with_any_opengl +with_shared_glapi = with_shared_glapi and with_any_opengl system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) diff --git a/meson_options.txt b/meson_options.txt index b768c15053c..aadf7fd0721 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -176,9 +176,10 @@ option( ) option( 'shared-glapi', - type : 'boolean', - value : true, - description : 'Whether to build a shared or static glapi' + type : 'combo', + value : 'auto', + choices : ['auto', 'true', 'false'], + description : 'Whether to build a shared or static glapi. Defaults to false on Windows, true elsewhere' ) option( 'gles1', |