From 34317fe4c661bab1ba36e71fed9e0652fc63b25c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Apr 2019 09:11:59 -0400 Subject: [PATCH] meson: fix and enable win32 ecore-evas engine build these defines must be set in order to provide the expected engine functionality Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D8733 --- src/modules/ecore_evas/engines/win32/meson.build | 7 ++++++- src/modules/ecore_evas/meson.build | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/win32/meson.build b/src/modules/ecore_evas/engines/win32/meson.build index 6a6477d..a74f90f 100644 --- a/src/modules/ecore_evas/engines/win32/meson.build +++ b/src/modules/ecore_evas/engines/win32/meson.build @@ -1,8 +1,13 @@ engine_src = files(['ecore_evas_win32.c']) +config_h.set('BUILD_ECORE_EVAS_SOFTWARE_DDRAW', '1'); +config_h.set('BUILD_ECORE_EVAS_SOFTWARE_GDI', '1'); + +engine_deps = [engine_software_ddraw, engine_software_gdi] + shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], - dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, + dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps, install : true, install_dir : mod_install_dir, name_suffix : sys_mod_extension diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build index 7aa054e..ce2059a 100644 --- a/src/modules/ecore_evas/meson.build +++ b/src/modules/ecore_evas/meson.build @@ -4,7 +4,6 @@ engines = [ ['fb', ['fb']], ['sdl', ['sdl']], ['wayland', ['wl']], -#['win32', ['ecore_win32']], ['x', ['x11']], ] @@ -14,6 +13,8 @@ engines += [ if sys_windows == false engines += [['extn', []]] +else + engines += [['win32', []]] endif -- 2.7.4