diff -r -Z -U 2 Python-2.7.5/PCbuild/_bsddb.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_bsddb.vcxproj
--- Python-2.7.5/PCbuild/_bsddb.vcxproj	2013-10-05 12:36:02.622257400 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_bsddb.vcxproj	2013-10-05 09:46:22.932866700 -0700
@@ -136,5 +136,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -149,6 +149,7 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PreLinkEvent>
@@ -162,5 +163,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -175,5 +176,5 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -188,5 +189,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -201,5 +202,5 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -212,5 +213,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -225,5 +226,5 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -239,230 +240,230 @@
   <ItemGroup>
     <ClCompile Include="..\Modules\_bsddb.c" />
-    <ClCompile Include="crypto\aes_method.c" />
-    <ClCompile Include="btree\bt_compact.c" />
-    <ClCompile Include="btree\bt_compare.c" />
-    <ClCompile Include="btree\bt_conv.c" />
-    <ClCompile Include="btree\bt_curadj.c" />
-    <ClCompile Include="btree\bt_cursor.c" />
-    <ClCompile Include="btree\bt_delete.c" />
-    <ClCompile Include="btree\bt_method.c" />
-    <ClCompile Include="btree\bt_open.c" />
-    <ClCompile Include="btree\bt_put.c" />
-    <ClCompile Include="btree\bt_rec.c" />
-    <ClCompile Include="btree\bt_reclaim.c" />
-    <ClCompile Include="btree\bt_recno.c" />
-    <ClCompile Include="btree\bt_rsearch.c" />
-    <ClCompile Include="btree\bt_search.c" />
-    <ClCompile Include="btree\bt_split.c" />
-    <ClCompile Include="btree\bt_stat.c" />
-    <ClCompile Include="btree\bt_upgrade.c" />
-    <ClCompile Include="btree\bt_verify.c" />
-    <ClCompile Include="btree\btree_auto.c" />
-    <ClCompile Include="db\crdel_auto.c" />
-    <ClCompile Include="db\crdel_rec.c" />
-    <ClCompile Include="crypto\crypto.c" />
-    <ClCompile Include="db\db.c" />
-    <ClCompile Include="db\db_am.c" />
-    <ClCompile Include="db\db_auto.c" />
-    <ClCompile Include="common\db_byteorder.c" />
-    <ClCompile Include="db\db_cam.c" />
-    <ClCompile Include="db\db_cds.c" />
-    <ClCompile Include="db\db_conv.c" />
-    <ClCompile Include="db\db_dispatch.c" />
-    <ClCompile Include="db\db_dup.c" />
-    <ClCompile Include="common\db_err.c" />
-    <ClCompile Include="common\db_getlong.c" />
-    <ClCompile Include="common\db_idspace.c" />
-    <ClCompile Include="db\db_iface.c" />
-    <ClCompile Include="db\db_join.c" />
-    <ClCompile Include="common\db_log2.c" />
-    <ClCompile Include="db\db_meta.c" />
-    <ClCompile Include="db\db_method.c" />
-    <ClCompile Include="db\db_open.c" />
-    <ClCompile Include="db\db_overflow.c" />
-    <ClCompile Include="db\db_ovfl_vrfy.c" />
-    <ClCompile Include="db\db_pr.c" />
-    <ClCompile Include="db\db_rec.c" />
-    <ClCompile Include="db\db_reclaim.c" />
-    <ClCompile Include="db\db_remove.c" />
-    <ClCompile Include="db\db_rename.c" />
-    <ClCompile Include="db\db_ret.c" />
-    <ClCompile Include="db\db_setid.c" />
-    <ClCompile Include="db\db_setlsn.c" />
-    <ClCompile Include="common\db_shash.c" />
-    <ClCompile Include="db\db_stati.c" />
-    <ClCompile Include="db\db_truncate.c" />
-    <ClCompile Include="db\db_upg.c" />
-    <ClCompile Include="db\db_upg_opd.c" />
-    <ClCompile Include="db\db_vrfy.c" />
-    <ClCompile Include="db\db_vrfyutil.c" />
-    <ClCompile Include="dbm\dbm.c" />
-    <ClCompile Include="dbreg\dbreg.c" />
-    <ClCompile Include="dbreg\dbreg_auto.c" />
-    <ClCompile Include="dbreg\dbreg_rec.c" />
-    <ClCompile Include="dbreg\dbreg_stat.c" />
-    <ClCompile Include="dbreg\dbreg_util.c" />
-    <ClCompile Include="common\dbt.c" />
-    <ClCompile Include="env\env_alloc.c" />
-    <ClCompile Include="env\env_config.c" />
-    <ClCompile Include="env\env_failchk.c" />
-    <ClCompile Include="env\env_file.c" />
-    <ClCompile Include="env\env_globals.c" />
-    <ClCompile Include="env\env_method.c" />
-    <ClCompile Include="env\env_name.c" />
-    <ClCompile Include="env\env_open.c" />
-    <ClCompile Include="env\env_recover.c" />
-    <ClCompile Include="env\env_region.c" />
-    <ClCompile Include="env\env_register.c" />
-    <ClCompile Include="env\env_sig.c" />
-    <ClCompile Include="env\env_stat.c" />
-    <ClCompile Include="fileops\fileops_auto.c" />
-    <ClCompile Include="fileops\fop_basic.c" />
-    <ClCompile Include="fileops\fop_rec.c" />
-    <ClCompile Include="fileops\fop_util.c" />
-    <ClCompile Include="hash\hash.c" />
-    <ClCompile Include="hash\hash_auto.c" />
-    <ClCompile Include="hash\hash_conv.c" />
-    <ClCompile Include="hash\hash_dup.c" />
-    <ClCompile Include="hash\hash_func.c" />
-    <ClCompile Include="hash\hash_meta.c" />
-    <ClCompile Include="hash\hash_method.c" />
-    <ClCompile Include="hash\hash_open.c" />
-    <ClCompile Include="hash\hash_page.c" />
-    <ClCompile Include="hash\hash_rec.c" />
-    <ClCompile Include="hash\hash_reclaim.c" />
-    <ClCompile Include="hash\hash_stat.c" />
-    <ClCompile Include="hash\hash_upgrade.c" />
-    <ClCompile Include="hash\hash_verify.c" />
-    <ClCompile Include="hmac\hmac.c" />
-    <ClCompile Include="hsearch\hsearch.c" />
-    <ClCompile Include="lock\lock.c" />
-    <ClCompile Include="lock\lock_deadlock.c" />
-    <ClCompile Include="lock\lock_failchk.c" />
-    <ClCompile Include="lock\lock_id.c" />
-    <ClCompile Include="lock\lock_list.c" />
-    <ClCompile Include="lock\lock_method.c" />
-    <ClCompile Include="lock\lock_region.c" />
-    <ClCompile Include="lock\lock_stat.c" />
-    <ClCompile Include="lock\lock_timer.c" />
-    <ClCompile Include="lock\lock_util.c" />
-    <ClCompile Include="log\log.c" />
-    <ClCompile Include="log\log_archive.c" />
-    <ClCompile Include="log\log_compare.c" />
-    <ClCompile Include="log\log_debug.c" />
-    <ClCompile Include="log\log_get.c" />
-    <ClCompile Include="log\log_method.c" />
-    <ClCompile Include="log\log_put.c" />
-    <ClCompile Include="log\log_stat.c" />
-    <ClCompile Include="common\mkpath.c" />
-    <ClCompile Include="mp\mp_alloc.c" />
-    <ClCompile Include="mp\mp_bh.c" />
-    <ClCompile Include="mp\mp_fget.c" />
-    <ClCompile Include="mp\mp_fmethod.c" />
-    <ClCompile Include="mp\mp_fopen.c" />
-    <ClCompile Include="mp\mp_fput.c" />
-    <ClCompile Include="mp\mp_fset.c" />
-    <ClCompile Include="mp\mp_method.c" />
-    <ClCompile Include="mp\mp_mvcc.c" />
-    <ClCompile Include="mp\mp_region.c" />
-    <ClCompile Include="mp\mp_register.c" />
-    <ClCompile Include="mp\mp_resize.c" />
-    <ClCompile Include="mp\mp_stat.c" />
-    <ClCompile Include="mp\mp_sync.c" />
-    <ClCompile Include="mp\mp_trickle.c" />
-    <ClCompile Include="crypto\mersenne\mt19937db.c" />
-    <ClCompile Include="mutex\mut_alloc.c" />
-    <ClCompile Include="mutex\mut_failchk.c" />
-    <ClCompile Include="mutex\mut_method.c" />
-    <ClCompile Include="mutex\mut_region.c" />
-    <ClCompile Include="mutex\mut_stat.c" />
-    <ClCompile Include="mutex\mut_win32.c" />
-    <ClCompile Include="common\openflags.c" />
-    <ClCompile Include="os\os_abort.c" />
-    <ClCompile Include="os_windows\os_abs.c" />
-    <ClCompile Include="os\os_addrinfo.c" />
-    <ClCompile Include="os\os_alloc.c" />
-    <ClCompile Include="os_windows\os_clock.c" />
-    <ClCompile Include="os_windows\os_config.c" />
-    <ClCompile Include="os_windows\os_cpu.c" />
-    <ClCompile Include="os\os_ctime.c" />
-    <ClCompile Include="os_windows\os_dir.c" />
-    <ClCompile Include="os_windows\os_errno.c" />
-    <ClCompile Include="os_windows\os_fid.c" />
-    <ClCompile Include="os_windows\os_flock.c" />
-    <ClCompile Include="os_windows\os_fsync.c" />
-    <ClCompile Include="os_windows\os_getenv.c" />
-    <ClCompile Include="os_windows\os_handle.c" />
-    <ClCompile Include="os_windows\os_map.c" />
-    <ClCompile Include="common\os_method.c" />
-    <ClCompile Include="os_windows\os_mkdir.c" />
-    <ClCompile Include="os_windows\os_open.c" />
-    <ClCompile Include="os\os_pid.c" />
-    <ClCompile Include="os_windows\os_rename.c" />
-    <ClCompile Include="os\os_root.c" />
-    <ClCompile Include="os\os_rpath.c" />
-    <ClCompile Include="os_windows\os_rw.c" />
-    <ClCompile Include="os_windows\os_seek.c" />
-    <ClCompile Include="os\os_stack.c" />
-    <ClCompile Include="os_windows\os_stat.c" />
-    <ClCompile Include="os\os_tmpdir.c" />
-    <ClCompile Include="os_windows\os_truncate.c" />
-    <ClCompile Include="os\os_uid.c" />
-    <ClCompile Include="os_windows\os_unlink.c" />
-    <ClCompile Include="os_windows\os_yield.c" />
-    <ClCompile Include="qam\qam.c" />
-    <ClCompile Include="qam\qam_auto.c" />
-    <ClCompile Include="qam\qam_conv.c" />
-    <ClCompile Include="qam\qam_files.c" />
-    <ClCompile Include="qam\qam_method.c" />
-    <ClCompile Include="qam\qam_open.c" />
-    <ClCompile Include="qam\qam_rec.c" />
-    <ClCompile Include="qam\qam_stat.c" />
-    <ClCompile Include="qam\qam_upgrade.c" />
-    <ClCompile Include="qam\qam_verify.c" />
-    <ClCompile Include="rep\rep_auto.c" />
-    <ClCompile Include="rep\rep_backup.c" />
-    <ClCompile Include="rep\rep_elect.c" />
-    <ClCompile Include="rep\rep_lease.c" />
-    <ClCompile Include="rep\rep_log.c" />
-    <ClCompile Include="rep\rep_method.c" />
-    <ClCompile Include="rep\rep_record.c" />
-    <ClCompile Include="rep\rep_region.c" />
-    <ClCompile Include="rep\rep_stat.c" />
-    <ClCompile Include="rep\rep_util.c" />
-    <ClCompile Include="rep\rep_verify.c" />
-    <ClCompile Include="repmgr\repmgr_auto.c" />
-    <ClCompile Include="repmgr\repmgr_elect.c" />
-    <ClCompile Include="repmgr\repmgr_method.c" />
-    <ClCompile Include="repmgr\repmgr_msg.c" />
-    <ClCompile Include="repmgr\repmgr_net.c" />
-    <ClCompile Include="repmgr\repmgr_queue.c" />
-    <ClCompile Include="repmgr\repmgr_sel.c" />
-    <ClCompile Include="repmgr\repmgr_stat.c" />
-    <ClCompile Include="repmgr\repmgr_util.c" />
-    <ClCompile Include="repmgr\repmgr_windows.c" />
-    <ClCompile Include="crypto\rijndael\rijndael-alg-fst.c" />
-    <ClCompile Include="crypto\rijndael\rijndael-api-fst.c" />
-    <ClCompile Include="sequence\seq_stat.c" />
-    <ClCompile Include="sequence\sequence.c" />
-    <ClCompile Include="hmac\sha1.c" />
-    <ClCompile Include="clib\strsep.c" />
-    <ClCompile Include="txn\txn.c" />
-    <ClCompile Include="txn\txn_auto.c" />
-    <ClCompile Include="txn\txn_chkpt.c" />
-    <ClCompile Include="txn\txn_failchk.c" />
-    <ClCompile Include="txn\txn_method.c" />
-    <ClCompile Include="txn\txn_rec.c" />
-    <ClCompile Include="txn\txn_recover.c" />
-    <ClCompile Include="txn\txn_region.c" />
-    <ClCompile Include="txn\txn_stat.c" />
-    <ClCompile Include="txn\txn_util.c" />
-    <ClCompile Include="common\util_cache.c" />
-    <ClCompile Include="common\util_log.c" />
-    <ClCompile Include="common\util_sig.c" />
-    <ClCompile Include="xa\xa.c" />
-    <ClCompile Include="xa\xa_db.c" />
-    <ClCompile Include="xa\xa_map.c" />
-    <ClCompile Include="common\zerofill.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_compact.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_compare.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_conv.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_curadj.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_cursor.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_delete.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_method.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_open.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_put.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_rec.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_reclaim.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_recno.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_rsearch.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_search.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_split.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_stat.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_upgrade.c" />
+    <ClCompile Include="$(bsddbDir)\btree\bt_verify.c" />
+    <ClCompile Include="$(bsddbDir)\btree\btree_auto.c" />
+    <ClCompile Include="$(bsddbDir)\clib\strsep.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_byteorder.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_err.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_getlong.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_idspace.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_log2.c" />
+    <ClCompile Include="$(bsddbDir)\common\db_shash.c" />
+    <ClCompile Include="$(bsddbDir)\common\dbt.c" />
+    <ClCompile Include="$(bsddbDir)\common\mkpath.c" />
+    <ClCompile Include="$(bsddbDir)\common\openflags.c" />
+    <ClCompile Include="$(bsddbDir)\common\os_method.c" />
+    <ClCompile Include="$(bsddbDir)\common\util_cache.c" />
+    <ClCompile Include="$(bsddbDir)\common\util_log.c" />
+    <ClCompile Include="$(bsddbDir)\common\util_sig.c" />
+    <ClCompile Include="$(bsddbDir)\common\zerofill.c" />
+    <ClCompile Include="$(bsddbDir)\crypto\aes_method.c" />
+    <ClCompile Include="$(bsddbDir)\crypto\crypto.c" />
+    <ClCompile Include="$(bsddbDir)\crypto\mersenne\mt19937db.c" />
+    <ClCompile Include="$(bsddbDir)\crypto\rijndael\rijndael-alg-fst.c" />
+    <ClCompile Include="$(bsddbDir)\crypto\rijndael\rijndael-api-fst.c" />
+    <ClCompile Include="$(bsddbDir)\db\crdel_auto.c" />
+    <ClCompile Include="$(bsddbDir)\db\crdel_rec.c" />
+    <ClCompile Include="$(bsddbDir)\db\db.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_am.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_auto.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_cam.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_cds.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_conv.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_dispatch.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_dup.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_iface.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_join.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_meta.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_method.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_open.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_overflow.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_ovfl_vrfy.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_pr.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_rec.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_reclaim.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_remove.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_rename.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_ret.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_setid.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_setlsn.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_stati.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_truncate.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_upg.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_upg_opd.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_vrfy.c" />
+    <ClCompile Include="$(bsddbDir)\db\db_vrfyutil.c" />
+    <ClCompile Include="$(bsddbDir)\dbm\dbm.c" />
+    <ClCompile Include="$(bsddbDir)\dbreg\dbreg.c" />
+    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_auto.c" />
+    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_rec.c" />
+    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_stat.c" />
+    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_util.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_alloc.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_config.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_failchk.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_file.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_globals.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_method.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_name.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_open.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_recover.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_region.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_register.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_sig.c" />
+    <ClCompile Include="$(bsddbDir)\env\env_stat.c" />
+    <ClCompile Include="$(bsddbDir)\fileops\fileops_auto.c" />
+    <ClCompile Include="$(bsddbDir)\fileops\fop_basic.c" />
+    <ClCompile Include="$(bsddbDir)\fileops\fop_rec.c" />
+    <ClCompile Include="$(bsddbDir)\fileops\fop_util.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_auto.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_conv.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_dup.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_func.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_meta.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_method.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_open.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_page.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_rec.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_reclaim.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_stat.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_upgrade.c" />
+    <ClCompile Include="$(bsddbDir)\hash\hash_verify.c" />
+    <ClCompile Include="$(bsddbDir)\hmac\hmac.c" />
+    <ClCompile Include="$(bsddbDir)\hmac\sha1.c" />
+    <ClCompile Include="$(bsddbDir)\hsearch\hsearch.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_deadlock.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_failchk.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_id.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_list.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_method.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_region.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_stat.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_timer.c" />
+    <ClCompile Include="$(bsddbDir)\lock\lock_util.c" />
+    <ClCompile Include="$(bsddbDir)\log\log.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_archive.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_compare.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_debug.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_get.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_method.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_put.c" />
+    <ClCompile Include="$(bsddbDir)\log\log_stat.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_alloc.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_bh.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_fget.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_fmethod.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_fopen.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_fput.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_fset.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_method.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_mvcc.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_region.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_register.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_resize.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_stat.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_sync.c" />
+    <ClCompile Include="$(bsddbDir)\mp\mp_trickle.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_alloc.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_failchk.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_method.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_region.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_stat.c" />
+    <ClCompile Include="$(bsddbDir)\mutex\mut_win32.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_abort.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_addrinfo.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_alloc.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_ctime.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_pid.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_root.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_rpath.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_stack.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_tmpdir.c" />
+    <ClCompile Include="$(bsddbDir)\os\os_uid.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_abs.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_clock.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_config.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_cpu.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_dir.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_errno.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_fid.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_flock.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_fsync.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_getenv.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_handle.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_map.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_mkdir.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_open.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_rename.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_rw.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_seek.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_stat.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_truncate.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_unlink.c" />
+    <ClCompile Include="$(bsddbDir)\os_windows\os_yield.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_auto.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_conv.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_files.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_method.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_open.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_rec.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_stat.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_upgrade.c" />
+    <ClCompile Include="$(bsddbDir)\qam\qam_verify.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_auto.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_backup.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_elect.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_lease.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_log.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_method.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_record.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_region.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_stat.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_util.c" />
+    <ClCompile Include="$(bsddbDir)\rep\rep_verify.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_auto.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_elect.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_method.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_msg.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_net.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_queue.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_sel.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_stat.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_util.c" />
+    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_windows.c" />
+    <ClCompile Include="$(bsddbDir)\sequence\seq_stat.c" />
+    <ClCompile Include="$(bsddbDir)\sequence\sequence.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_auto.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_chkpt.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_failchk.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_method.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_rec.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_recover.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_region.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_stat.c" />
+    <ClCompile Include="$(bsddbDir)\txn\txn_util.c" />
+    <ClCompile Include="$(bsddbDir)\xa\xa.c" />
+    <ClCompile Include="$(bsddbDir)\xa\xa_db.c" />
+    <ClCompile Include="$(bsddbDir)\xa\xa_map.c" />
   </ItemGroup>
   <ItemGroup>
