Skip to content

Commit

Permalink
wpf: Add System.Windows.Controls.Ribbon.dll.
Browse files Browse the repository at this point in the history 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49804
  • Loading branch information
Esme Povirk committed Sep 19, 2023
1 parent 837761e commit e11ab65
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion wpf
Submodule wpf updated 5 files
+3 −0 src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/AssemblyVersion.cs
+29 −0 src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Makefile
+80 −0 src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Resources/System.Windows.Controls.Ribbon.g.resx
+2 −0 src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/embeddedresources.list
+133 −0 src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/sources.list
11 changes: 11 additions & 0 deletions wpf.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/.built: $(BUI
+$(MONO_ENV) $(MAKE) -C $(@D) MONO_PREFIX=$(BUILDDIR_ABS)/mono-unix-install RESX2SRID=$(BUILDDIR_ABS)/resx2srid.exe WINE_MONO_SRCDIR=$(SRCDIR_ABS) WINFORMS_DLL=$(SRCDIR_ABS)/winforms/src/System.Windows.Forms/src/System.Windows.Forms.dll
touch $@

$(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/.built: $(BUILDDIR)/mono-unix/.installed $(WPF_SRCS) $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Xaml/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/PresentationCore/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/.built $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/.built $(BUILDDIR)/resx2srid.exe
+$(MONO_ENV) $(MAKE) -C $(@D) MONO_PREFIX=$(BUILDDIR_ABS)/mono-unix-install RESX2SRID=$(BUILDDIR_ABS)/resx2srid.exe WINE_MONO_SRCDIR=$(SRCDIR_ABS)
touch $@

ifeq (1,$(ENABLE_DOTNET_CORE_WPF))
IMAGEDIR_BUILD_TARGETS += $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Xaml/.built

Expand Down Expand Up @@ -260,5 +264,12 @@ WindowsFormsIntegration.dll: $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/WindowsF
$(MONO_ENV) gacutil -i $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.dll -root $(IMAGEDIR)/lib
.PHONY: WindowsFormsIntegration.dll
imagedir-targets: WindowsFormsIntegration.dll

IMAGEDIR_BUILD_TARGETS += $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/.built

System.Windows.Controls.Ribbon.dll: $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/.built
$(MONO_ENV) gacutil -i $(SRCDIR)/wpf/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.dll -root $(IMAGEDIR)/lib
.PHONY: System.Windows.Controls.Ribbon.dll
imagedir-targets: System.Windows.Controls.Ribbon.dll
endif

0 comments on commit e11ab65

Please sign in to comment.