diff options
| author | Vitor Sousa <vitorsousasilva@gmail.com> | 2017-12-15 22:09:43 -0200 |
|---|---|---|
| committer | Vitor Sousa <vitorsousasilva@gmail.com> | 2017-12-15 22:26:30 -0200 |
| commit | b55542889baaec9ae25ce13d2804d5123f040cc6 (patch) | |
| tree | e003abf3029f1f869e4f5d48adb14f3a5c58e75c | |
| parent | acd99be98bc6f3218af9322b23acb52ed29fb008 (diff) | |
| download | efl-b55542889baaec9ae25ce13d2804d5123f040cc6.tar.gz | |
efl_mono: fix test and example compilation on Windows
| -rw-r--r-- | src/Makefile_Efl_Mono.am | 11 | ||||
| -rw-r--r-- | src/examples/efl_mono/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/tests/efl_mono/mono_test_driver.sh | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am index ad45a22b81..4715fff4c6 100644 --- a/src/Makefile_Efl_Mono.am +++ b/src/Makefile_Efl_Mono.am @@ -352,16 +352,17 @@ tests/efl_mono/libefl_mono_test.dll: $(efl_mono_test_eolian_mono_files) tests/ef AM_TESTS_ENVIRONMENT += MONO='mono'; export MONO; AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'; export MONO_BUILDPATH; AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'; export MONO_PATH; +AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT; if HAVE_WIN32 AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'; export PATH; else AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'; export LD_LIBRARY_PATH; endif -check_PROGRAMS += tests/efl_mono/efl_mono.exe +check_PROGRAMS += tests/efl_mono/efl_mono TESTS += tests/efl_mono/mono_test_driver.sh -tests_efl_mono_efl_mono_exe_SOURCES = \ +tests_efl_mono_efl_mono_SOURCES = \ tests/efl_mono/Main.cs \ tests/efl_mono/Eina.cs \ tests/efl_mono/Eldbus.cs \ @@ -384,12 +385,10 @@ lib/efl_mono/libefl_mono.dll.config: echo " <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@ echo "</configuration>" >> $@ -tests/efl_mono/efl_mono.exe$(EXEEXT): $(tests_efl_mono_efl_mono_exe_SOURCES) tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll tests/efl_mono/libefl_mono_test.dll - @rm -f tests/efl_mono/efl_mono.exe +tests/efl_mono/efl_mono$(EXEEXT): $(tests_efl_mono_efl_mono_SOURCES) tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll tests/efl_mono/libefl_mono_test.dll + @rm -f $@ $(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -r:$(abs_top_builddir)/src/tests/efl_mono/libefl_mono_test.dll -out:$@ $(filter %.cs, $(^)) -###EXTRA_DIST2 += $(tests_efl_mono_efl_mono_exe_srcs) - # Rule for generating the .cs files tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP) $(AM_V_EOLMONO) \ diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am index 9f696fabaa..fe271e9f10 100644 --- a/src/examples/efl_mono/Makefile.am +++ b/src/examples/efl_mono/Makefile.am @@ -51,7 +51,7 @@ noinst_lib_LTLIBRARIES = libexample_numberwrapper.la noinst_libdir = $(abs_top_builddir) libexample_numberwrapper_la_SOURCES = example_numberwrapper.c -libexample_numberwrapper_la_LDFLAGS = -shared +libexample_numberwrapper_la_LDFLAGS = -shared @EFL_LTMODULE_FLAGS@ libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c EoInherit01$(EXEEXT).config diff --git a/src/tests/efl_mono/mono_test_driver.sh b/src/tests/efl_mono/mono_test_driver.sh index e8e8772f9f..fc8f44876e 100755 --- a/src/tests/efl_mono/mono_test_driver.sh +++ b/src/tests/efl_mono/mono_test_driver.sh @@ -1,5 +1,5 @@ #!/bin/sh echo $LD_LIBRARY_PATH -EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO $MONO_BUILDPATH/src/tests/efl_mono/efl_mono.exe +EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO $MONO_BUILDPATH/src/tests/efl_mono/efl_mono${EXEEXT} |