diff -r -Z -U 2 Python-2.7.5/PCbuild/_hashlib.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_hashlib.vcxproj
--- Python-2.7.5/PCbuild/_hashlib.vcxproj	2013-10-05 12:36:03.210663800 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_hashlib.vcxproj	2013-10-05 10:37:54.703707100 -0700
@@ -135,9 +135,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -147,18 +147,18 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -166,13 +166,13 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -182,18 +182,18 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -201,13 +201,13 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -217,18 +217,18 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -236,14 +236,14 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -253,18 +253,18 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -272,5 +272,5 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff -r -Z -U 2 Python-2.7.5/PCbuild/_msi.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_msi.vcxproj
--- Python-2.7.5/PCbuild/_msi.vcxproj	2013-10-05 12:36:02.765389900 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_msi.vcxproj	2013-10-05 10:41:35.648396200 -0700
@@ -136,5 +136,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -145,5 +145,5 @@
     </Midl>
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -151,5 +151,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -160,5 +160,5 @@
     </Midl>
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -166,5 +166,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -175,5 +175,5 @@
     </Midl>
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
@@ -182,5 +182,5 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
     </Link>
@@ -191,5 +191,5 @@
     </Midl>
     <Link>
-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
diff -r -Z -U 2 Python-2.7.5/PCbuild/_ssl.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_ssl.vcxproj
--- Python-2.7.5/PCbuild/_ssl.vcxproj	2013-10-05 12:36:02.932467000 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_ssl.vcxproj	2013-10-05 10:44:48.455973800 -0700
@@ -135,9 +135,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -151,14 +151,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -166,13 +166,13 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -186,14 +186,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -201,13 +201,13 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -221,14 +221,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -236,14 +236,14 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -257,14 +257,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <PreBuildEvent>
-      <Command>cd "$(SolutionDir)"
-"$(PythonExe)" build_ssl.py Release $(Platform) -a
-</Command>
-    </PreBuildEvent>
+    <!-- <PreBuildEvent> -->
+      <!-- <Command>cd "$(SolutionDir)" -->
+<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
+<!-- </Command> -->
+    <!-- </PreBuildEvent> -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <PreLinkEvent>
@@ -272,5 +272,5 @@
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff -r -Z -U 2 Python-2.7.5/PCbuild/_tkinter.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_tkinter.vcxproj
--- Python-2.7.5/PCbuild/_tkinter.vcxproj	2013-10-05 12:36:03.004518800 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_tkinter.vcxproj	2013-10-05 10:53:57.681936100 -0700
@@ -152,5 +152,6 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(tcltk64LibDebug);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff -r -Z -U 2 Python-2.7.5/PCbuild/pyproject.props /home/Nick/development/debug/Python-2.7.5/PCbuild/pyproject.props
--- Python-2.7.5/PCbuild/pyproject.props	2013-10-05 12:35:34.511755400 -0700
+++ /home/Nick/development/debug/Python-2.7.5/PCbuild/pyproject.props	2013-10-05 10:23:48.372618700 -0700
@@ -7,5 +7,5 @@
     <PythonExe>$(SolutionDir)\python.exe</PythonExe>
     <externalsDir>..\..</externalsDir>
-    <bsddb47Dir>$(externalsDir)\db-4.7.25.0\build_windows</bsddb47Dir>
+    <bsddb47Dir>$(externalsDir)\db-4.7.25.0</bsddb47Dir>
     <bsddb47DepLibs>ws2_32.lib</bsddb47DepLibs>
     <bsddbDir>$(bsddb47Dir)</bsddbDir>
@@ -15,5 +15,5 @@
     <sqlite3Dir>$(externalsDir)\sqlite-3.6.21</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
-    <opensslDir>$(externalsDir)\openssl-0.9.8y</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>