diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-19 18:35:20 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-19 18:35:20 +0000 |
| commit | 82f013bb58f4a4a76ddc0a8407f620a6f0aac022 (patch) | |
| tree | 91cf30d90f757c19ad49a8b7cf8b58f5fcf08d30 /PCbuild9 | |
| parent | 87c0f1d1c95eb1766a1340cd100533dfd7a86d52 (diff) | |
| download | cpython-git-82f013bb58f4a4a76ddc0a8407f620a6f0aac022.tar.gz | |
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.
Diffstat (limited to 'PCbuild9')
| -rw-r--r-- | PCbuild9/_ssl.vcproj | 12 | ||||
| -rw-r--r-- | PCbuild9/pyd.vsprops | 4 | ||||
| -rw-r--r-- | PCbuild9/pyd_d.vsprops | 4 | ||||
| -rw-r--r-- | PCbuild9/python.vcproj | 6 | ||||
| -rw-r--r-- | PCbuild9/pythoncore.vcproj | 6 | ||||
| -rw-r--r-- | PCbuild9/pythonw.vcproj | 6 | ||||
| -rw-r--r-- | PCbuild9/w9xpopen.vcproj | 6 |
7 files changed, 36 insertions, 8 deletions
diff --git a/PCbuild9/_ssl.vcproj b/PCbuild9/_ssl.vcproj index 14cb70cca5..0fcad8dfdb 100644 --- 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 173a78a34c..2a69d9599b 100644 --- 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 c29d563d72..8fc10b9858 100644 --- 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 fa3c0e165f..e470bedbed 100644 --- 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 87cab01615..a8c25d69bb 100644 --- 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 c4ec4420c3..6b08fa9679 100644 --- 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 23f10565e4..9596806255 100644 --- 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" |