[Python-checkins] r64202 - in python/trunk: PC/VS8.0/_bsddb.vcproj PC/VS8.0/_bsddb44.vcproj PC/VS8.0/_elementtree.vcproj PC/VS8.0/_sqlite3.vcproj PC/VS8.0/kill_python.c PC/VS8.0/make_versioninfo.vcproj PC/VS8.0/pcbuild.sln PC/VS8.0/pyproject.vsprops PC/VS8.0/python.vcproj PC/VS8.0/sqlite3.vcproj PCbuild/_elementtree.vcproj PCbuild/make_versioninfo.vcproj PCbuild/python.vcproj PCbuild/vs9to8.py

amaury.forgeotdarc python-checkins at python.org
Thu Jun 12 23:58:20 CEST 2008


Author: amaury.forgeotdarc
Date: Thu Jun 12 23:58:20 2008
New Revision: 64202

Log:
Update VS8.0 build files, using the script vs9to8.py.

Also remove references to odbc libraries, which are not shipped with vs2003 express.
(and certainly not useful)


Added:
   python/trunk/PC/VS8.0/kill_python.c
      - copied unchanged from r64196, /python/trunk/PCbuild/kill_python.c
Modified:
   python/trunk/PC/VS8.0/_bsddb.vcproj
   python/trunk/PC/VS8.0/_bsddb44.vcproj
   python/trunk/PC/VS8.0/_elementtree.vcproj
   python/trunk/PC/VS8.0/_sqlite3.vcproj
   python/trunk/PC/VS8.0/make_versioninfo.vcproj
   python/trunk/PC/VS8.0/pcbuild.sln
   python/trunk/PC/VS8.0/pyproject.vsprops
   python/trunk/PC/VS8.0/python.vcproj
   python/trunk/PC/VS8.0/sqlite3.vcproj
   python/trunk/PCbuild/_elementtree.vcproj
   python/trunk/PCbuild/make_versioninfo.vcproj
   python/trunk/PCbuild/python.vcproj
   python/trunk/PCbuild/vs9to8.py

Modified: python/trunk/PC/VS8.0/_bsddb.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/_bsddb.vcproj	(original)
+++ python/trunk/PC/VS8.0/_bsddb.vcproj	Thu Jun 12 23:58:20 2008
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -418,7 +418,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -481,7 +481,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: python/trunk/PC/VS8.0/_bsddb44.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/_bsddb44.vcproj	(original)
+++ python/trunk/PC/VS8.0/_bsddb44.vcproj	Thu Jun 12 23:58:20 2008
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,7 +96,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 				PreprocessorDefinitions="DIAGNOSTIC"
 			/>
 			<Tool
@@ -151,7 +151,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -260,7 +260,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -315,7 +315,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -369,7 +369,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -424,7 +424,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -462,787 +462,787 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_compact.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compact.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_compare.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compare.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_conv.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_conv.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_curadj.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_curadj.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_cursor.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_cursor.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_delete.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_delete.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_put.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_put.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_reclaim.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_reclaim.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_recno.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_recno.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_rsearch.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rsearch.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_search.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_search.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_split.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_split.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_upgrade.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_upgrade.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\bt_verify.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_verify.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\btree\btree_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\btree_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\crdel_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\crdel_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\crypto_stub.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\crypto_stub.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_am.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_am.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_byteorder.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_byteorder.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_cam.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_cam.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_clock.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_clock.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_conv.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_conv.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_dispatch.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dispatch.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_dup.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dup.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_err.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_err.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_getlong.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_getlong.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_idspace.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_idspace.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_iface.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_iface.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_join.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_join.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\db_log2.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_log2.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_meta.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_meta.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_overflow.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_overflow.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_ovfl_vrfy.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ovfl_vrfy.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_pr.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_pr.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_reclaim.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_reclaim.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_remove.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_remove.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_rename.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rename.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_ret.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ret.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\db_salloc.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_salloc.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_setid.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setid.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_setlsn.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setlsn.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\db_shash.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_shash.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_stati.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_stati.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_truncate.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_truncate.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_upg.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_upg_opd.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg_opd.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_vrfy.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfy.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\db\db_vrfyutil.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfyutil.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbm\dbm.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbm\dbm.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbreg\dbreg.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_util.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_failchk.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_failchk.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_file.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_file.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_recover.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_recover.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_register.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_register.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\env\env_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\fileops\fileops_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fileops_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\fileops\fop_basic.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_basic.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\fileops\fop_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\fileops\fop_util.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_conv.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_conv.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_dup.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_dup.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_func.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_func.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_meta.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_meta.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_page.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_page.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_reclaim.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_reclaim.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_upgrade.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_upgrade.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hash\hash_verify.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_verify.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hmac\hmac.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\hmac.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hsearch\hsearch.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hsearch\hsearch.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_deadlock.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_deadlock.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_failchk.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_failchk.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_id.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_id.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_list.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_list.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_timer.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_timer.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\lock\lock_util.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_archive.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_archive.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_compare.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_compare.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_debug.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_debug.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_get.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_get.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_put.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_put.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\log\log_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_alloc.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_alloc.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_bh.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_bh.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_fget.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fget.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_fmethod.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fmethod.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_fopen.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fopen.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_fput.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fput.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_fset.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fset.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_register.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_register.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_sync.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_sync.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mp\mp_trickle.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_trickle.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mutex\mut_alloc.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_alloc.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mutex\mut_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mutex\mut_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mutex\mut_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\mutex\mut_win32.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_win32.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_abs.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_abs.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_alloc.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_alloc.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_clock.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_clock.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_config.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_config.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_dir.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_dir.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_errno.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_errno.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_fid.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fid.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_flock.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_flock.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_fsync.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fsync.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_handle.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_handle.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_id.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_id.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_map.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_map.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_mkdir.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_mkdir.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_oflags.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_oflags.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_rename.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rename.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_root.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_root.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_rpath.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_rpath.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_rw.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rw.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_seek.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_seek.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_sleep.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_sleep.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_spin.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_spin.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os\os_tmpdir.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_tmpdir.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_truncate.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_truncate.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\os_win32\os_unlink.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_unlink.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_conv.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_conv.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_files.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_files.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_open.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_open.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_upgrade.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_upgrade.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\qam\qam_verify.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_verify.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_backup.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_backup.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_elect.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_elect.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_log.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_log.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_record.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_record.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_util.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\rep\rep_verify.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_verify.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\sequence\seq_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\seq_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\sequence\sequence.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\sequence.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\hmac\sha1.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\sha1.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\clib\strcasecmp.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\clib\strcasecmp.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_auto.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_auto.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_chkpt.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_chkpt.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_failchk.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_failchk.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_method.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_method.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_rec.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_rec.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_recover.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_recover.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_region.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_region.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_stat.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_stat.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\txn\txn_util.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\util_cache.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_cache.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\util_log.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_log.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\common\util_sig.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_sig.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\xa\xa.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\xa\xa_db.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_db.c"
 				>
 			</File>
 			<File
-				RelativePath="$(bsddbDir)\..\..\xa\xa_map.c"
+				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_map.c"
 				>
 			</File>
 		</Filter>

Modified: python/trunk/PC/VS8.0/_elementtree.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/_elementtree.vcproj	(original)
+++ python/trunk/PC/VS8.0/_elementtree.vcproj	Thu Jun 12 23:58:20 2008
@@ -56,7 +56,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -119,7 +118,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -182,7 +180,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -246,7 +243,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -309,7 +305,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -373,7 +368,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 				TargetMachine="17"
 			/>
@@ -437,7 +431,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -501,7 +494,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 				TargetMachine="17"
 			/>

Modified: python/trunk/PC/VS8.0/_sqlite3.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/_sqlite3.vcproj	(original)
+++ python/trunk/PC/VS8.0/_sqlite3.vcproj	Thu Jun 12 23:58:20 2008
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -417,7 +417,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -480,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool

Modified: python/trunk/PC/VS8.0/make_versioninfo.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/make_versioninfo.vcproj	(original)
+++ python/trunk/PC/VS8.0/make_versioninfo.vcproj	Thu Jun 12 23:58:20 2008
@@ -67,7 +67,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(SolutionDir)make_versioninfo.exe"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"
@@ -211,7 +210,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"

Modified: python/trunk/PC/VS8.0/pcbuild.sln
==============================================================================
--- python/trunk/PC/VS8.0/pcbuild.sln	(original)
+++ python/trunk/PC/VS8.0/pcbuild.sln	Thu Jun 12 23:58:20 2008
@@ -131,6 +131,11 @@
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
 EndProject
 Global
