summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-28 11:56:33 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-28 12:09:21 +0200
commitedaf4a2dd890314d71322a818fa2a0d5e4bb0b31 (patch)
tree8dd67ad4bb1c82d6f24f0665ac6efba73879c8c3
parentee13fd8cf66d27ed8f4e975187a459527820b038 (diff)
build: add efl-canvasl-wl to efl-onedevs/bu5hm4n/work_build
this is required by e, thank you Ross. Differential Revision: https://phab.enlightenment.org/D11901
-rw-r--r--meson.build2
-rw-r--r--src/lib/efl_canvas_wl/meson.build14
2 files changed, 9 insertions, 7 deletions
diff --git a/meson.build b/meson.build
index 90eb3951bf..287dbb71ae 100644
--- a/meson.build
+++ b/meson.build
@@ -337,7 +337,7 @@ subprojects = [
337['ethumb' ,[] , true, true, true, false, false, false, true, ['eina', 'efl', 'eo'], []], 337['ethumb' ,[] , true, true, true, false, false, false, true, ['eina', 'efl', 'eo'], []],
338['ethumb_client' ,[] , false, true, true, false, false, true, true, ['eina', 'efl', 'eo', 'ethumb'], []], 338['ethumb_client' ,[] , false, true, true, false, false, true, true, ['eina', 'efl', 'eo', 'ethumb'], []],
339['elementary' ,[] , true, true, true, true, true, true, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], 339['elementary' ,[] , true, true, true, true, true, true, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']],
340['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, false, ['eina', 'efl', 'eo', 'evas', 'ecore'], []], 340['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, true, ['eina', 'efl', 'eo', 'evas', 'ecore'], []],
341['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', 'luajit'], []], 341['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', 'luajit'], []],
342['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, false, ['eina'], []], 342['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, false, ['eina'], []],
343['ecore_drm' ,['drm-deprecated'] , false, true, false, false, false, false, false, ['eina'], []], 343['ecore_drm' ,['drm-deprecated'] , false, true, false, false, false, false, false, ['eina'], []],
diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index 3b223ea174..5955da62eb 100644
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -1,9 +1,10 @@
1efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina, wayland_protocol ] 1efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina]
2efl_canvas_wl_pub_deps = [eo, efl, evas, dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0')] 2efl_canvas_wl_pub_deps = [eo, efl, evas]
3efl_canvas_wl_ext_deps = [dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol]
3 4
4if (get_option('x11')) 5if (get_option('x11'))
5 efl_canvas_wl_deps += [ecore_x] 6 efl_canvas_wl_deps += [ecore_x]
6 efl_canvas_wl_pub_deps += [dependency('xkbcommon-x11')] 7 efl_canvas_wl_ext_deps += [dependency('xkbcommon-x11')]
7endif 8endif
8 9
9pub_eo_files = [ 10pub_eo_files = [
@@ -25,16 +26,17 @@ foreach eo_file : pub_eo_files
25 '-gchd', '@INPUT@']) 26 '-gchd', '@INPUT@'])
26endforeach 27endforeach
27 28
28efl_canvas_wl_src = [ 29efl_canvas_wl_src = files([
29 'dmabuf.c', 30 'dmabuf.c',
30 'efl_canvas_wl.c', 31 'efl_canvas_wl.c',
31] 32])
33
32efl_canvas_wl_header_src = ['Efl_Canvas_Wl.h'] 34efl_canvas_wl_header_src = ['Efl_Canvas_Wl.h']
33eolian_include_directories += ['-I', meson.current_source_dir()] 35eolian_include_directories += ['-I', meson.current_source_dir()]
34 36
35efl_canvas_wl_lib = library('efl_canvas_wl', 37efl_canvas_wl_lib = library('efl_canvas_wl',
36 efl_canvas_wl_src, pub_eo_file_target, 38 efl_canvas_wl_src, pub_eo_file_target,
37 dependencies: [m, dl] + efl_canvas_wl_deps + efl_canvas_wl_pub_deps, 39 dependencies: efl_canvas_wl_deps + efl_canvas_wl_pub_deps + efl_canvas_wl_ext_deps,
38 include_directories : config_dir + [include_directories(join_paths('..','..'))], 40 include_directories : config_dir + [include_directories(join_paths('..','..'))],
39 install: true, 41 install: true,
40 c_args : package_c_args, 42 c_args : package_c_args,