diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-30 19:27:20 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-30 19:27:20 (GMT) |
| commit | d59c64c49fe66c8cccd22e9bda570f71f70e6014 (patch) | |
| tree | b3749e1c47338d9c3dc4424933e0d9f438e58d4b /PCbuild9/make_versioninfo.vcproj | |
| parent | 45031dfd1c37fca6361e881d56f4e62f800af91a (diff) | |
| download | cpython-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/make_versioninfo.vcproj')
| -rw-r--r-- | PCbuild9/make_versioninfo.vcproj | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj index 61feabb..dcb922b 100644 --- a/PCbuild9/make_versioninfo.vcproj +++ b/PCbuild9/make_versioninfo.vcproj @@ -21,7 +21,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -50,7 +50,7 @@ InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -99,7 +99,7 @@ <Configuration Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -124,7 +124,7 @@ Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" /> <Tool Name="VCManagedResourceCompilerTool" @@ -165,7 +165,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="0" @@ -194,7 +194,7 @@ InlineFunctionExpansion="1" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -243,7 +243,7 @@ <Configuration Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -269,7 +269,7 @@ Optimization="0" InlineFunctionExpansion="1" EnableIntrinsicFunctions="false" - PreprocessorDefinitions="_DEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" /> <Tool Name="VCManagedResourceCompilerTool" |