summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorJoão Paulo Taylor Ienczak Zanette <joao.tiz@expertisesolutions.com.br>2020-02-13 18:09:29 +0000
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2020-02-13 15:22:46 -0300
commit93d4ffc9404cc2305c5690417fa0fc287afdf3a5 (patch)
tree924a2ad2c80c3a7ea6e1bbd785ac44d4f97c7b6b /src/bindings
parent04b82b3f872dc95f8033a4260b087a09cb516efd (diff)
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 <felipe@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D11343
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/mono/efl_mono.dll.config.in1
-rw-r--r--src/bindings/mono/meson.build1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bindings/mono/efl_mono.dll.config.in b/src/bindings/mono/efl_mono.dll.config.in
index 25d216b1a0..2800c971d5 100644
--- a/src/bindings/mono/efl_mono.dll.config.in
+++ b/src/bindings/mono/efl_mono.dll.config.in
@@ -23,4 +23,5 @@
23 <dllmap dll="evas" target="@EVAS@"/> 23 <dllmap dll="evas" target="@EVAS@"/>
24 <dllmap dll="eldbus" target="@ELDBUS@"/> 24 <dllmap dll="eldbus" target="@ELDBUS@"/>
25 <dllmap dll="elementary" target="@ELEMENTARY@"/> 25 <dllmap dll="elementary" target="@ELEMENTARY@"/>
26 <dllmap dll="eflcustomexportsmono" target="@EFLCUSTOMEXPORTSMONO@"/>
26</configuration> 27</configuration>
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index ed2f58d508..74f2d06de7 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -122,6 +122,7 @@ efl_mono_conf_data.set('EO', eo_lib.full_path())
122efl_mono_conf_data.set('EVAS', evas_lib.full_path()) 122efl_mono_conf_data.set('EVAS', evas_lib.full_path())
123efl_mono_conf_data.set('ELDBUS', eldbus_lib.full_path()) 123efl_mono_conf_data.set('ELDBUS', eldbus_lib.full_path())
124efl_mono_conf_data.set('ELEMENTARY', elementary_lib.full_path()) 124efl_mono_conf_data.set('ELEMENTARY', elementary_lib.full_path())
125efl_mono_conf_data.set('EFLCUSTOMEXPORTSMONO', efl_mono_lib.full_path())
125 126
126efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in', 127efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in',
127 output : 'efl_mono.dll.config', 128 output : 'efl_mono.dll.config',