Compare commits

...

3 Commits

Author SHA1 Message Date
Romain Naour 768dde14a5 ecore_evas/engines/drm/meson.build: fix "gl_drm" include directory
The Evas_Engine_GL_Drm.h file is in "gl_drm" directory, not "drm".

../src/modules/ecore_evas/engines/drm/ecore_evas_drm.c:23:11: fatal error: Evas_Engine_GL_Drm.h: No such file or directory
   23 | # include <Evas_Engine_GL_Drm.h>
      |           ^~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2020-09-02 09:09:52 +02:00
Romain Naour 3ed1c806a9 ecore_evas/engines/drm/meson.build: use "gl_deps" as engine dependencies
Meson trigger an error since "engine_gl_drm" variable doesn't exist.

src/modules/ecore_evas/engines/drm/meson.build:10:2: ERROR: Unknown variable "engine_gl_drm".

Instead use "gl_deps" as engine dependencies.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2020-09-02 09:09:52 +02:00
Romain Naour 25a1ba9ae4 doc/meson.build: add single quote for env
Meson trigger an error due to missing sigle quote for env:

efl-1.24.3/doc/meson.build:114:2: ERROR: Unknown variable "env"

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2020-09-02 09:09:52 +02:00
2 changed files with 3 additions and 3 deletions

View File

@ -113,7 +113,7 @@ foreach text_filter_property : text_filter_properties
doc_target += custom_target('preview_text_filters_'+name,
command: [
env, 'EFL_RUN_IN_TREE=1',
'env', 'EFL_RUN_IN_TREE=1',
'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'),
preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
],

View File

@ -3,10 +3,10 @@ engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm]
if get_option('opengl') != 'none'
config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1')
engine_deps += [engine_gl_drm]
engine_deps += [gl_deps]
endif
engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm'))
engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_drm'))
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],