summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousasilva@gmail.com>2017-12-15 22:09:43 -0200
committerVitor Sousa <vitorsousasilva@gmail.com>2017-12-15 22:26:30 -0200
commitb55542889baaec9ae25ce13d2804d5123f040cc6 (patch)
treee003abf3029f1f869e4f5d48adb14f3a5c58e75c
parentacd99be98bc6f3218af9322b23acb52ed29fb008 (diff)
efl_mono: fix test and example compilation on Windows
-rw-r--r--src/Makefile_Efl_Mono.am11
-rw-r--r--src/examples/efl_mono/Makefile.am2
-rwxr-xr-xsrc/tests/efl_mono/mono_test_driver.sh2
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
352AM_TESTS_ENVIRONMENT += MONO='mono'; export MONO; 352AM_TESTS_ENVIRONMENT += MONO='mono'; export MONO;
353AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'; export MONO_BUILDPATH; 353AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'; export MONO_BUILDPATH;
354AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'; export MONO_PATH; 354AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'; export MONO_PATH;
355AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT;
355if HAVE_WIN32 356if HAVE_WIN32
356AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'; export PATH; 357AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'; export PATH;
357else 358else
358AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'; export LD_LIBRARY_PATH; 359AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'; export LD_LIBRARY_PATH;
359endif 360endif
360 361
361check_PROGRAMS += tests/efl_mono/efl_mono.exe 362check_PROGRAMS += tests/efl_mono/efl_mono
362TESTS += tests/efl_mono/mono_test_driver.sh 363TESTS += tests/efl_mono/mono_test_driver.sh
363 364
364tests_efl_mono_efl_mono_exe_SOURCES = \ 365tests_efl_mono_efl_mono_SOURCES = \
365 tests/efl_mono/Main.cs \ 366 tests/efl_mono/Main.cs \
366 tests/efl_mono/Eina.cs \ 367 tests/efl_mono/Eina.cs \
367 tests/efl_mono/Eldbus.cs \ 368 tests/efl_mono/Eldbus.cs \
@@ -384,12 +385,10 @@ lib/efl_mono/libefl_mono.dll.config:
384 echo " <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@ 385 echo " <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@
385 echo "</configuration>" >> $@ 386 echo "</configuration>" >> $@
386 387
387tests/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 388tests/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
388 @rm -f tests/efl_mono/efl_mono.exe 389 @rm -f $@
389 $(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, $(^)) 390 $(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, $(^))
390 391
391###EXTRA_DIST2 += $(tests_efl_mono_efl_mono_exe_srcs)
392
393# Rule for generating the .cs files 392# Rule for generating the .cs files
394tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP) 393tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP)
395 $(AM_V_EOLMONO) \ 394 $(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
51noinst_libdir = $(abs_top_builddir) 51noinst_libdir = $(abs_top_builddir)
52 52
53libexample_numberwrapper_la_SOURCES = example_numberwrapper.c 53libexample_numberwrapper_la_SOURCES = example_numberwrapper.c
54libexample_numberwrapper_la_LDFLAGS = -shared 54libexample_numberwrapper_la_LDFLAGS = -shared @EFL_LTMODULE_FLAGS@
55libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT 55libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT
56 56
57GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c EoInherit01$(EXEEXT).config 57GENERATED += 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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3echo $LD_LIBRARY_PATH 3echo $LD_LIBRARY_PATH
4EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO $MONO_BUILDPATH/src/tests/efl_mono/efl_mono.exe 4EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO $MONO_BUILDPATH/src/tests/efl_mono/efl_mono${EXEEXT}
5 5