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 /xkbcomp | |
| parent | cb7834dd9f1b1816536a5ba419095c160f22a758 (diff) | |
| download | vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.tar.gz vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.tar.bz2 vcxsrv-8fd115adc568833cdb5af22b65a09c38e0eac20f.zip | |
libX11 is now compiled as dll
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/makefile | 12 |
1 files changed, 2 insertions, 10 deletions
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 |