summaryrefslogtreecommitdiffstats
path: root/PCbuild9/w9xpopen.vcproj
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-30 19:27:20 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-30 19:27:20 (GMT)
commitd59c64c49fe66c8cccd22e9bda570f71f70e6014 (patch)
treeb3749e1c47338d9c3dc4424933e0d9f438e58d4b /PCbuild9/w9xpopen.vcproj
parent45031dfd1c37fca6361e881d56f4e62f800af91a (diff)
downloadcpython-d59c64c49fe66c8cccd22e9bda570f71f70e6014.zip
cpython-d59c64c49fe66c8cccd22e9bda570f71f70e6014.tar.gz
cpython-d59c64c49fe66c8cccd22e9bda570f71f70e6014.tar.bz2
Merged revisions 59234-59238 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59237 | facundo.batista | 2007-11-30 18:15:25 +0100 (Fri, 30 Nov 2007) | 4 lines Reordering of __new__ to minimize isinstance() calls to most used types. Thanks Mark Dickinson. ........ r59238 | christian.heimes | 2007-11-30 20:18:08 +0100 (Fri, 30 Nov 2007) | 6 lines Removed or replaced some more deprecated preprocessor macros. Moved the _DEBUG and NDEBUG macros to two new property files. Fixed #1527 Problem with static libs on Windows Updated README.txt ........
Diffstat (limited to 'PCbuild9/w9xpopen.vcproj')
-rw-r--r--PCbuild9/w9xpopen.vcproj24
1 files changed, 8 insertions, 16 deletions
diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj
index d00cef4..2397366 100644
--- a/PCbuild9/w9xpopen.vcproj
+++ b/PCbuild9/w9xpopen.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="0"
@@ -44,7 +44,6 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
/>
@@ -86,7 +85,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -110,7 +109,6 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
/>
@@ -152,7 +150,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -176,7 +174,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -220,7 +217,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -245,7 +242,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -289,7 +285,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -313,7 +309,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -358,7 +353,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -383,7 +378,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -429,7 +423,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -453,7 +447,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -498,7 +491,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -523,7 +516,6 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"