forked from enlightenment/enlightenment
meson opt - also match options change in core meson build
This commit is contained in:
parent
d0f66258be
commit
385a91841c
|
@ -275,7 +275,7 @@ dep_emotion = dependency('emotion' , required: true)
|
||||||
dep_elementary = dependency('elementary' , required: true)
|
dep_elementary = dependency('elementary' , required: true)
|
||||||
|
|
||||||
dep_wayland = []
|
dep_wayland = []
|
||||||
if get_option('wayland') == true
|
if get_option('wl') == true
|
||||||
wayland_protocols = dependency('wayland-protocols', version: '>= 1.12')
|
wayland_protocols = dependency('wayland-protocols', version: '>= 1.12')
|
||||||
dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
|
dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
|
||||||
wayland_version = '>= 1.11.0'
|
wayland_version = '>= 1.11.0'
|
||||||
|
@ -318,7 +318,7 @@ if get_option('wayland') == true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dep_ecore_x = []
|
dep_ecore_x = []
|
||||||
if get_option('wayland') == true and get_option('wl-x11') == false and get_option('xwayland') == false
|
if get_option('wl') == true and get_option('wl-x11') == false and get_option('xwayland') == false
|
||||||
config_h.set('HAVE_WAYLAND_ONLY', '1')
|
config_h.set('HAVE_WAYLAND_ONLY', '1')
|
||||||
else
|
else
|
||||||
dep_ecore_x = dependency('ecore-x')
|
dep_ecore_x = dependency('ecore-x')
|
||||||
|
|
|
@ -14,7 +14,7 @@ src = files(
|
||||||
)
|
)
|
||||||
|
|
||||||
if get_option(m) == true
|
if get_option(m) == true
|
||||||
if get_option('wayland') == true
|
if get_option('wl') == true
|
||||||
foreach p: [
|
foreach p: [
|
||||||
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
|
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
|
||||||
'@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols),
|
'@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols),
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true or dep_ecore_drm2.found() != true
|
if get_option('wl') != true or dep_ecore_drm2.found() != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
deps = [dependency('elput'), dependency('libdrm')]
|
deps = [dependency('elput'), dependency('libdrm')]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
src = files(
|
src = files(
|
||||||
|
|
|
@ -5,7 +5,7 @@ src = files(
|
||||||
|
|
||||||
no_icon = true
|
no_icon = true
|
||||||
|
|
||||||
if get_option('wayland') != true
|
if get_option('wl') != true
|
||||||
disable = true
|
disable = true
|
||||||
else
|
else
|
||||||
xwayland = find_program('Xwayland')
|
xwayland = find_program('Xwayland')
|
||||||
|
|
Loading…
Reference in New Issue