Update VS8.0 build files, using the script vs9to8.py.
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 12 Jun 2008 21:58:20 +0000 (21:58 +0000)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 12 Jun 2008 21:58:20 +0000 (21:58 +0000)
Also remove references to odbc libraries, which are not shipped with vs2003 express.
(and certainly not useful)

14 files changed:
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 [new file with mode: 0644]
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

index e88aaf0fcfab0440bb124e14cc89cbaef7b62bca..59b7ce246f61c3cdc069564f0df95ff5a1f06333 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
index 3e675fee4b7cdd2dffb9758382e7cf66d40575d8..fd8b8cab4e665a61e3dfee8c59fdf1e7ac529f7e 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -96,7 +96,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                                PreprocessorDefinitions="DIAGNOSTIC"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_compact.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compact.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_compare.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compare.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_conv.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_conv.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_curadj.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_curadj.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_cursor.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_cursor.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_delete.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_delete.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_put.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_put.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_reclaim.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_reclaim.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_recno.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_recno.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_rsearch.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rsearch.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_search.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_search.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_split.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_split.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_upgrade.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_upgrade.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\bt_verify.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_verify.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\btree\btree_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\btree_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\crdel_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\crdel_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\crypto_stub.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\crypto_stub.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_am.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_am.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_byteorder.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_byteorder.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_cam.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_cam.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_clock.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_clock.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_conv.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_conv.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_dispatch.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dispatch.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_dup.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dup.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_err.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_err.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_getlong.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_getlong.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_idspace.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_idspace.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_iface.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_iface.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_join.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_join.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\db_log2.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_log2.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_meta.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_meta.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_overflow.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_overflow.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_ovfl_vrfy.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ovfl_vrfy.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_pr.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_pr.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_reclaim.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_reclaim.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_remove.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_remove.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_rename.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rename.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_ret.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ret.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\db_salloc.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_salloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_setid.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setid.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_setlsn.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setlsn.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\db_shash.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_shash.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_stati.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_stati.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_truncate.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_truncate.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_upg.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_upg_opd.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg_opd.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_vrfy.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfy.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\db\db_vrfyutil.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfyutil.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbm\dbm.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbm\dbm.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbreg\dbreg.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\dbreg\dbreg_util.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_failchk.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_failchk.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_file.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_file.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_recover.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_recover.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_register.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_register.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\env\env_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\fileops\fileops_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fileops_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\fileops\fop_basic.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_basic.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\fileops\fop_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\fileops\fop_util.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_conv.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_conv.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_dup.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_dup.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_func.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_func.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_meta.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_meta.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_page.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_page.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_reclaim.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_reclaim.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_upgrade.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_upgrade.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hash\hash_verify.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_verify.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hmac\hmac.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\hmac.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hsearch\hsearch.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hsearch\hsearch.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_deadlock.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_deadlock.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_failchk.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_failchk.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_id.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_id.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_list.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_list.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_timer.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_timer.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\lock\lock_util.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_archive.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_archive.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_compare.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_compare.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_debug.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_debug.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_get.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_get.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_put.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_put.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\log\log_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_alloc.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_alloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_bh.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_bh.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_fget.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fget.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_fmethod.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fmethod.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_fopen.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fopen.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_fput.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fput.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_fset.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fset.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_register.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_register.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_sync.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_sync.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mp\mp_trickle.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_trickle.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mutex\mut_alloc.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_alloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mutex\mut_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mutex\mut_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mutex\mut_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\mutex\mut_win32.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_win32.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_abs.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_abs.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_alloc.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_alloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_clock.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_clock.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_config.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_config.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_dir.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_dir.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_errno.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_errno.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_fid.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fid.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_flock.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_flock.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_fsync.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fsync.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_handle.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_handle.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_id.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_id.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_map.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_map.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_mkdir.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_mkdir.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_oflags.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_oflags.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_rename.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rename.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_root.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_root.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_rpath.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_rpath.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_rw.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_seek.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_seek.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_sleep.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_sleep.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_spin.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_spin.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os\os_tmpdir.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_tmpdir.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_truncate.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_truncate.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\os_win32\os_unlink.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_unlink.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_conv.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_conv.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_files.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_files.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_open.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_open.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_upgrade.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_upgrade.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\qam\qam_verify.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_verify.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_backup.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_backup.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_elect.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_elect.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_log.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_log.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_record.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_record.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_util.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\rep\rep_verify.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_verify.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\sequence\seq_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\seq_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\sequence\sequence.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\sequence.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\hmac\sha1.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\sha1.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\clib\strcasecmp.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\clib\strcasecmp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_auto.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_auto.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_chkpt.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_chkpt.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_failchk.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_failchk.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_method.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_method.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_rec.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_recover.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_recover.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_region.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_region.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_stat.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_stat.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\txn\txn_util.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\util_cache.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_cache.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\util_log.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_log.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\common\util_sig.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_sig.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\xa\xa.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\xa\xa_db.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_db.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(bsddbDir)\..\..\xa\xa_map.c"\r
+                               RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_map.c"\r
                                >\r
                        </File>\r
                </Filter>\r
