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/python.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/python.vcproj')
| -rw-r--r-- | PCbuild9/python.vcproj | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj index 8381dcf..7efa98d 100644 --- a/PCbuild9/python.vcproj +++ b/PCbuild9/python.vcproj @@ -20,7 +20,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -93,7 +93,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" @@ -117,7 +117,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -167,7 +167,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="0" @@ -192,7 +192,7 @@ Optimization="0" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" RuntimeLibrary="3" BrowseInformation="1" CompileAs="0" @@ -242,7 +242,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" @@ -268,7 +268,7 @@ Optimization="0" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" RuntimeLibrary="3" BrowseInformation="1" CompileAs="0" @@ -318,7 +318,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" @@ -341,7 +341,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -392,7 +392,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" @@ -416,7 +416,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -468,7 +468,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" @@ -491,7 +491,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -542,7 +542,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" @@ -566,7 +566,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;_CONSOLE" + PreprocessorDefinitions="_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" |