aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-03-19 19:47:58 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2018-03-20 16:50:30 -0300
commit7fc20c08ee9c37376bd61bb185b17b379d490eab (patch)
tree294f493f09df2888b9078559715d235eb0cac71e
parentecore_wl2: Send a mouse-up event on reentry after client initiated resize (diff)
downloadefl-7fc20c08ee9c37376bd61bb185b17b379d490eab.tar.gz
csharp: Use the library mapping on linux too.
Now the generated DllImport call will have the actual library name instead of placeholders on Linux. Before we relied on dlsym being able to search for the symbols on all loaded so's while Windows needed you to specify the correct library to call GetProcAddress. This fixes the case when someone call an function from an efl interface defined in efl.so (e.g. efl_part) and the library is not loaded yet.
-rw-r--r--src/Makefile_Efl_Mono.am5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 1f718ecc28..7c2930d52b 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -300,11 +300,7 @@ WIN_ADD_TEST_PATHS = $(abs_top_builddir)/src/lib/evil/.libs:$(abs_top_builddir)/
### Rules for generating the .cs files
-if HAVE_WIN32
ALL_EO_REFS = -r $(top_builddir)/src/bindings/mono/efl_mono/efl_libs.csv
-else
-ALL_EO_REFS=
-endif
lib/eo/%.eo.cs: lib/eo/%.eo $(_EOLIAN_MONO_DEP)
$(AM_V_EOLMONO) \
@@ -399,6 +395,7 @@ tests/efl_mono/efl_mono$(EXEEXT).config:
echo " <dllmap dll=\"eina\" target=\"$(abs_top_builddir)/src/lib/eina/.libs/libeina.so\"/>" >> $@
echo " <dllmap dll=\"ecore\" target=\"$(abs_top_builddir)/src/lib/ecore/.libs/libecore.so\"/>" >> $@
echo " <dllmap dll=\"eo\" target=\"$(abs_top_builddir)/src/lib/eo/.libs/libeo.so\"/>" >> $@
+ echo " <dllmap dll=\"efl\" target=\"$(abs_top_builddir)/src/lib/efl/.libs/libefl.so\"/>" >> $@
echo " <dllmap dll=\"evas\" target=\"$(abs_top_builddir)/src/lib/evas/.libs/libevas.so\"/>" >> $@
echo " <dllmap dll=\"eldbus\" target=\"$(abs_top_builddir)/src/lib/eldbus/.libs/libeldbus.so\"/>" >> $@
echo " <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@