index 32fac0c75476cfc1c13123126a33355484e2d09b..457da72f04d253fed6363b81db5e4767a88e770d 100644 (file)
@@ -56,7 +56,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
index afffab0124c65696c9e0e16d1df0b536a0043457..689585f9ce2b39bfcb863f9554c0a678f5691fc0 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c
new file mode 100644 (file)
index 0000000..8ee22e8
--- /dev/null
@@ -0,0 +1,178 @@
+/*\r
+ * Helper program for killing lingering python[_d].exe processes before\r
+ * building, thus attempting to avoid build failures due to files being\r
+ * locked.\r
+ */\r
+\r
+#include <windows.h>\r
+#include <wchar.h>\r
+#include <tlhelp32.h>\r
+#include <stdio.h>\r
+\r
+#pragma comment(lib, "psapi")\r
+\r
+#ifdef _DEBUG\r
+#define PYTHON_EXE          (L"python_d.exe")\r
+#define PYTHON_EXE_LEN      (12)\r
+#define KILL_PYTHON_EXE     (L"kill_python_d.exe")\r
+#define KILL_PYTHON_EXE_LEN (17)\r
+#else\r
+#define PYTHON_EXE          (L"python.exe")\r
+#define PYTHON_EXE_LEN      (10)\r
+#define KILL_PYTHON_EXE     (L"kill_python.exe")\r
+#define KILL_PYTHON_EXE_LEN (15)\r
+#endif\r
+\r
+int\r
+main(int argc, char **argv)\r
+{\r
+    HANDLE   hp, hsp, hsm; /* process, snapshot processes, snapshot modules */\r
+    DWORD    dac, our_pid;\r
+    size_t   len;\r
+    wchar_t  path[MAX_PATH+1];\r
+\r
+    MODULEENTRY32W  me;\r
+    PROCESSENTRY32W pe;\r
+\r
+    me.dwSize = sizeof(MODULEENTRY32W);\r
+    pe.dwSize = sizeof(PROCESSENTRY32W);\r
+\r
+    memset(path, 0, MAX_PATH+1);\r
+\r
+    our_pid = GetCurrentProcessId();\r
+\r
+    hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);\r
+    if (hsm == INVALID_HANDLE_VALUE) {\r
+        printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());\r
+        return 1;\r
+    }\r
+\r
+    if (!Module32FirstW(hsm, &me)) {\r
+        printf("Module32FirstW[1] failed: %d\n", GetLastError());\r
+        CloseHandle(hsm);\r
+        return 1;\r
+    }\r
+\r
+    /*\r
+     * Enumerate over the modules for the current process in order to find\r
+     * kill_process[_d].exe, then take a note of the directory it lives in.\r
+     */\r
+    do {\r
+        if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))\r
+            continue;\r
+\r
+        len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;\r
+        wcsncpy_s(path, MAX_PATH+1, me.szExePath, len); \r
+\r
+        break;\r
+\r
+    } while (Module32NextW(hsm, &me));\r
+\r
+    CloseHandle(hsm);\r
+\r
+    if (path == NULL) {\r
+        printf("failed to discern directory of running process\n");\r
+        return 1;\r
+    }\r
+\r
+    /*\r
+     * Take a snapshot of system processes.  Enumerate over the snapshot,\r
+     * looking for python processes.  When we find one, verify it lives\r
+     * in the same directory we live in.  If it does, kill it.  If we're\r
+     * unable to kill it, treat this as a fatal error and return 1.\r
+     * \r
+     * The rationale behind this is that we're called at the start of the \r
+     * build process on the basis that we'll take care of killing any\r
+     * running instances, such that the build won't encounter permission\r
+     * denied errors during linking. If we can't kill one of the processes,\r
+     * we can't provide this assurance, and the build shouldn't start.\r
+     */\r
+\r
+    hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
+    if (hsp == INVALID_HANDLE_VALUE) {\r
+        printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());\r
+        return 1;\r
+    }\r
+\r
+    if (!Process32FirstW(hsp, &pe)) {\r
+        printf("Process32FirstW failed: %d\n", GetLastError());\r
+        CloseHandle(hsp);\r
+        return 1;\r
+    }\r
+\r
+    dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;\r
+    do {\r
+\r
+        /*\r
+         * XXX TODO: if we really wanted to be fancy, we could check the \r
+         * modules for all processes (not just the python[_d].exe ones)\r
+         * and see if any of our DLLs are loaded (i.e. python30[_d].dll),\r
+         * as that would also inhibit our ability to rebuild the solution.\r
+         * Not worth loosing sleep over though; for now, a simple check \r
+         * for just the python executable should be sufficient.\r
+         */\r
+\r
+        if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))\r
+            /* This isn't a python process. */\r
+            continue;\r
+\r
+        /* It's a python process, so figure out which directory it's in... */\r
+        hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);\r
+        if (hsm == INVALID_HANDLE_VALUE)\r
+            /* \r
+             * If our module snapshot fails (which will happen if we don't own\r
+             * the process), just ignore it and continue.  (It seems different\r
+             * versions of Windows return different values for GetLastError()\r
+             * in this situation; it's easier to just ignore it and move on vs.\r
+             * stopping the build for what could be a false positive.)\r
+             */\r
+             continue;\r
+\r
+        if (!Module32FirstW(hsm, &me)) {\r
+            printf("Module32FirstW[2] failed: %d\n", GetLastError());\r
+            CloseHandle(hsp);\r
+            CloseHandle(hsm);\r
+            return 1;\r
+        }\r
+\r
+        do {\r
+            if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))\r
+                /* Wrong module, we're looking for python[_d].exe... */\r
+                continue;\r
+\r
+            if (_wcsnicmp(path, me.szExePath, len))\r
+                /* Process doesn't live in our directory. */\r
+                break;\r
+\r
+            /* Python process residing in the right directory, kill it!  */\r
+            hp = OpenProcess(dac, FALSE, pe.th32ProcessID);\r
+            if (!hp) {\r
+                printf("OpenProcess failed: %d\n", GetLastError());\r
+                CloseHandle(hsp);\r
+                CloseHandle(hsm);\r
+                return 1;\r
+            }\r
+\r
+            if (!TerminateProcess(hp, 1)) {\r
+                printf("TerminateProcess failed: %d\n", GetLastError());\r
+                CloseHandle(hsp);\r
+                CloseHandle(hsm);\r
+                CloseHandle(hp);\r
+                return 1;\r
+            }\r
+\r
+            CloseHandle(hp);\r
+            break;\r
+\r
+        } while (Module32NextW(hsm, &me));\r
+\r
+        CloseHandle(hsm);\r
+\r
+    } while (Process32NextW(hsp, &pe));\r
+\r
+    CloseHandle(hsp);\r
+\r
+    return 0;\r
+}\r
+\r
+/* vi: set ts=8 sw=4 sts=4 expandtab */\r
index b097162f790fb66e0af2228426c1b2dcd0bc28b4..9dbf10d95a3ee43cc2fbbd2743b2321e6fef5c95 100644 (file)
@@ -67,7 +67,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(SolutionDir)make_versioninfo.exe"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="1"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(SolutionDir)make_versioninfo_d.exe"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="1"\r
index df5ffbbdcb74ad3d00118f2371ea7e82bc179b91..e6dd5daee614d8cef089102d508664594f058398 100644 (file)
@@ -131,6 +131,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj",
                {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"\r
 EndProject\r
 Global\r
@@ -537,6 +542,22 @@ Global
                {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32\r
                {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64\r
                {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64\r
                {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32\r
                {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64\r
index 7d4e3de139a53bb691a2f1afba93ab366dd83ff4..c117a3847c275068367a54f81ddc73e7af59bcc3 100644 (file)
        />\r
        <UserMacro\r
                Name="tcltkLib"\r
-               Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"\r
+               Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"\r
        />\r
        <UserMacro\r
                Name="tcltkLibDebug"\r
-               Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"\r
+               Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"\r
        />\r
        <UserMacro\r
                Name="tcltk64Lib"\r
-               Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"\r
+               Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"\r
        />\r
        <UserMacro\r
                Name="tcltk64LibDebug"\r
-               Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"\r
+               Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"\r
        />\r
 </VisualStudioPropertySheet>\r
index 5628fdfd3465517ebb84a155e528477bd304562e..2f47c0ee8dd7bedbae638f7e13767c1d9c767bc1 100644 (file)
@@ -62,7 +62,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2100000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
index 92bb1f4bc936ce978487678702eb69ce7f063ed2..fc35f422e0fc3d77bf672e2b1052f5e7887fad09 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -56,7 +56,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName)_d.dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName)_d.dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
+                               ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\btree.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\btree.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\hash.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\hash.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\keywordhash.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\opcodes.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\os.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\os.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\os_common.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\pager.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\pager.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\parse.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\parse.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\sqlite3.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\sqliteInt.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbe.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeInt.h"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                        Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\alter.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\alter.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\analyze.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\attach.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\attach.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\auth.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\auth.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\btree.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\btree.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\build.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\build.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\callback.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\callback.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\complete.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\complete.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\date.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\date.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\delete.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\delete.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\expr.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\expr.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\func.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\func.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\hash.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\hash.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\insert.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\insert.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\legacy.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\main.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\main.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\opcodes.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\os.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\os.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\os_unix.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\os_win.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\pager.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\pager.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\parse.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\parse.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\pragma.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\prepare.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\printf.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\printf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\random.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\random.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\select.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\select.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\shell.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\shell.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\table.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\tokenize.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\trigger.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\update.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\update.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\utf.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\utf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\util.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\util.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vacuum.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbe.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeapi.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeaux.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbefifo.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\vdbemem.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\where.c"\r
+                               RelativePath="..\..\..\sqlite-source-3.3.4\where.c"\r
                                >\r
                        </File>\r
                </Filter>\r
index c22c252014cf37a255fbf74ec70d8516133972b2..b308c186986cd065eed13ebae9896b34d44b7af2 100644 (file)
@@ -56,7 +56,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                                TargetMachine="17"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                                TargetMachine="17"
                        />
index dcb922bf1e85e4ba69308a695ff46483d486027f..e2b86c73f2f90073906cfe3e1990a6d20df17766 100644 (file)
@@ -67,7 +67,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(SolutionDir)make_versioninfo.exe"
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
                                SubSystem="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(SolutionDir)make_versioninfo_d.exe"
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
                                SubSystem="1"
index f5f460547e82a9ae18c866262a4db8d97e07ca6f..85d2d9ee2fe039157837cc949e06655c37ffe8d2 100644 (file)
@@ -62,7 +62,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2100000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
index b31ed6137d8cc932c4bf783225fb35f0ecb9926b..c59dea4bb10a9b8a52bdecca125c1779f26e99a2 100644 (file)
@@ -22,6 +22,12 @@ def vs9to8(src, dest):
             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)