efl-csharp: Fixing C# examples

Reviewers: vitor.sousa, segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D7134

diff --git a/src/examples/efl_mono.mk b/src/examples/efl_mono.mk
index 6db399c..df00c3b 100644 (file)
--- a/src/examples/efl_mono.mk
+++ b/src/examples/efl_mono.mk
@@ -14,7 +14,8 @@ COMMON_FLAGS = \
 @EO_CFLAGS@ @EO_LDFLAGS@ \
 -L$(top_builddir)/src/lib/eo/.libs -leo \
 @EFL_CFLAGS@ @EFL_LDFLAGS@ \
--L$(top_builddir)/src/lib/efl/.libs -lefl
+-L$(top_builddir)/src/lib/efl/.libs -lefl \
+-I$(abs_top_builddir)/src/examples/efl_mono
 
 if HAVE_WIN32
 COMMON_FLAGS += \
@@ -49,11 +50,11 @@ efl_mono/example_numberwrapper.eo.cs: efl_mono/example_numberwrapper.eo
 
 efl_mono_EoInherit01_SOURCES = efl_mono/EoInherit01.cs
 #efl_mono_EoInherit01_files = $(EoInherit01_exe_srcs) efl_mono/example_numberwrapper.eo.cs
-efl_mono/EoInherit01$(EXEEXT): $(EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la EoInherit01$(EXEEXT).config example_numberwrapper.eo.cs
+efl_mono/EoInherit01$(EXEEXT): $(efl_mono_EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll efl_mono/libexample_numberwrapper.la efl_mono/EoInherit01$(EXEEXT).config efl_mono/example_numberwrapper.eo.cs
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
-efl_mono/EoInherit01.csproj: $(EoInherit01_SOURCES) $(am_dirstamp) efl_mono/libexample_numberwrapper.la
+efl_mono/EoInherit01.csproj: $(efl_mono_EoInherit01_SOURCES) $(am_dirstamp) efl_mono/libexample_numberwrapper.la
        @rm -f $@
        $(EFL_MONO_MSBUILD_GEN) $(MSBUILD_GEN_FLAGS) -o $@ -a efl_mono/EoInherit01$(EXEEXT) -r libefl_mono.dll -t exe $(patsubst %.cs,src/examples/efl_mono/%.cs,$(filter %.cs, $(^)))
 
@@ -69,11 +70,11 @@ efl_mono/EoInherit01$(EXEEXT).config:
        echo "</configuration>" >> $@
 
 efl_mono_FunctionPointer01_SOURCES = efl_mono/FunctionPointer01.cs
-efl_mono/FunctionPointer01$(EXEEXT): $(FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll efl_mono/libexample_numberwrapper.la efl_mono/example_numberwrapper.eo.cs
+efl_mono/FunctionPointer01$(EXEEXT): $(efl_mono_FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll efl_mono/libexample_numberwrapper.la efl_mono/example_numberwrapper.eo.cs
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
-efl_mono/FunctionPointer01.csproj: $(FunctionPointer01_SOURCES) $(am_dirstamp) efl_mono/libexample_numberwrapper.la
+efl_mono/FunctionPointer01.csproj: $(efl_mono_FunctionPointer01_SOURCES) $(am_dirstamp) efl_mono/libexample_numberwrapper.la
        @rm -f $@
        $(EFL_MONO_MSBUILD_GEN) $(MSBUILD_GEN_FLAGS) -o $@ -a efl_mono/FunctionPointer01$(EXEEXT) -r libefl_mono.dll -t exe $(patsubst %.cs,src/examples/efl_mono/%.cs,$(filter %.cs, $(^)))
 

diff --git a/src/examples/elementary/efl_ui_unit_converter.cs b/src/examples/elementary/efl_ui_unit_converter.cs
index 09c9b24..e3013e9 100644 (file)
--- a/src/examples/elementary/efl_ui_unit_converter.cs
+++ b/src/examples/elementary/efl_ui_unit_converter.cs
@@ -21,7 +21,7 @@ public class Example
         popup_text.SetText($"Error: {message}");
         popup.SetContent(popup_text);
         popup.SetVisible(true);
-        popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok");
+        popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok", null);
         popup.SetSize(new eina.Size2D(150, 30));
         popup.ButtonClickedEvt += (object sender, efl.ui.Popup_Alert.ButtonClickedEvt_Args e) => {
             popup.SetParent(null);

diff --git a/src/examples/evas.mk b/src/examples/evas.mk
index 2e53ad0..1ca63d0 100644 (file)
--- a/src/examples/evas.mk
+++ b/src/examples/evas.mk
@@ -239,42 +239,41 @@ EXTRA_PROGRAMS += \
 evas_evas_mono_box_csharp_SOURCES = \
        evas/evas_mono_box.cs
 
-evas_evas_mono_box_csharp$(EXEEXT): $(evas_mono_box_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
-       @rm -f $@
+evas/evas_mono_box_csharp$(EXEEXT): $(evas_evas_mono_box_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
 evas_evas_mono_image_csharp_SOURCES = \
        evas/evas_mono_image.cs
 
-evas_evas_mono_image_csharp$(EXEEXT): $(evas_mono_image_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
+evas/evas_mono_image_csharp$(EXEEXT): $(evas_evas_mono_image_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
 evas_evas_mono_image2_csharp_SOURCES = \
        evas/evas_mono_image2.cs
 
-evas_evas_mono_image2_csharp$(EXEEXT): $(evas_mono_image2_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
+evas/evas_mono_image2_csharp$(EXEEXT): $(evas_evas_mono_image2_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
 evas_evas_mono_rectangle_csharp_SOURCES = \
        evas/evas_mono_rectangle.cs
 
-evas_evas_mono_rectangle_csharp$(EXEEXT): $(evas_mono_rectangle_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
+evas/evas_mono_rectangle_csharp$(EXEEXT): $(evas_evas_mono_rectangle_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
 evas_evas_mono_table_csharp_SOURCES = \
        evas/evas_mono_table.cs
 
-evas_evas_mono_table_csharp$(EXEEXT): $(evas_mono_table_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
+evas/evas_mono_table_csharp$(EXEEXT): $(evas_evas_mono_table_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
 evas_evas_mono_text_csharp_SOURCES = \
        evas/evas_mono_text.cs
 
-evas_evas_mono_text_csharp$(EXEEXT): $(evas_mono_text_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
+evas/evas_mono_text_csharp$(EXEEXT): $(evas_evas_mono_text_csharp_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll
        @rm -f $@
        $(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))