diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-25 09:09:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-25 09:09:14 +0200 |
| commit | b1565e868d5549753fd710529b88bd4c183889ab (patch) | |
| tree | 1ec66b54444e5ad1a6c2836c648b3f1bf4c626d2 /xorg-server | |
| parent | 66841fa144ddd72df67ab1ddf880ca508d4bc9e3 (diff) | |
| download | vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.tar.gz vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.tar.bz2 vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.zip | |
zlib is now compiled as a dll
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/main.cc | 3 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 2 | ||||
| -rw-r--r-- | xorg-server/makefile | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc index 1bdcf6ae3..dcbb36d64 100644 --- a/xorg-server/hw/xwin/xlaunch/main.cc +++ b/xorg-server/hw/xwin/xlaunch/main.cc @@ -35,6 +35,9 @@ #include <X11/Xlib.h> #include <stdlib.h> +// Define here because it is not defined in stdlib.h because of the _POSIX_ defined +extern "C" +_Check_return_ _CRTIMP int __cdecl _putenv(_In_z_ const char * _EnvString); #include <sstream> /// @brief Send WM_ENDSESSION to all program windows. diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index a80c7dab5..5cb2cb654 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -98,7 +98,7 @@ Section "VcXsrv (required)" File "..\swrastwgl_dri_dbg.dll"
File "..\dxtn.dll"
File "..\..\libxml2\bin\libxml2.dll"
- File "..\..\libxml2\bin\zlib1.dll"
+ File "..\..\zlib\obj\release\zlib1.dll"
File "..\..\libxml2\bin\iconv.dll"
!ifndef VS2008
File "msvcr100.dll"
diff --git a/xorg-server/makefile b/xorg-server/makefile index 6cb0ee817..6e86820d0 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -43,16 +43,20 @@ INCLUDELIBFILES = \ $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\zlib\$(OBJDIR)\libz.lib \ $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ $(MHMAKECONF)\libfontenc\src\$(OBJDIR)\libfontenc.lib \ $(MHMAKECONF)\libXfont\src\freetype\$(OBJDIR)\libft.lib \ $(MHMAKECONF)\libXfont\src\stubs\$(OBJDIR)\libstubs.lib \ $(MHMAKECONF)\libXinerama\src\$(OBJDIR)\libXinerama.lib +INCLUDENOSERVLIBFILES = \ + $(MHMAKECONF)\zlib\$(NOSERVOBJDIR)\zlib1.lib + LIBDIRS=$(dir $(INCLUDELIBFILES)) +NOSERVLIBDIRS=$(dir $(INCLUDENOSERVLIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(NOSERVLIBDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) OBJS = dix\$(OBJDIR)\main.obj |