From 532bc0375fbcdce74a95dda422b4460ed52455ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 3 Jan 2006 07:38:51 +0000 Subject: [PATCH] Patch #1307806: Use project defaults where possible --- PCbuild/_bsddb.vcproj | 72 ++-------------- PCbuild/_socket.vcproj | 72 ++-------------- PCbuild/_testcapi.vcproj | 73 ++-------------- PCbuild/_tkinter.vcproj | 96 ++------------------- PCbuild/bz2.vcproj | 72 ++-------------- PCbuild/make_versioninfo.vcproj | 42 +--------- PCbuild/pyexpat.vcproj | 144 ++------------------------------ PCbuild/python.vcproj | 70 +--------------- PCbuild/pythoncore.vcproj | 132 +---------------------------- PCbuild/pythonw.vcproj | 81 +----------------- PCbuild/select.vcproj | 72 ++-------------- PCbuild/unicodedata.vcproj | 73 ++-------------- PCbuild/w9xpopen.vcproj | 47 +---------- PCbuild/winsound.vcproj | 73 ++-------------- 14 files changed, 71 insertions(+), 1048 deletions(-) diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index c1298ab2446..e10b9d89f82 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -24,10 +24,6 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\_bsddb/_bsddb.pch" - AssemblerListingLocation=".\x86-temp-debug\_bsddb/" - ObjectFile=".\x86-temp-debug\_bsddb/" - ProgramDataBaseFileName=".\x86-temp-debug\_bsddb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -48,13 +44,7 @@ ImportLibrary=".\./_bsddb_d.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj index 313189b1b93..008cd3d1afd 100644 --- a/PCbuild/_socket.vcproj +++ b/PCbuild/_socket.vcproj @@ -24,10 +24,6 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\_socket/_socket.pch" - AssemblerListingLocation=".\x86-temp-debug\_socket/" - ObjectFile=".\x86-temp-debug\_socket/" - ProgramDataBaseFileName=".\x86-temp-debug\_socket/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -47,13 +43,7 @@ ImportLibrary=".\./_socket_d.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/_testcapi.vcproj b/PCbuild/_testcapi.vcproj index 222fd7e3628..46eac065fbb 100644 --- a/PCbuild/_testcapi.vcproj +++ b/PCbuild/_testcapi.vcproj @@ -28,10 +28,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\_testcapi/_testcapi.pch" - AssemblerListingLocation=".\x86-temp-release\_testcapi/" - ObjectFile=".\x86-temp-release\_testcapi/" - ProgramDataBaseFileName=".\x86-temp-release\_testcapi/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -47,13 +43,7 @@ ImportLibrary=".\./_testcapi.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj index 71793690ddd..afacc515ff2 100644 --- a/PCbuild/_tkinter.vcproj +++ b/PCbuild/_tkinter.vcproj @@ -27,10 +27,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\_tkinter/_tkinter.pch" - AssemblerListingLocation=".\x86-temp-release\_tkinter/" - ObjectFile=".\x86-temp-release\_tkinter/" - ProgramDataBaseFileName=".\x86-temp-release\_tkinter/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -51,13 +47,7 @@ ImportLibrary=".\./_tkinter.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index 4e8ef9807e2..8083a35b7f3 100644 --- a/PCbuild/bz2.vcproj +++ b/PCbuild/bz2.vcproj @@ -25,10 +25,6 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\bz2/bz2.pch" - AssemblerListingLocation=".\x86-temp-debug\bz2/" - ObjectFile=".\x86-temp-debug\bz2/" - ProgramDataBaseFileName=".\x86-temp-debug\bz2/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -49,13 +45,7 @@ ImportLibrary=".\./bz2_d.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/make_versioninfo.vcproj b/PCbuild/make_versioninfo.vcproj index 8a3cba7d799..7bdaaccc31c 100644 --- a/PCbuild/make_versioninfo.vcproj +++ b/PCbuild/make_versioninfo.vcproj @@ -29,10 +29,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\make_versioninfo/make_versioninfo.pch" - AssemblerListingLocation=".\x86-temp-release\make_versioninfo/" - ObjectFile=".\x86-temp-release\make_versioninfo/" - ProgramDataBaseFileName=".\x86-temp-release\make_versioninfo/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -54,9 +50,7 @@ BaseAddress="0x1d000000" TargetMachine="1"/> + Name="VCMIDLTool"/> @@ -65,9 +59,7 @@ + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> @@ -131,10 +117,7 @@ + Name="VCResourceCompilerTool"/> - - - - - - diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj index deb0cfb9528..bd58c0eeada 100644 --- a/PCbuild/pyexpat.vcproj +++ b/PCbuild/pyexpat.vcproj @@ -24,10 +24,6 @@ PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\pyexpat/pyexpat.pch" - AssemblerListingLocation=".\x86-temp-debug\pyexpat/" - ObjectFile=".\x86-temp-debug\pyexpat/" - ProgramDataBaseFileName=".\x86-temp-debug\pyexpat/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -47,13 +43,7 @@ ImportLibrary=".\./pyexpat_d.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj index 722bf4344cc..287a0e9820b 100644 --- a/PCbuild/python.vcproj +++ b/PCbuild/python.vcproj @@ -28,10 +28,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\python/python.pch" - AssemblerListingLocation=".\x86-temp-release\python/" - ObjectFile=".\x86-temp-release\python/" - ProgramDataBaseFileName=".\x86-temp-release\python/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -51,9 +47,7 @@ BaseAddress="0x1d000000" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 15a37e51de0..cc6d9c50eba 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"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> - - - - - - - - - @@ -343,84 +289,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/pythonw.vcproj b/PCbuild/pythonw.vcproj index 1ac107a15a3..baf5e4ac3c0 100644 --- a/PCbuild/pythonw.vcproj +++ b/PCbuild/pythonw.vcproj @@ -24,10 +24,6 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\pythonw/pythonw.pch" - AssemblerListingLocation=".\x86-temp-debug\pythonw/" - ObjectFile=".\x86-temp-debug\pythonw/" - ProgramDataBaseFileName=".\x86-temp-debug\pythonw/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -46,13 +42,7 @@ BaseAddress="0x1d000000" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> + Name="VCMIDLTool"/> - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj index 2cab4cc1cad..1c1343328d5 100644 --- a/PCbuild/select.vcproj +++ b/PCbuild/select.vcproj @@ -27,10 +27,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\select/select.pch" - AssemblerListingLocation=".\x86-temp-release\select/" - ObjectFile=".\x86-temp-release\select/" - ProgramDataBaseFileName=".\x86-temp-release\select/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -51,13 +47,7 @@ ImportLibrary=".\./select.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/unicodedata.vcproj b/PCbuild/unicodedata.vcproj index 16bb4aa74d7..da49b159239 100644 --- a/PCbuild/unicodedata.vcproj +++ b/PCbuild/unicodedata.vcproj @@ -28,10 +28,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-release\unicodedata/unicodedata.pch" - AssemblerListingLocation=".\x86-temp-release\unicodedata/" - ObjectFile=".\x86-temp-release\unicodedata/" - ProgramDataBaseFileName=".\x86-temp-release\unicodedata/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -47,13 +43,7 @@ ImportLibrary=".\./unicodedata.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - - diff --git a/PCbuild/w9xpopen.vcproj b/PCbuild/w9xpopen.vcproj index 76e7f92d6f6..9015500dda6 100644 --- a/PCbuild/w9xpopen.vcproj +++ b/PCbuild/w9xpopen.vcproj @@ -25,10 +25,6 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\w9xpopen/w9xpopen.pch" - AssemblerListingLocation=".\x86-temp-debug\w9xpopen/" - ObjectFile=".\x86-temp-debug\w9xpopen/" - ProgramDataBaseFileName=".\x86-temp-debug\w9xpopen/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3"/> @@ -43,13 +39,7 @@ ProgramDatabaseFile=".\./w9xpopen_d.pdb" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - diff --git a/PCbuild/winsound.vcproj b/PCbuild/winsound.vcproj index f3790d877ec..c1e8130372e 100644 --- a/PCbuild/winsound.vcproj +++ b/PCbuild/winsound.vcproj @@ -26,10 +26,6 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\x86-temp-debug\winsound/winsound.pch" - AssemblerListingLocation=".\x86-temp-debug\winsound/" - ObjectFile=".\x86-temp-debug\winsound/" - ProgramDataBaseFileName=".\x86-temp-debug\winsound/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" @@ -48,13 +44,7 @@ ImportLibrary=".\./winsound_d.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> @@ -114,13 +98,7 @@ ImportLibrary=".\./winsound.lib" TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> + Name="VCMIDLTool"/> + Name="VCResourceCompilerTool"/> - - - - - - - - -