Patch #1307806: Use project defaults where possible
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 15a37e5..cc6d9c5 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -29,10 +29,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\x86-temp-release\pythoncore/"
- ObjectFile=".\x86-temp-release\pythoncore/"
- ProgramDataBaseFileName=".\x86-temp-release\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -52,13 +48,7 @@
ImportLibrary=".\./python25.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -96,10 +86,6 @@
PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\x86-temp-debug\pythoncore/"
- ObjectFile=".\x86-temp-debug\pythoncore/"
- ProgramDataBaseFileName=".\x86-temp-debug\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -119,13 +105,7 @@
ImportLibrary=".\./python25_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -168,10 +148,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\ia64-temp-release\pythoncore/"
- ObjectFile=".\ia64-temp-release\pythoncore/"
- ProgramDataBaseFileName=".\ia64-temp-release\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -193,13 +169,7 @@
ImportLibrary=".\./python25.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -310,30 +280,6 @@
</File>
<File
RelativePath="..\Modules\_codecsmodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_csv.c">
@@ -343,84 +289,12 @@
</File>
<File
RelativePath="..\Modules\_hotshot.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_localemodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_randommodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_sre.c">