diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-28 11:56:33 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-28 12:09:21 +0200 |
| commit | edaf4a2dd890314d71322a818fa2a0d5e4bb0b31 (patch) | |
| tree | 8dd67ad4bb1c82d6f24f0665ac6efba73879c8c3 | |
| parent | ee13fd8cf66d27ed8f4e975187a459527820b038 (diff) | |
| download | efl-devs/bu5hm4n/work_build.tar.gz | |
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.build | 2 | ||||
| -rw-r--r-- | src/lib/efl_canvas_wl/meson.build | 14 |
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 = [ ['ethumb' ,[] , true, true, true, false, false, false, true, ['eina', 'efl', 'eo'], []], ['ethumb_client' ,[] , false, true, true, false, false, true, true, ['eina', 'efl', 'eo', 'ethumb'], []], ['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']], -['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, false, ['eina', 'efl', 'eo', 'evas', 'ecore'], []], +['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, true, ['eina', 'efl', 'eo', 'evas', 'ecore'], []], ['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', 'luajit'], []], ['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, false, ['eina'], []], ['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 @@ -efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina, wayland_protocol ] -efl_canvas_wl_pub_deps = [eo, efl, evas, dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0')] +efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina] +efl_canvas_wl_pub_deps = [eo, efl, evas] +efl_canvas_wl_ext_deps = [dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol] if (get_option('x11')) efl_canvas_wl_deps += [ecore_x] - efl_canvas_wl_pub_deps += [dependency('xkbcommon-x11')] + efl_canvas_wl_ext_deps += [dependency('xkbcommon-x11')] endif pub_eo_files = [ @@ -25,16 +26,17 @@ foreach eo_file : pub_eo_files '-gchd', '@INPUT@']) endforeach -efl_canvas_wl_src = [ +efl_canvas_wl_src = files([ 'dmabuf.c', 'efl_canvas_wl.c', -] +]) + efl_canvas_wl_header_src = ['Efl_Canvas_Wl.h'] eolian_include_directories += ['-I', meson.current_source_dir()] efl_canvas_wl_lib = library('efl_canvas_wl', efl_canvas_wl_src, pub_eo_file_target, - dependencies: [m, dl] + efl_canvas_wl_deps + efl_canvas_wl_pub_deps, + dependencies: efl_canvas_wl_deps + efl_canvas_wl_pub_deps + efl_canvas_wl_ext_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, c_args : package_c_args, |