aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/xauth/makefile2
-rw-r--r--apps/xcalc/makefile2
-rw-r--r--apps/xclock/makefile2
-rw-r--r--apps/xhost/makefile2
-rw-r--r--apps/xwininfo/makefile2
-rw-r--r--libxcb/src/makefile2
-rw-r--r--xkbcomp/makefile2
-rw-r--r--xorg-server/xkeyboard-config/xkbrules.mak4
8 files changed, 11 insertions, 7 deletions
diff --git a/apps/xauth/makefile b/apps/xauth/makefile
index fbe2337c0..2e6125ac5 100644
--- a/apps/xauth/makefile
+++ b/apps/xauth/makefile
@@ -3,7 +3,7 @@ TTYAPP = xauth
INCLUDELIBFILES = \
..\common\$(OBJDIR)\common.lib \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
$(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib
diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile
index a4deb34cc..28b93be60 100644
--- a/apps/xcalc/makefile
+++ b/apps/xcalc/makefile
@@ -5,7 +5,7 @@ DEFINES += XT_NO_SM IEEE
INCLUDELIBFILES = \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
$(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \
$(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
diff --git a/apps/xclock/makefile b/apps/xclock/makefile
index 2f0381b6a..bc89baee9 100644
--- a/apps/xclock/makefile
+++ b/apps/xclock/makefile
@@ -6,7 +6,7 @@ INCLUDELIBFILES = \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
$(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib \
$(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \
$(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
diff --git a/apps/xhost/makefile b/apps/xhost/makefile
index 023fdc01b..44579d289 100644
--- a/apps/xhost/makefile
+++ b/apps/xhost/makefile
@@ -5,7 +5,7 @@ TTYAPP = xhost
INCLUDELIBFILES = \
..\common\$(OBJDIR)\common.lib \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
$(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \
diff --git a/apps/xwininfo/makefile b/apps/xwininfo/makefile
index 91770da3a..d7693cd1f 100644
--- a/apps/xwininfo/makefile
+++ b/apps/xwininfo/makefile
@@ -2,7 +2,7 @@ TTYAPP = xwininfo
INCLUDELIBFILES = \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
$(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib
diff --git a/libxcb/src/makefile b/libxcb/src/makefile
index 3dc8d38e5..c73c814ee 100644
--- a/libxcb/src/makefile
+++ b/libxcb/src/makefile
@@ -7,7 +7,7 @@ CSRCS = \
DEFINES += PTW32_STATIC_LIB HAVE_GETADDRINFO LIBXCB_DLL
INCLUDELIBFILES = \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib
LIBDIRS=$(dir $(INCLUDELIBFILES))
diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index f739de1f8..b2e770861 100644
--- a/xkbcomp/makefile
+++ b/xkbcomp/makefile
@@ -1,6 +1,6 @@
INCLUDELIBFILES = $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \
+ $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib
LIBDIRS=$(dir $(INCLUDELIBFILES))
diff --git a/xorg-server/xkeyboard-config/xkbrules.mak b/xorg-server/xkeyboard-config/xkbrules.mak
index 7e8f11fbc..8c1efbec9 100644
--- a/xorg-server/xkeyboard-config/xkbrules.mak
+++ b/xorg-server/xkeyboard-config/xkbrules.mak
@@ -14,6 +14,10 @@ $(DESTDIR)\%: %
ifneq ($(DIRFILE),)
.PHONY: extrastuff
+#bdftopcf is dependent on libX11.dll, so we need to add the directory of the libX11 dll to the path env variable
+PATH:=$(relpath $(MHMAKECONF)\libxcb\src\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libX11\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libXau\$(OBJDIR))\;$(PATH)
+export PATH
+
$(DIRFILE): extrastuff $(DATA_FILES)
-del -e $@
cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *