Rely on x64 platform configuration when building _bsddb on AMD64.

diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index a59c7032aec6dacabd8161d8f1cff6d73bb02122..3efdcce0c50d4e0a80ba2fd2b6d451ad874aa208 100644 (file)
--- 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 4d2f9b6173dd01e8a35f2c86cf9edee05ae31dff..6b04b92c8ccdc2513b5744ff76d833d472bb6513 100644 (file)
--- 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: