summaryrefslogtreecommitdiffstats
path: root/PC/VC6/_ssl.mak
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2009-03-18 11:39:46 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2009-03-18 11:39:46 (GMT)
commitecdfd513a2a506f70c4d5aa0f3d39b9323f91e6e (patch)
tree01abcae5588e2ba375b1e11ff446f82d55cce62b /PC/VC6/_ssl.mak
parent7303b594e62349251cbb9d98141a96885fc88e6f (diff)
downloadcpython-ecdfd513a2a506f70c4d5aa0f3d39b9323f91e6e.zip
cpython-ecdfd513a2a506f70c4d5aa0f3d39b9323f91e6e.tar.gz
cpython-ecdfd513a2a506f70c4d5aa0f3d39b9323f91e6e.tar.bz2
Merged revisions 70448 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70448 | hirokazu.yamamoto | 2009-03-18 19:17:26 +0900 | 3 lines Updated openssl support on VC6. (openssl-0.9.6g is old, cannot compile with _ssl.c) If you use http://svn.python.org/projects/external/openssl-0.9.8g, Perl is not needed. This scheme was ported from PCBuild. ........
Diffstat (limited to 'PC/VC6/_ssl.mak')
-rw-r--r--PC/VC6/_ssl.mak7
1 files changed, 4 insertions, 3 deletions
diff --git a/PC/VC6/_ssl.mak b/PC/VC6/_ssl.mak
index f8ba033..877a614 100644
--- a/PC/VC6/_ssl.mak
+++ b/PC/VC6/_ssl.mak
@@ -3,19 +3,20 @@
MODULE=_ssl_d.pyd
TEMP_DIR=x86-temp-debug/_ssl
CFLAGS=/Od /Zi /MDd /LDd /DDEBUG /D_DEBUG /DWIN32
-SSL_LIB_DIR=$(SSL_DIR)/out32.dbg
+LFLAGS=/nodefaultlib:"msvcrt"
!ELSE
MODULE=_ssl.pyd
TEMP_DIR=x86-temp-release/_ssl
CFLAGS=/Ox /MD /LD /DWIN32
-SSL_LIB_DIR=$(SSL_DIR)/out32
+LFLAGS=
!ENDIF
INCLUDES=-I ../../Include -I .. -I $(SSL_DIR)/inc32
+SSL_LIB_DIR=$(SSL_DIR)/out32
LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib
SOURCE=../../Modules/_ssl.c $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32.lib
$(MODULE): $(SOURCE) ../*.h ../../Include/*.h
@if not exist "$(TEMP_DIR)/." mkdir "$(TEMP_DIR)"
- cl /nologo $(SOURCE) $(CFLAGS) /Fo$(TEMP_DIR)\$*.obj $(INCLUDES) /link /out:$(MODULE) $(LIBS)
+ cl /nologo $(SOURCE) $(CFLAGS) /Fo$(TEMP_DIR)\$*.obj $(INCLUDES) /link /out:$(MODULE) $(LIBS) $(LFLAGS)