Merge pull request #117 from R1kaB3rN/xorg-macros

fix: build xorg-macros before xrandr
Open-Wine-Components · Aug 31, 2024 · 286404f · 286404f
2 parents 0bd7e8f + 00129ee
commit 286404f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "subprojects/libmspack"]
 	path = subprojects/libmspack
 	url = https://github.com/kyz/libmspack.git
+[submodule "subprojects/xutils-dev"]
+	path = subprojects/xutils-dev
+	url = https://salsa.debian.org/xorg-team/app/xutils-dev.git
diff --git a/Makefile b/Makefile
@@ -32,6 +32,10 @@ protonfixes-install: protonfixes
 #
 
 $(OBJDIR)/.build-xrandr-dist: | $(OBJDIR)
+	$(info :: Installing xorg-macros )
+	cd subprojects/xutils-dev/util-macros && \
+	./configure --prefix=/usr && \
+	make install
 	$(info :: Building xrandr )
 	cd subprojects/x11-xserver-utils/xrandr && \
 	./configure --prefix=/usr && \

diff --git a/subprojects/xutils-dev b/subprojects/xutils-dev