diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2018-01-23 17:48:38 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2018-02-08 13:44:27 +0300 |
| commit | 5559c98459fb43d28115b16863032618fd6ad2fe (patch) | |
| tree | 91c395a795e911154dd73b407a40ca6bab8994eb /main/build/MacOSX/Makefile.am | |
| parent | 4daa08a2f8305b11dc944b512658aea0a59b5a34 (diff) | |
[Launcher] Statically link in libxammac-system.a
This avoids shipping libxammac.dylib and uses a xammac static
lib which works with a system wide mono.
Thus, most of monostub code is now obsolete. To clean up later
once other users of monostub don't use this file anymore
Diffstat (limited to 'main/build/MacOSX/Makefile.am')
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index fb0277af8f..1836b55a7f 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -8,8 +8,8 @@ EXTRAS=$(top_srcdir)/../extras ARTIFACTS=$(top_srcdir)/../../artifacts MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh EXTERNAL=../../external -MONOSTUB_DEFINES=-DXM_REGISTRAR -MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a +MONOSTUB_DEFINES=-DXM_REGISTRAR -DXM_SYSTEM -DDYNAMIC_MONO_RUNTIME +MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a $(EXTERNAL)/libxammac-system.a EXTERN_C_XM_REGISTRAR_DEFINE=$(shell ./check-xm-extern.sh) #SDK_PATH=$(shell xcrun --sdk macosx10.8 --show-sdk-path) @@ -35,13 +35,15 @@ System_Native.o: System_Native.cpp g++ -std=c++14 -c -Wall -mmacosx-version-min=10.10 -o $@ $^ monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCES) - g++ $(EXTERN_C_XM_REGISTRAR_DEFINE) $(MONOSTUB_DEFINES) -c -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.mm + g++ -g $(EXTERN_C_XM_REGISTRAR_DEFINE) $(MONOSTUB_DEFINES) -c -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.mm -I/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/include/xamarin monostub: monostub.o System_Native.o $(MONOSTUB_STATIC_LINK) - clang++ -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ $^ -framework AppKit -framework Quartz -undefined dynamic_lookup + clang++ -g -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup # gcc -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.m -framework AppKit -isysroot $(SDK_PATH) cp monostub ../bin/MonoDevelop cp monostub ../bin/mdtool + mkdir -p ../bin/Contents + ln -sfh .. "../bin/Contents/MonoBundle" monostub-test: monostub-test.m $(MONOSTUB_EXTRA_SOURCES) gcc -g -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub-test.m -framework AppKit |