Fix XM bits of System.Drawing.Primitives.dll changes
This commit is contained in:
Родитель
945ce0bb3a
Коммит
3e8ab20f8a
26
src/Makefile
26
src/Makefile
|
@ -525,13 +525,20 @@ $(MAC_BUILD_DIR)/%-reference/Xamarin.Mac.dll: $(MAC_BUILD_DIR)/%-64/Xamarin.Mac.
|
||||||
|
|
||||||
# System.Drawing.Primitives.dll is special
|
# System.Drawing.Primitives.dll is special
|
||||||
|
|
||||||
#$(MAC_BUILD_DIR)/compat/Facades/System.Drawing.Primitives.dll: $(MAC_BUILD_DIR)/compat/XamMac.dll
|
|
||||||
# $(call Q_PROF_MCS,mac/compat) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/Facades/System.Drawing.Primitives PROFILE=xammac LIBRARY_SUBDIR=reference_Facades EXTRA_LIB_MCS_FLAGS="-r:$(abspath $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll)"
|
|
||||||
|
|
||||||
#$(TVOS_BUILD_DIR)/%/Facades/System.Drawing.Primitives.dll: $(MONO_PATH)/mcs/class/lib/monotouch_tv/%_Facades/System.Drawing.Primitives.dll
|
$(MONO_PATH)/mcs/class/lib/xammac/reference_Facades/System.Drawing.Primitives.dll: $(MAC_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll
|
||||||
# $(Q) cp $< $@
|
$(call Q_PROF_MCS,xammac) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/Facades/System.Drawing.Primitives PROFILE=xammac LIBRARY_SUBDIR=reference_Facades EXTRA_LIB_MCS_FLAGS="-r:$(abspath $(MAC_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll)"
|
||||||
|
|
||||||
#$(MAC_BUILD_DIR)/compat/Facades/XamMac.CFNetwork.dll: $(MAC_CFNETWORK_SOURCES) $(MAC_BUILD_DIR)/compat/XamMac.dll $(SN_KEY)
|
$(MAC_BUILD_DIR)/mobile/Facades/System.Drawing.Primitives.dll: $(MONO_PATH)/mcs/class/lib/xammac/reference_Facades/System.Drawing.Primitives.dll $(MAC_BUILD_DIR)/mobile/Facades
|
||||||
|
$(Q) cp $< $@
|
||||||
|
|
||||||
|
$(MONO_PATH)/mcs/class/lib/xammac_net_4_5/reference_Facades/System.Drawing.Primitives.dll: $(MAC_BUILD_DIR)/full-reference/Xamarin.Mac.dll
|
||||||
|
$(call Q_PROF_MCS,xammac_net_4_5) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/Facades/System.Drawing.Primitives PROFILE=xammac_net_4_5 LIBRARY_SUBDIR=reference_Facades EXTRA_LIB_MCS_FLAGS="-r:$(abspath $(MAC_BUILD_DIR)/full-reference/Xamarin.Mac.dll)"
|
||||||
|
|
||||||
|
$(MAC_BUILD_DIR)/full/Facades/System.Drawing.Primitives.dll: $(MONO_PATH)/mcs/class/lib/xammac_net_4_5/reference_Facades/System.Drawing.Primitives.dll $(MAC_BUILD_DIR)/full/Facades
|
||||||
|
$(Q) cp $< $@
|
||||||
|
|
||||||
|
.SECONDARY: $(MAC_BUILD_DIR)/mobile/Facades/System.Drawing.Primitives.dll $(MAC_BUILD_DIR)/full/Facades/System.Drawing.Primitives.dll
|
||||||
|
|
||||||
|
|
||||||
$(MAC_BUILD_DIR)/compat/XamMac.CFNetwork.dll: $(MAC_CFNETWORK_SOURCES) $(MAC_BUILD_DIR)/compat/XamMac.dll $(SN_KEY)
|
$(MAC_BUILD_DIR)/compat/XamMac.CFNetwork.dll: $(MAC_CFNETWORK_SOURCES) $(MAC_BUILD_DIR)/compat/XamMac.dll $(SN_KEY)
|
||||||
|
@ -545,21 +552,24 @@ $(MAC_BUILD_DIR)/compat/XamMac.CFNetwork.dll: $(MAC_CFNETWORK_SOURCES) $(MAC_BUI
|
||||||
|
|
||||||
MAC_VARIANTS_TARGETS = \
|
MAC_VARIANTS_TARGETS = \
|
||||||
$(MAC_BUILD_DIR)/compat/XamMac.dll \
|
$(MAC_BUILD_DIR)/compat/XamMac.dll \
|
||||||
# $(MAC_BUILD_DIR)/compat/Facades/System.Drawing.Primitives.dll \
|
|
||||||
$(MAC_BUILD_DIR)/mobile-32/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/mobile-32/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/mobile-64/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/mobile-64/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/full-32/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/full-32/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/full-64/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/full-64/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/full-reference/Xamarin.Mac.dll \
|
$(MAC_BUILD_DIR)/full-reference/Xamarin.Mac.dll \
|
||||||
$(MAC_BUILD_DIR)/compat/XamMac.CFNetwork.dll
|
$(MAC_BUILD_DIR)/compat/XamMac.CFNetwork.dll \
|
||||||
|
$(MAC_BUILD_DIR)/mobile/Facades/System.Drawing.Primitives.dll \
|
||||||
|
$(MAC_BUILD_DIR)/full/Facades/System.Drawing.Primitives.dll \
|
||||||
|
|
||||||
INSTALL_TARGETS+=install-mac
|
INSTALL_TARGETS+=install-mac
|
||||||
ALL_TARGETS+=all-mac
|
ALL_TARGETS+=all-mac
|
||||||
|
|
||||||
MAC_TARGETS_DIRS += \
|
MAC_TARGETS_DIRS += \
|
||||||
$(MAC_BUILD_DIR)/mobile \
|
$(MAC_BUILD_DIR)/mobile \
|
||||||
|
$(MAC_BUILD_DIR)/mobile/Facades \
|
||||||
$(MAC_BUILD_DIR)/full \
|
$(MAC_BUILD_DIR)/full \
|
||||||
|
$(MAC_BUILD_DIR)/full/Facades \
|
||||||
$(MAC_BUILD_DIR)/compat \
|
$(MAC_BUILD_DIR)/compat \
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/i386/mobile \
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/i386/mobile \
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/i386/full \
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/i386/full \
|
||||||
|
@ -597,6 +607,8 @@ MAC_TARGETS += \
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pmcs/profiles/unified \
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pmcs/profiles/unified \
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/Version \
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/Version \
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc \
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc \
|
||||||
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Facades/System.Drawing.Primitives.dll \
|
||||||
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Facades/System.Drawing.Primitives.dll \
|
||||||
|
|
||||||
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/XamMac.dll: $(MAC_BUILD_DIR)/compat/XamMac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono
|
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/XamMac.dll: $(MAC_BUILD_DIR)/compat/XamMac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono
|
||||||
$(Q) install -m 0755 $< $@
|
$(Q) install -m 0755 $< $@
|
||||||
|
|
Загрузка…
Ссылка в новой задаче