summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-04-26 17:19:44 +0000
committerMartin v. Löwis <martin@v.loewis.de>2006-04-26 17:19:44 +0000
commit80990a6a6079d9b293ad882b2a74cc8cd99992c1 (patch)
tree61e7d5cc0b09055038665dc7f96e88806be64362
parenta113b793c0c55f5980aceda6d646f06bda659417 (diff)
downloadcpython-80990a6a6079d9b293ad882b2a74cc8cd99992c1.tar.gz
Use GS- and bufferoverlowU.lib where appropriate, for AMD64.
-rw-r--r--PCbuild/_bsddb.vcproj2
-rw-r--r--PCbuild/_elementtree.vcproj2
-rw-r--r--PCbuild/_msi.vcproj4
-rw-r--r--PCbuild/_socket.vcproj2
-rw-r--r--PCbuild/_testcapi.vcproj2
-rw-r--r--PCbuild/_tkinter.vcproj2
-rw-r--r--PCbuild/bz2.vcproj2
-rw-r--r--PCbuild/pythoncore.vcproj2
-rw-r--r--PCbuild/unicodedata.vcproj2
-rw-r--r--PCbuild/winsound.vcproj2
10 files changed, 11 insertions, 11 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index 581c3fcb24..4a612a440c 100644
--- a/PCbuild/_bsddb.vcproj
+++ b/PCbuild/_bsddb.vcproj
@@ -192,7 +192,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
diff --git a/PCbuild/_elementtree.vcproj b/PCbuild/_elementtree.vcproj
index 3278874cce..dec48e32f6 100644
--- a/PCbuild/_elementtree.vcproj
+++ b/PCbuild/_elementtree.vcproj
@@ -190,7 +190,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj
index 503c174df1..fb8925ef62 100644
--- a/PCbuild/_msi.vcproj
+++ b/PCbuild/_msi.vcproj
@@ -189,7 +189,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
@@ -210,7 +210,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib"
OutputFile="./_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj
index bdfc9d9923..22fb492c08 100644
--- a/PCbuild/_socket.vcproj
+++ b/PCbuild/_socket.vcproj
@@ -189,7 +189,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
diff --git a/PCbuild/_testcapi.vcproj b/PCbuild/_testcapi.vcproj
index f286a300ea..c58331e97d 100644
--- a/PCbuild/_testcapi.vcproj
+++ b/PCbuild/_testcapi.vcproj
@@ -185,7 +185,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj
index 57b76069db..4ffeae5a46 100644
--- a/PCbuild/_tkinter.vcproj
+++ b/PCbuild/_tkinter.vcproj
@@ -192,7 +192,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index 841e94d50b..8cbe15a3cf 100644
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -202,7 +202,7 @@ nmake /nologo /f makefile.msc lib
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 910dbb1d30..5f39a17037 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -211,7 +211,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/Zm200 /USECL:MS_OPTERON"
+ AdditionalOptions="/Zm200 /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
diff --git a/PCbuild/unicodedata.vcproj b/PCbuild/unicodedata.vcproj
index e48e535997..472b6b7e31 100644
--- a/PCbuild/unicodedata.vcproj
+++ b/PCbuild/unicodedata.vcproj
@@ -185,7 +185,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
diff --git a/PCbuild/winsound.vcproj b/PCbuild/winsound.vcproj
index b645a24495..34aadbf18a 100644
--- a/PCbuild/winsound.vcproj
+++ b/PCbuild/winsound.vcproj
@@ -188,7 +188,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"