[src] Include netstandard20 System.Drawing types in Xamarin.WatchOS.dll. (#1156)
This commit is contained in:
Родитель
2afb7ccd81
Коммит
80ed4473b0
|
@ -665,7 +665,7 @@ all-mac: $(MAC_TARGETS)
|
|||
# Xamarin.WatchOS
|
||||
#
|
||||
|
||||
WATCH_DEFINES = -define:IPHONE -define:MONOTOUCH -d:NET_2_0 -d:WATCH -d:NO_SYSTEM_DRAWING -d:XAMCORE_2_0 -d:XAMCORE_3_0 -d:__WATCHOS__ -d:__UNIFIED__
|
||||
WATCH_DEFINES = -define:IPHONE -define:MONOTOUCH -d:NET_2_0 -d:WATCH -d:XAMCORE_2_0 -d:XAMCORE_3_0 -d:__WATCHOS__ -d:__UNIFIED__
|
||||
WATCH_PMCS = $(WATCH_BUILD_DIR)/pmcs
|
||||
WATCH_LIBDIR = $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
|
||||
WATCH_BMONO = MONO_PATH=$(WATCH_LIBDIR)/repl $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bwatch-mono
|
||||
|
@ -676,6 +676,7 @@ WATCHOS_EXTRA_CORE_SOURCES = \
|
|||
$(IOS_OPENTK_1_0_CORE_SOURCES) \
|
||||
CoreVideo/CVPixelFormatType.cs \
|
||||
AudioToolbox/AudioType.cs \
|
||||
$(SHARED_SYSTEM_DRAWING_SOURCES) \
|
||||
|
||||
WATCHOS_CORE_SOURCES += \
|
||||
$(WATCHOS_EXTRA_CORE_SOURCES) \
|
||||
|
|
|
@ -53,7 +53,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bwatch: Makefile.generator
|
|||
$(Q) chmod +x $@
|
||||
|
||||
$(WATCH_BUILD_DIR)/bwatch.exe: $(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS.dll $(GENERATOR_SOURCES) Makefile.generator
|
||||
$(call Q_PROF_PMCS,watch) $(SYSTEM_MONO) --debug $(PMCS_EXE) -profile:"$(TOP)/src/pmcs-profiles/watch" -compiler:$(SYSTEM_MCS) -nostdlib -r:mscorlib -lib:$(WATCH_LIBDIR)/repl -global-replace:"^XamCore.=" -debug $(GENERATOR_DEFINES) -define:XAMCORE_2_0,XAMCORE_3_0,__UNIFIED__ -d:WATCH -d:__WATCHOS__ -d:NO_SYSTEM_DRAWING -out:$@ $(GENERATOR_SOURCES) -r:$<
|
||||
$(call Q_PROF_PMCS,watch) $(SYSTEM_MONO) --debug $(PMCS_EXE) -profile:"$(TOP)/src/pmcs-profiles/watch" -compiler:$(SYSTEM_MCS) -nostdlib -r:mscorlib -lib:$(WATCH_LIBDIR)/repl -global-replace:"^XamCore.=" -debug $(GENERATOR_DEFINES) -define:XAMCORE_2_0,XAMCORE_3_0,__UNIFIED__ -d:WATCH -d:__WATCHOS__ -out:$@ $(GENERATOR_SOURCES) -r:$<
|
||||
|
||||
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bwatch/%.exe: $(WATCH_BUILD_DIR)/%.exe | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bwatch
|
||||
$(Q) install -m 0755 $< $@
|
||||
|
|
Загрузка…
Ссылка в новой задаче