diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build.environment.mk | 2 | ||||
| -rwxr-xr-x | build/build.rules.mk | 2 | ||||
| -rwxr-xr-x | build/m4/shamrock/mono.m4 | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/build/build.environment.mk b/build/build.environment.mk index 8fd2b44..3793053 100755 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -19,7 +19,7 @@ REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) -REF_SPARKLESHARE = $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT) +REF_SPARKLESHARE = $(LINK_NUNIT) $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT) # Cute hack to replace a space with something colon:= : diff --git a/build/build.rules.mk b/build/build.rules.mk index 0beed5c..8766280 100755 --- a/build/build.rules.mk +++ b/build/build.rules.mk @@ -19,7 +19,7 @@ ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION) INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) if ENABLE_TESTS - LINK = " $(NUNIT_LIBS)" + LINK_NUNIT = "$(NUNIT_LIBS)" ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" endif diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4 index 393eaa3..8981305 100755 --- a/build/m4/shamrock/mono.m4 +++ b/build/m4/shamrock/mono.m4 @@ -13,6 +13,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER], SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs) ]) +AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER], +[ + SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs) +]) + AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME], [ SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono) @@ -65,4 +70,3 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES], fi done ]) - |