From 3f0f1e6080102151e2f0382ac581c17473cdcfb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20Paulo=20Taylor=20Ienczak=20Zanette?= Date: Thu, 13 Feb 2020 18:09:29 +0000 Subject: [PATCH] csharp: Prevent using system dll for eflcustomexportsmono If EFL is installed system-wide, `CustomExports` would use the system (`/usr`) dll instead of local build's, causing new implemented binding calls to native functions to crash with no entry point found for them. This patch fixes it by ensuring that the local build's `libeflcustomexportsmono.dll` will be used. Reviewed-by: Felipe Magno de Almeida Differential Revision: https://phab.enlightenment.org/D11343 --- src/bindings/mono/efl_mono.dll.config.in | 1 + src/bindings/mono/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bindings/mono/efl_mono.dll.config.in b/src/bindings/mono/efl_mono.dll.config.in index 25d216b..2800c97 100644 --- a/src/bindings/mono/efl_mono.dll.config.in +++ b/src/bindings/mono/efl_mono.dll.config.in @@ -23,4 +23,5 @@ + diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build index 16890d7..1eb0bf3 100644 --- a/src/bindings/mono/meson.build +++ b/src/bindings/mono/meson.build @@ -146,6 +146,7 @@ efl_mono_conf_data.set('EO', eo_lib.full_path()) efl_mono_conf_data.set('EVAS', evas_lib.full_path()) efl_mono_conf_data.set('ELDBUS', eldbus_lib.full_path()) efl_mono_conf_data.set('ELEMENTARY', elementary_lib.full_path()) +efl_mono_conf_data.set('EFLCUSTOMEXPORTSMONO', efl_mono_lib.full_path()) efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in', output : 'efl_mono.dll.config', -- 2.7.4