summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2007-06-12 16:08:27 (GMT)
committerThomas Heller <theller@ctypes.org>2007-06-12 16:08:27 (GMT)
commitc8720b9847c6c91416b2e7c75aaf01ef777e5ed1 (patch)
tree1f7259853d844c6b8272747f0368c5fc563bff19
parent04d17b4660e491b0b816da847ea70e86c482b709 (diff)
downloadcpython-c8720b9847c6c91416b2e7c75aaf01ef777e5ed1.zip
cpython-c8720b9847c6c91416b2e7c75aaf01ef777e5ed1.tar.gz
cpython-c8720b9847c6c91416b2e7c75aaf01ef777e5ed1.tar.bz2
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64.
-rw-r--r--PCbuild/_ssl.mak4
-rw-r--r--PCbuild/build_ssl.bat2
2 files changed, 4 insertions, 2 deletions
diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak
index 5641c6a..d6eb7b0 100644
--- a/PCbuild/_ssl.mak
+++ b/PCbuild/_ssl.mak
@@ -26,12 +26,12 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32
@if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl"
cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS)
+ /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) bufferoverflowU.lib
<<
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
+ /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj bufferoverflowU.lib
<<
diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat
index 82572ed..9aad441 100644
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/build_ssl.bat
@@ -1,3 +1,5 @@
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
+
@echo off
if not defined HOST_PYTHON (
if %1 EQU Debug (