diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_bsddb.vcproj | 2 | ||||
| -rw-r--r-- | PCbuild/_ssl.mak | 5 | ||||
| -rw-r--r-- | PCbuild/build_ssl.bat | 2 | ||||
| -rw-r--r-- | PCbuild/build_ssl.py | 2 | ||||
| -rw-r--r-- | PCbuild/pcbuild.sln | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index f901d53..85da3b3 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -213,7 +213,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib" + AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib" OutputFile="./_bsddb.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak index 5641c6a..3420ef1 100644 --- a/PCbuild/_ssl.mak +++ b/PCbuild/_ssl.mak @@ -1,3 +1,4 @@ +EXTRA_LIBS= !IFDEF DEBUG SUFFIX=_d.pyd @@ -26,12 +27,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) $(EXTRA_LIBS) << _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) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj << 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 (
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 2a31ca4..96809b3 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -170,7 +170,7 @@ def main(): if debug: defs = defs + " " + "DEBUG=1" if arch in ('amd64', 'ia64'): - defs = defs + " EXTRA_CFLAGS=/GS-" + defs = defs + " EXTRA_CFLAGS=/GS- EXTRA_LIBS=bufferoverflowU.lib" makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags print "Executing:", makeCommand sys.stdout.flush() diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 20d3ecf..e44a39e 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -259,12 +259,14 @@ Global {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.ActiveCfg = Release|Win32 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.Build.0 = Release|Win32 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.ActiveCfg = Debug|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.Build.0 = Debug|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.ActiveCfg = Release|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.Build.0 = Release|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.ActiveCfg = Debug|Win32 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.Build.0 = Debug|Win32 |