Author: mattip <[email protected]>
Branch: win32-fixes3
Changeset: r63411:eb462464a1d1
Date: 2013-04-16 12:31 +0300
http://bitbucket.org/pypy/pypy/changeset/eb462464a1d1/
Log: corrected version of changeset 95c610ea4aed on py3k branch
diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
@@ -10,7 +10,7 @@
testonly_libraries = []
include_dirs = []
if sys.platform == 'win32' and platform.name != 'mingw32':
- libraries = ['libeay32', 'ssleay32',
+ libraries = ['libeay32', 'ssleay32', 'zlib1',
'user32', 'advapi32', 'gdi32', 'msvcrt', 'ws2_32']
includes = [
# ssl.h includes winsock.h, which will conflict with our own
diff --git a/rpython/rlib/rzlib.py b/rpython/rlib/rzlib.py
--- a/rpython/rlib/rzlib.py
+++ b/rpython/rlib/rzlib.py
@@ -10,7 +10,7 @@
if compiler.name == "msvc":
- libname = 'zlib'
+ libname = 'zlib1' # since version 1.1.4 and later, see
http://www.zlib.net/DLL_FAQ.txt
else:
libname = 'z'
eci = ExternalCompilationInfo(
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
