summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-03-06 13:49:47 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-03-06 13:49:47 (GMT)
commit8c4e799ad08c5d397f596ca4e4edcc61b3c06410 (patch)
tree1f57ed9ece48b1cd5782210e33416f4c6ed8282d /PCbuild
parent98aa805b107b1c121a5f697eb79b67b9d9a847db (diff)
downloadcpython-8c4e799ad08c5d397f596ca4e4edcc61b3c06410.zip
cpython-8c4e799ad08c5d397f596ca4e4edcc61b3c06410.tar.gz
cpython-8c4e799ad08c5d397f596ca4e4edcc61b3c06410.tar.bz2
Rely on x64 platform configuration when building _bsddb on AMD64.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/_bsddb.vcproj16
-rw-r--r--PCbuild/readme.txt4
2 files changed, 11 insertions, 9 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index a59c703..3efdcce 100644
--- a/PCbuild/_bsddb.vcproj
+++ b/PCbuild/_bsddb.vcproj
@@ -115,11 +115,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug_AMD64\libdb44sd.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Debug AMD64|Win32&quot;&#x0D;&#x0A;"
+ CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist &quot;x64\Debug AMD64\db_static.lib&quot; exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Debug AMD64|x64&quot;&#x0D;&#x0A;"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"
+ AdditionalDependencies="&quot;$(bsddbDir)x64\Debug AMD64\db_static.lib&quot;"
BaseAddress="0x1e180000"
/>
<Tool
@@ -242,11 +242,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
+ CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist x64\Release AMD64\db_static.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -369,11 +369,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
+ CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist &quot;x64\Release AMD64\db_static.lib&quot; exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
@@ -497,11 +497,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
+ CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist x64\Release AMD64\db_static.lib exit 0&#x0D;&#x0A;vcbuild /useenv db_static.vcproj &quot;Release AMD64|Win32&quot;&#x0D;&#x0A;"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 4d2f9b6..6b04b92 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -202,7 +202,9 @@ _bsddb
The _bsddb subprojects depends only on the db_static project of
Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug"
- or "Debug AMD64" as configuration.
+ or "Debug AMD64" as configuration. For the AND64 builds, you need to
+ create the "x64" platform first (in Solution Platforms\Configuration
+ Manager...)
Alternatively, if you want to start with the original sources,
go to Sleepycat's download page: