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 --- xorg-server/hw/xwin/xlaunch/makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'xorg-server/hw/xwin/xlaunch') diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile index 7c6c27dd6..98656e57e 100644 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ b/xorg-server/hw/xwin/xlaunch/makefile @@ -1,15 +1,7 @@ INCLUDELIBFILES = window\$(OBJDIR)\window.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ - $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.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\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib + $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib CSRCS=config.cc main.cc @@ -24,7 +16,7 @@ $(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib -- cgit v1.2.3