From ad32deb20eba432fcf6dbd095c25917fa6077ff2 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 20 Nov 2007 05:57:30 +0000 Subject: [PATCH] Report #1473 Drop _EXPORTS macros in PCbuild9 I've removed a bunch of obsolete defines. I've also taken the opportunity to fix the pre-link event of sqlite3 and some optimization flags. --- PCbuild9/_bsddb.vcproj | 10 +- PCbuild9/_ctypes.vcproj | 8 +- PCbuild9/_ctypes_test.vcproj | 4 - PCbuild9/_msi.vcproj | 4 - PCbuild9/_socket.vcproj | 4 - PCbuild9/_sqlite3.vcproj | 8 +- PCbuild9/_ssl.vcproj | 4 - PCbuild9/_template.vcproj | 227 ------------------------------- PCbuild9/_testcapi.vcproj | 4 - PCbuild9/_tkinter.vcproj | 8 +- PCbuild9/bz2.vcproj | 4 - PCbuild9/make_buildinfo.vcproj | 2 +- PCbuild9/make_versioninfo.vcproj | 60 +++++++- PCbuild9/pyd.vsprops | 2 +- PCbuild9/pyd_d.vsprops | 2 +- PCbuild9/python.vcproj | 10 +- PCbuild9/pythoncore.vcproj | 10 +- PCbuild9/pythonw.vcproj | 10 +- PCbuild9/select.vcproj | 4 - PCbuild9/unicodedata.vcproj | 4 - PCbuild9/w9xpopen.vcproj | 8 +- PCbuild9/winsound.vcproj | 4 - 22 files changed, 91 insertions(+), 310 deletions(-) delete mode 100644 PCbuild9/_template.vcproj diff --git a/PCbuild9/_bsddb.vcproj b/PCbuild9/_bsddb.vcproj index e558036ee1d..c2e1ffd609b 100644 --- a/PCbuild9/_bsddb.vcproj +++ b/PCbuild9/_bsddb.vcproj @@ -43,7 +43,6 @@ diff --git a/PCbuild9/_ctypes_test.vcproj b/PCbuild9/_ctypes_test.vcproj index 7c9f2efd651..b9cdfb0f42c 100644 --- a/PCbuild9/_ctypes_test.vcproj +++ b/PCbuild9/_ctypes_test.vcproj @@ -42,7 +42,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PCbuild9/_testcapi.vcproj b/PCbuild9/_testcapi.vcproj index 7a12ae6b055..a169bd814d3 100644 --- a/PCbuild9/_testcapi.vcproj +++ b/PCbuild9/_testcapi.vcproj @@ -42,7 +42,6 @@ /> diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj index a1f31fda0a5..5199d847ba1 100644 --- a/PCbuild9/make_versioninfo.vcproj +++ b/PCbuild9/make_versioninfo.vcproj @@ -48,7 +48,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -71,6 +71,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" BaseAddress="0x1d000000" /> + + + + + + + + + + + + + + + + + + + diff --git a/PCbuild9/pyd.vsprops b/PCbuild9/pyd.vsprops index 2a69d9599bc..7600ee66f40 100644 --- a/PCbuild9/pyd.vsprops +++ b/PCbuild9/pyd.vsprops @@ -7,7 +7,7 @@ > @@ -70,7 +70,6 @@ ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" OptimizeReferences="2" EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" BaseAddress="0x1e000000" ImportLibrary="$(OutDir)$(PyDllName).lib" /> @@ -123,7 +122,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT" + PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT;_USRDLL" RuntimeLibrary="2" UsePrecompiledHeader="0" /> @@ -149,7 +148,6 @@ ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" OptimizeReferences="2" EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" BaseAddress="0x1e000000" ImportLibrary="$(OutDir)$(PyDllName).lib" /> @@ -203,7 +201,7 @@ Optimization="0" InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;_USRDLL" RuntimeLibrary="3" UsePrecompiledHeader="0" /> @@ -281,7 +279,7 @@ Optimization="0" InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;_USRDLL" RuntimeLibrary="3" UsePrecompiledHeader="0" /> diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj index 6b08fa9679b..e32b42d0dbe 100644 --- a/PCbuild9/pythonw.vcproj +++ b/PCbuild9/pythonw.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="_DEBUG;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="0" CompileAs="0" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="_DEBUG;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="0" CompileAs="0" @@ -188,7 +188,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -213,7 +213,6 @@ StackReserveSize="2000000" OptimizeReferences="2" EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" BaseAddress="0x1d000000" TargetMachine="1" /> @@ -267,7 +266,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -292,7 +291,6 @@ StackReserveSize="2000000" OptimizeReferences="2" EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" BaseAddress="0x1d000000" />