@@ -537,6 +542,22 @@
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64
+		{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64

Modified: python/trunk/PC/VS8.0/pyproject.vsprops
==============================================================================
--- python/trunk/PC/VS8.0/pyproject.vsprops	(original)
+++ python/trunk/PC/VS8.0/pyproject.vsprops	Thu Jun 12 23:58:20 2008
@@ -94,18 +94,18 @@
 	/>
 	<UserMacro
 		Name="tcltkLib"
-		Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
+		Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
 	/>
 	<UserMacro
 		Name="tcltkLibDebug"
-		Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
+		Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
 	/>
 	<UserMacro
 		Name="tcltk64Lib"
-		Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
+		Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
 	/>
 	<UserMacro
 		Name="tcltk64LibDebug"
-		Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
+		Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
 	/>
 </VisualStudioPropertySheet>

Modified: python/trunk/PC/VS8.0/python.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/python.vcproj	(original)
+++ python/trunk/PC/VS8.0/python.vcproj	Thu Jun 12 23:58:20 2008
@@ -62,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -136,7 +135,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -211,7 +209,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python_d.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -287,7 +284,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python_d.exe"
 				SubSystem="1"
 				StackReserveSize="2100000"
@@ -360,7 +356,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -435,7 +430,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -510,7 +504,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -585,7 +578,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"

Modified: python/trunk/PC/VS8.0/sqlite3.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/sqlite3.vcproj	(original)
+++ python/trunk/PC/VS8.0/sqlite3.vcproj	Thu Jun 12 23:58:20 2008
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -56,7 +56,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -180,7 +180,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -243,7 +243,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -304,7 +304,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -353,7 +353,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -366,7 +366,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -414,7 +414,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -427,7 +427,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(sqlite3Dir)"
+				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -489,7 +489,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -521,51 +521,51 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="$(sqlite3Dir)\btree.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\btree.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\hash.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\hash.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\keywordhash.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\opcodes.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\os.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\os.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\os_common.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\pager.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\pager.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\parse.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\parse.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\sqlite3.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\sqliteInt.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbe.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbeInt.h"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h"
 				>
 			</File>
 		</Filter>
@@ -573,167 +573,167 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="$(sqlite3Dir)\alter.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\alter.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\analyze.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\attach.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\attach.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\auth.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\auth.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\btree.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\btree.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\build.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\build.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\callback.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\callback.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\complete.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\complete.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\date.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\date.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\delete.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\delete.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\expr.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\expr.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\func.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\func.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\hash.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\hash.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\insert.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\insert.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\legacy.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\main.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\main.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\opcodes.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\os.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\os.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\os_unix.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\os_win.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\pager.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\pager.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\parse.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\parse.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\pragma.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\prepare.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\printf.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\printf.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\random.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\random.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\select.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\select.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\shell.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\shell.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\table.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\table.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\tokenize.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\trigger.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\update.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\update.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\utf.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\utf.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\util.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\util.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vacuum.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbe.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbeapi.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbeaux.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbefifo.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\vdbemem.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c"
 				>
 			</File>
 			<File
-				RelativePath="$(sqlite3Dir)\where.c"
+				RelativePath="..\..\..\sqlite-source-3.3.4\where.c"
 				>
 			</File>
 		</Filter>

Modified: python/trunk/PCbuild/_elementtree.vcproj
==============================================================================
--- python/trunk/PCbuild/_elementtree.vcproj	(original)
+++ python/trunk/PCbuild/_elementtree.vcproj	Thu Jun 12 23:58:20 2008
@@ -56,7 +56,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -119,7 +118,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -182,7 +180,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -246,7 +243,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -309,7 +305,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -373,7 +368,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 				TargetMachine="17"
 			/>
@@ -437,7 +431,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 			/>
 			<Tool
@@ -501,7 +494,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				BaseAddress="0x1D100000"
 				TargetMachine="17"
 			/>

Modified: python/trunk/PCbuild/make_versioninfo.vcproj
==============================================================================
--- python/trunk/PCbuild/make_versioninfo.vcproj	(original)
+++ python/trunk/PCbuild/make_versioninfo.vcproj	Thu Jun 12 23:58:20 2008
@@ -67,7 +67,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(SolutionDir)make_versioninfo.exe"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"
@@ -211,7 +210,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"

Modified: python/trunk/PCbuild/python.vcproj
==============================================================================
--- python/trunk/PCbuild/python.vcproj	(original)
+++ python/trunk/PCbuild/python.vcproj	Thu Jun 12 23:58:20 2008
@@ -62,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -136,7 +135,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -211,7 +209,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python_d.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -287,7 +284,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python_d.exe"
 				SubSystem="1"
 				StackReserveSize="2100000"
@@ -360,7 +356,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -435,7 +430,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -510,7 +504,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"
@@ -585,7 +578,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="$(OutDir)\python.exe"
 				SubSystem="1"
 				StackReserveSize="2000000"

Modified: python/trunk/PCbuild/vs9to8.py
==============================================================================
--- python/trunk/PCbuild/vs9to8.py	(original)
+++ python/trunk/PCbuild/vs9to8.py	Thu Jun 12 23:58:20 2008
@@ -22,6 +22,12 @@
             lines = lines.replace('..\\', '..\\..\\')
             lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
 
+            # Bah. VS8.0 does not expand macros in file names.
+            # Replace them here.
+            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4')
+            lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
+            lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
+
         with open(destname, 'wb') as fout:
             lines = lines.replace("\n", "\r\n")
             fout.write(lines)


More information about the Python-checkins mailing list