enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

meson: build again without wayland

This commit is contained in:
Marcel Hollerbach 2017-08-11 19:29:36 +02:00
parent 4b6e25d6c4
commit 3aa126a90d
3 changed files with 61 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/modules/wl_desktop_shell/meson.build
View File

@ -1,16 +1,20 @@
src = files( if get_option('wayland') != true
'e_mod_main.c', disable = true
'e_mod_input_panel.c', else
'wl_shell.c', src = files(
'xdg5.c', 'e_mod_main.c',
'xdg6.c', 'e_mod_input_panel.c',
'e_mod_main.h' 'wl_shell.c',
) 'xdg5.c',
foreach p: [ 'xdg6.c',
'@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols), 'e_mod_main.h'
'@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols), )
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols), foreach p: [
] '@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
src += gen_scanner_server.process(p) '@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
src += gen_scanner_impl.process(p) '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
endforeach ]
src += gen_scanner_server.process(p)
src += gen_scanner_impl.process(p)
endforeach
endif

28
src/modules/wl_text_input/meson.build
View File

@ -1,13 +1,19 @@
src = files( if get_option('wayland') != true
'e_mod_main.c' disable = true
) else
config_h.set('HAVE_WL_DRM', '1')
foreach p: [ src = files(
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols), 'e_mod_main.c'
'@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols) )
]
src += gen_scanner_server.process(p)
src += gen_scanner_impl.process(p)
endforeach
no_icon = true foreach p: [
'@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)
]
src += gen_scanner_server.process(p)
src += gen_scanner_impl.process(p)
endforeach
no_icon = true
endif

43
src/modules/wl_weekeyboard/meson.build
View File

@ -1,22 +1,27 @@
src = files( if get_option('wayland') != true
'e_mod_main.c', disable = true
'wkb-log.c', else
'wkb-log.h' config_h.set('HAVE_WL_DRM', '1')
) src = files(
'e_mod_main.c',
'wkb-log.c',
'wkb-log.h'
)
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),
] ]
src += gen_scanner_server.process(p) src += gen_scanner_server.process(p)
src += gen_scanner_client.process(p) src += gen_scanner_client.process(p)
src += gen_scanner_impl.process(p) src += gen_scanner_impl.process(p)
endforeach endforeach
data = [ data = [
'themes/default/default_600.edj', 'themes/default/default_600.edj',
'themes/default/default_720.edj', 'themes/default/default_720.edj',
'themes/default/default_1080.edj' 'themes/default/default_1080.edj'
] ]
no_icon = true no_icon = true
endif