Author: christian.heimes
Date: Mon Nov 19 19:35:20 2007
New Revision: 59057
Modified:
python/branches/py3k/PCbuild9/_ssl.vcproj
python/branches/py3k/PCbuild9/pyd.vsprops
python/branches/py3k/PCbuild9/pyd_d.vsprops
python/branches/py3k/PCbuild9/python.vcproj
python/branches/py3k/PCbuild9/pythoncore.vcproj
python/branches/py3k/PCbuild9/pythonw.vcproj
python/branches/py3k/PCbuild9/w9xpopen.vcproj
Log:
Fixed build order of the _ssl project. The openssl project needs to come first
because the makefile puts the header files in the right place.
Added some optimization flags to the Release builds of pythoncore and the
executables.
Modified: python/branches/py3k/PCbuild9/_ssl.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/_ssl.vcproj (original)
+++ python/branches/py3k/PCbuild9/_ssl.vcproj Mon Nov 19 19:35:20 2007
@@ -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"
Modified: python/branches/py3k/PCbuild9/pyd.vsprops
==============================================================================
--- python/branches/py3k/PCbuild9/pyd.vsprops (original)
+++ python/branches/py3k/PCbuild9/pyd.vsprops Mon Nov 19 19:35:20 2007
@@ -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>
Modified: python/branches/py3k/PCbuild9/pyd_d.vsprops
==============================================================================
--- python/branches/py3k/PCbuild9/pyd_d.vsprops (original)
+++ python/branches/py3k/PCbuild9/pyd_d.vsprops Mon Nov 19 19:35:20 2007
@@ -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>
Modified: python/branches/py3k/PCbuild9/python.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/python.vcproj (original)
+++ python/branches/py3k/PCbuild9/python.vcproj Mon Nov 19 19:35:20 2007
@@ -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
Modified: python/branches/py3k/PCbuild9/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pythoncore.vcproj (original)
+++ python/branches/py3k/PCbuild9/pythoncore.vcproj Mon Nov 19 19:35:20 2007
@@ -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"
/>
Modified: python/branches/py3k/PCbuild9/pythonw.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pythonw.vcproj (original)
+++ python/branches/py3k/PCbuild9/pythonw.vcproj Mon Nov 19 19:35:20 2007
@@ -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
Modified: python/branches/py3k/PCbuild9/w9xpopen.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/w9xpopen.vcproj (original)
+++ python/branches/py3k/PCbuild9/w9xpopen.vcproj Mon Nov 19 19:35:20 2007
@@ -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"
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
