Fixed build order of the _ssl project. The openssl project needs to come first becaus...

Added some optimization flags to the Release builds of pythoncore and the executables.

diff --git a/PCbuild9/_ssl.vcproj b/PCbuild9/_ssl.vcproj
index 14cb70cca5d2c86dd20a3bbf091f134784bb74ab..0fcad8dfdb0cc411874813420ea9f89b60a74189 100644 (file)
--- a/PCbuild9/_ssl.vcproj
+++ b/PCbuild9/_ssl.vcproj
@@ -27,6 +27,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -54,7 +55,7 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -93,6 +94,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -121,7 +123,7 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -161,6 +163,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -191,7 +194,7 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -233,6 +236,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -264,7 +268,7 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"

diff --git a/PCbuild9/pyd.vsprops b/PCbuild9/pyd.vsprops
index 173a78a34c5c8df9e2c215c35cababa8895174c7..2a69d9599bc3992170679212f3fa40b17a69628c 100644 (file)
--- a/PCbuild9/pyd.vsprops
+++ b/PCbuild9/pyd.vsprops
@@ -14,10 +14,10 @@
                Name="VCLinkerTool"
                OutputFile="$(OutDir)\$(ProjectName).pyd"
                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-               ImportLibrary="$(IntDir)\$(TargetName).lib"
+               ImportLibrary="$(OutDir)\$(TargetName).lib"
        />
        <Tool
                Name="VCPostBuildEventTool"
-               CommandLine="copy $(IntDir)\$(ProjectName).lib $(OutDir)"
+               CommandLine=""
        />
 </VisualStudioPropertySheet>

diff --git a/PCbuild9/pyd_d.vsprops b/PCbuild9/pyd_d.vsprops
index c29d563d72262f43abbb0d65de688a0c1907c9c1..8fc10b98588a597895a86674c86f2888621700e8 100644 (file)
--- a/PCbuild9/pyd_d.vsprops
+++ b/PCbuild9/pyd_d.vsprops
@@ -17,10 +17,10 @@
                OutputFile="$(OutDir)\$(ProjectName)_d.pyd"
                LinkIncremental="1"
                ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
-               ImportLibrary="$(IntDir)\$(TargetName).lib"
+               ImportLibrary="$(OutDir)\$(TargetName).lib"
        />
        <Tool
                Name="VCPostBuildEventTool"
-               CommandLine="copy $(IntDir)\$(ProjectName)_d.lib $(OutDir)"
+               CommandLine=""
        />
 </VisualStudioPropertySheet>

diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj
index fa3c0e165f078415d8e941c0fb24712abd712f0e..e470bedbed5968c9e69e55254ef7321e9bb1ec34 100644 (file)
--- a/PCbuild9/python.vcproj
+++ b/PCbuild9/python.vcproj
@@ -69,6 +69,9 @@
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1d000000"
                        />
                        <Tool
@@ -146,6 +149,9 @@
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1d000000"
                        />
                        <Tool

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index 87cab016156c7b6cd05e69c7e3aab00f6bb23cb8..a8c25d69bb253edc977e81a3804a49f08f781d40 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -68,6 +68,9 @@
                                OutputFile="$(OutDir)\$(PyDllName).dll"
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1e000000"
                                ImportLibrary="$(OutDir)$(PyDllName).lib"
                        />
@@ -144,6 +147,9 @@
                                OutputFile="$(OutDir)\$(PyDllName).dll"
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1e000000"
                                ImportLibrary="$(OutDir)$(PyDllName).lib"
                        />

diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj
index c4ec4420c3eb0a4c635bf111538d14e1f212cc89..6b08fa9679b3291f930bf328383bf8c836e1e41c 100644 (file)
--- a/PCbuild9/pythonw.vcproj
+++ b/PCbuild9/pythonw.vcproj
@@ -211,6 +211,9 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1d000000"
                                TargetMachine="1"
                        />
@@ -287,6 +290,9 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1d000000"
                        />
                        <Tool

diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj
index 23f10565e48a94391e411fe6eb26f278fb111a28..9596806255a77f948976ac46b085bdf2a98b94b0 100644 (file)
--- a/PCbuild9/w9xpopen.vcproj
+++ b/PCbuild9/w9xpopen.vcproj
@@ -199,7 +199,10 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               GenerateDebugInformation="false"
                                SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -268,7 +271,10 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               GenerateDebugInformation="false"
                                SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
                        />
                        <Tool
                                Name="VCALinkTool"