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

View File

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

View File

@ -1,13 +1,19 @@
src = files(
'e_mod_main.c'
)
if get_option('wayland') != true
disable = true
else
config_h.set('HAVE_WL_DRM', '1')
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
src = files(
'e_mod_main.c'
)
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

View File

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