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 | |
| 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')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 14 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 1 | ||||
| -rw-r--r-- | xorg-server/makefile | 14 |
3 files changed, 6 insertions, 23 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
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 4286a9151..b9fcc61c3 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -100,6 +100,7 @@ Section "VcXsrv (required)" File "..\..\libxml2\bin\libxml2.dll"
File "..\..\zlib\obj\release\zlib1.dll"
File "..\..\libXau\obj\release\libXau.dll"
+ File "..\..\libX11\obj\release\libX11.dll"
File "..\..\libxml2\bin\iconv.dll"
!ifndef VS2008
File "msvcr100.dll"
diff --git a/xorg-server/makefile b/xorg-server/makefile index 2d3eac036..55fbd6ef8 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -27,16 +27,7 @@ INCLUDELIBFILES = \ render\$(OBJDIR)\librender.lib \ INCLUDENOSERVLIBFILES = \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(NOSERVOBJDIR)\libximcp.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(NOSERVOBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\src\$(NOSERVOBJDIR)\libx11.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(NOSERVOBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(NOSERVOBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(NOSERVOBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(NOSERVOBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(NOSERVOBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(NOSERVOBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(NOSERVOBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libX11\$(NOSERVOBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(NOSERVOBJDIR)\libxcb.lib \ $(MHMAKECONF)\pixman\pixman\$(NOSERVOBJDIR)\libpixman-1.lib \ $(MHMAKECONF)\libXdmcp\$(NOSERVOBJDIR)\libXdmcp.lib \ @@ -133,12 +124,11 @@ load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0 plink.exe: ..\tools\plink\obj\release\plink.exe copy $< $@ -load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0 load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0 load_makefile xkeyboard-config\makefile MAKESERVER=0 DEBUG=0 all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB xhost.exe xauth.exe \ - ..\libX11\nls\all fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \ + fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \ xwininfo.exe swrast_dri_dbg.dll swrast_dri.dll dxtn.dll dxtn_dbg.dll \ swrastwgl_dri.dll swrastwgl_dri_dbg.dll |