From 8fd115adc568833cdb5af22b65a09c38e0eac20f Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 26 Jun 2012 08:56:57 +0200 Subject: libX11 is now compiled as dll --- xkbcomp/makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'xkbcomp/makefile') diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 298d795a6..f739de1f8 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -1,19 +1,11 @@ -INCLUDELIBFILES = $(MHMAKECONF)\libx11\src\$(OBJDIR)\libx11.lib \ - $(MHMAKECONF)\libx11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ +INCLUDELIBFILES = $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \ $(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) ifeq $(DEBUG),1 TTYAPP = xkbcomp -- cgit v1.2.3