diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-26 08:56:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-26 08:56:57 +0200 |
| commit | 8fd115adc568833cdb5af22b65a09c38e0eac20f (patch) | |
| tree | 64c202a2f8a02ca912c6f6927dd3d01becf79d34 /xorg-server/hw/xwin/xlaunch | |
| parent | cb7834dd9f1b1816536a5ba419095c160f22a758 (diff) | |
| download | vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.tar.gz vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.tar.bz2 vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.zip | |
libX11 is now compiled as dll
Diffstat (limited to 'xorg-server/hw/xwin/xlaunch')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 14 |
1 files changed, 3 insertions, 11 deletions
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
|