Attachment 'PCbuild_patches.txt'

Download

   1 diff -r -Z -U 2 Python-2.7.5/PCbuild/_bsddb.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_bsddb.vcxproj
   2 --- Python-2.7.5/PCbuild/_bsddb.vcxproj	2013-10-05 12:36:02.622257400 -0700
   3 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_bsddb.vcxproj	2013-10-05 09:46:22.932866700 -0700
   4 @@ -136,5 +136,5 @@
   5    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   6      <ClCompile>
   7 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10      </ClCompile>
  11 @@ -149,6 +149,7 @@
  12      </Midl>
  13      <ClCompile>
  14 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  15 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  16        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17      </ClCompile>
  18      <PreLinkEvent>
  19 @@ -162,5 +163,5 @@
  20    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  21      <ClCompile>
  22 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  23 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  24        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25      </ClCompile>
  26 @@ -175,5 +176,5 @@
  27      </Midl>
  28      <ClCompile>
  29 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  30 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  31        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  32      </ClCompile>
  33 @@ -188,5 +189,5 @@
  34    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
  35      <ClCompile>
  36 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  37 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  38        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  39      </ClCompile>
  40 @@ -201,5 +202,5 @@
  41      </Midl>
  42      <ClCompile>
  43 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  44 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  45        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  46      </ClCompile>
  47 @@ -212,5 +213,5 @@
  48    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
  49      <ClCompile>
  50 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  51 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  52        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  53      </ClCompile>
  54 @@ -225,5 +226,5 @@
  55      </Midl>
  56      <ClCompile>
  57 -      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  58 +      <AdditionalIncludeDirectories>$(bsddbDir);$(bsddbDir)\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  59        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  60      </ClCompile>
  61 @@ -239,230 +240,230 @@
  62    <ItemGroup>
  63      <ClCompile Include="..\Modules\_bsddb.c" />
  64 -    <ClCompile Include="crypto\aes_method.c" />
  65 -    <ClCompile Include="btree\bt_compact.c" />
  66 -    <ClCompile Include="btree\bt_compare.c" />
  67 -    <ClCompile Include="btree\bt_conv.c" />
  68 -    <ClCompile Include="btree\bt_curadj.c" />
  69 -    <ClCompile Include="btree\bt_cursor.c" />
  70 -    <ClCompile Include="btree\bt_delete.c" />
  71 -    <ClCompile Include="btree\bt_method.c" />
  72 -    <ClCompile Include="btree\bt_open.c" />
  73 -    <ClCompile Include="btree\bt_put.c" />
  74 -    <ClCompile Include="btree\bt_rec.c" />
  75 -    <ClCompile Include="btree\bt_reclaim.c" />
  76 -    <ClCompile Include="btree\bt_recno.c" />
  77 -    <ClCompile Include="btree\bt_rsearch.c" />
  78 -    <ClCompile Include="btree\bt_search.c" />
  79 -    <ClCompile Include="btree\bt_split.c" />
  80 -    <ClCompile Include="btree\bt_stat.c" />
  81 -    <ClCompile Include="btree\bt_upgrade.c" />
  82 -    <ClCompile Include="btree\bt_verify.c" />
  83 -    <ClCompile Include="btree\btree_auto.c" />
  84 -    <ClCompile Include="db\crdel_auto.c" />
  85 -    <ClCompile Include="db\crdel_rec.c" />
  86 -    <ClCompile Include="crypto\crypto.c" />
  87 -    <ClCompile Include="db\db.c" />
  88 -    <ClCompile Include="db\db_am.c" />
  89 -    <ClCompile Include="db\db_auto.c" />
  90 -    <ClCompile Include="common\db_byteorder.c" />
  91 -    <ClCompile Include="db\db_cam.c" />
  92 -    <ClCompile Include="db\db_cds.c" />
  93 -    <ClCompile Include="db\db_conv.c" />
  94 -    <ClCompile Include="db\db_dispatch.c" />
  95 -    <ClCompile Include="db\db_dup.c" />
  96 -    <ClCompile Include="common\db_err.c" />
  97 -    <ClCompile Include="common\db_getlong.c" />
  98 -    <ClCompile Include="common\db_idspace.c" />
  99 -    <ClCompile Include="db\db_iface.c" />
 100 -    <ClCompile Include="db\db_join.c" />
 101 -    <ClCompile Include="common\db_log2.c" />
 102 -    <ClCompile Include="db\db_meta.c" />
 103 -    <ClCompile Include="db\db_method.c" />
 104 -    <ClCompile Include="db\db_open.c" />
 105 -    <ClCompile Include="db\db_overflow.c" />
 106 -    <ClCompile Include="db\db_ovfl_vrfy.c" />
 107 -    <ClCompile Include="db\db_pr.c" />
 108 -    <ClCompile Include="db\db_rec.c" />
 109 -    <ClCompile Include="db\db_reclaim.c" />
 110 -    <ClCompile Include="db\db_remove.c" />
 111 -    <ClCompile Include="db\db_rename.c" />
 112 -    <ClCompile Include="db\db_ret.c" />
 113 -    <ClCompile Include="db\db_setid.c" />
 114 -    <ClCompile Include="db\db_setlsn.c" />
 115 -    <ClCompile Include="common\db_shash.c" />
 116 -    <ClCompile Include="db\db_stati.c" />
 117 -    <ClCompile Include="db\db_truncate.c" />
 118 -    <ClCompile Include="db\db_upg.c" />
 119 -    <ClCompile Include="db\db_upg_opd.c" />
 120 -    <ClCompile Include="db\db_vrfy.c" />
 121 -    <ClCompile Include="db\db_vrfyutil.c" />
 122 -    <ClCompile Include="dbm\dbm.c" />
 123 -    <ClCompile Include="dbreg\dbreg.c" />
 124 -    <ClCompile Include="dbreg\dbreg_auto.c" />
 125 -    <ClCompile Include="dbreg\dbreg_rec.c" />
 126 -    <ClCompile Include="dbreg\dbreg_stat.c" />
 127 -    <ClCompile Include="dbreg\dbreg_util.c" />
 128 -    <ClCompile Include="common\dbt.c" />
 129 -    <ClCompile Include="env\env_alloc.c" />
 130 -    <ClCompile Include="env\env_config.c" />
 131 -    <ClCompile Include="env\env_failchk.c" />
 132 -    <ClCompile Include="env\env_file.c" />
 133 -    <ClCompile Include="env\env_globals.c" />
 134 -    <ClCompile Include="env\env_method.c" />
 135 -    <ClCompile Include="env\env_name.c" />
 136 -    <ClCompile Include="env\env_open.c" />
 137 -    <ClCompile Include="env\env_recover.c" />
 138 -    <ClCompile Include="env\env_region.c" />
 139 -    <ClCompile Include="env\env_register.c" />
 140 -    <ClCompile Include="env\env_sig.c" />
 141 -    <ClCompile Include="env\env_stat.c" />
 142 -    <ClCompile Include="fileops\fileops_auto.c" />
 143 -    <ClCompile Include="fileops\fop_basic.c" />
 144 -    <ClCompile Include="fileops\fop_rec.c" />
 145 -    <ClCompile Include="fileops\fop_util.c" />
 146 -    <ClCompile Include="hash\hash.c" />
 147 -    <ClCompile Include="hash\hash_auto.c" />
 148 -    <ClCompile Include="hash\hash_conv.c" />
 149 -    <ClCompile Include="hash\hash_dup.c" />
 150 -    <ClCompile Include="hash\hash_func.c" />
 151 -    <ClCompile Include="hash\hash_meta.c" />
 152 -    <ClCompile Include="hash\hash_method.c" />
 153 -    <ClCompile Include="hash\hash_open.c" />
 154 -    <ClCompile Include="hash\hash_page.c" />
 155 -    <ClCompile Include="hash\hash_rec.c" />
 156 -    <ClCompile Include="hash\hash_reclaim.c" />
 157 -    <ClCompile Include="hash\hash_stat.c" />
 158 -    <ClCompile Include="hash\hash_upgrade.c" />
 159 -    <ClCompile Include="hash\hash_verify.c" />
 160 -    <ClCompile Include="hmac\hmac.c" />
 161 -    <ClCompile Include="hsearch\hsearch.c" />
 162 -    <ClCompile Include="lock\lock.c" />
 163 -    <ClCompile Include="lock\lock_deadlock.c" />
 164 -    <ClCompile Include="lock\lock_failchk.c" />
 165 -    <ClCompile Include="lock\lock_id.c" />
 166 -    <ClCompile Include="lock\lock_list.c" />
 167 -    <ClCompile Include="lock\lock_method.c" />
 168 -    <ClCompile Include="lock\lock_region.c" />
 169 -    <ClCompile Include="lock\lock_stat.c" />
 170 -    <ClCompile Include="lock\lock_timer.c" />
 171 -    <ClCompile Include="lock\lock_util.c" />
 172 -    <ClCompile Include="log\log.c" />
 173 -    <ClCompile Include="log\log_archive.c" />
 174 -    <ClCompile Include="log\log_compare.c" />
 175 -    <ClCompile Include="log\log_debug.c" />
 176 -    <ClCompile Include="log\log_get.c" />
 177 -    <ClCompile Include="log\log_method.c" />
 178 -    <ClCompile Include="log\log_put.c" />
 179 -    <ClCompile Include="log\log_stat.c" />
 180 -    <ClCompile Include="common\mkpath.c" />
 181 -    <ClCompile Include="mp\mp_alloc.c" />
 182 -    <ClCompile Include="mp\mp_bh.c" />
 183 -    <ClCompile Include="mp\mp_fget.c" />
 184 -    <ClCompile Include="mp\mp_fmethod.c" />
 185 -    <ClCompile Include="mp\mp_fopen.c" />
 186 -    <ClCompile Include="mp\mp_fput.c" />
 187 -    <ClCompile Include="mp\mp_fset.c" />
 188 -    <ClCompile Include="mp\mp_method.c" />
 189 -    <ClCompile Include="mp\mp_mvcc.c" />
 190 -    <ClCompile Include="mp\mp_region.c" />
 191 -    <ClCompile Include="mp\mp_register.c" />
 192 -    <ClCompile Include="mp\mp_resize.c" />
 193 -    <ClCompile Include="mp\mp_stat.c" />
 194 -    <ClCompile Include="mp\mp_sync.c" />
 195 -    <ClCompile Include="mp\mp_trickle.c" />
 196 -    <ClCompile Include="crypto\mersenne\mt19937db.c" />
 197 -    <ClCompile Include="mutex\mut_alloc.c" />
 198 -    <ClCompile Include="mutex\mut_failchk.c" />
 199 -    <ClCompile Include="mutex\mut_method.c" />
 200 -    <ClCompile Include="mutex\mut_region.c" />
 201 -    <ClCompile Include="mutex\mut_stat.c" />
 202 -    <ClCompile Include="mutex\mut_win32.c" />
 203 -    <ClCompile Include="common\openflags.c" />
 204 -    <ClCompile Include="os\os_abort.c" />
 205 -    <ClCompile Include="os_windows\os_abs.c" />
 206 -    <ClCompile Include="os\os_addrinfo.c" />
 207 -    <ClCompile Include="os\os_alloc.c" />
 208 -    <ClCompile Include="os_windows\os_clock.c" />
 209 -    <ClCompile Include="os_windows\os_config.c" />
 210 -    <ClCompile Include="os_windows\os_cpu.c" />
 211 -    <ClCompile Include="os\os_ctime.c" />
 212 -    <ClCompile Include="os_windows\os_dir.c" />
 213 -    <ClCompile Include="os_windows\os_errno.c" />
 214 -    <ClCompile Include="os_windows\os_fid.c" />
 215 -    <ClCompile Include="os_windows\os_flock.c" />
 216 -    <ClCompile Include="os_windows\os_fsync.c" />
 217 -    <ClCompile Include="os_windows\os_getenv.c" />
 218 -    <ClCompile Include="os_windows\os_handle.c" />
 219 -    <ClCompile Include="os_windows\os_map.c" />
 220 -    <ClCompile Include="common\os_method.c" />
 221 -    <ClCompile Include="os_windows\os_mkdir.c" />
 222 -    <ClCompile Include="os_windows\os_open.c" />
 223 -    <ClCompile Include="os\os_pid.c" />
 224 -    <ClCompile Include="os_windows\os_rename.c" />
 225 -    <ClCompile Include="os\os_root.c" />
 226 -    <ClCompile Include="os\os_rpath.c" />
 227 -    <ClCompile Include="os_windows\os_rw.c" />
 228 -    <ClCompile Include="os_windows\os_seek.c" />
 229 -    <ClCompile Include="os\os_stack.c" />
 230 -    <ClCompile Include="os_windows\os_stat.c" />
 231 -    <ClCompile Include="os\os_tmpdir.c" />
 232 -    <ClCompile Include="os_windows\os_truncate.c" />
 233 -    <ClCompile Include="os\os_uid.c" />
 234 -    <ClCompile Include="os_windows\os_unlink.c" />
 235 -    <ClCompile Include="os_windows\os_yield.c" />
 236 -    <ClCompile Include="qam\qam.c" />
 237 -    <ClCompile Include="qam\qam_auto.c" />
 238 -    <ClCompile Include="qam\qam_conv.c" />
 239 -    <ClCompile Include="qam\qam_files.c" />
 240 -    <ClCompile Include="qam\qam_method.c" />
 241 -    <ClCompile Include="qam\qam_open.c" />
 242 -    <ClCompile Include="qam\qam_rec.c" />
 243 -    <ClCompile Include="qam\qam_stat.c" />
 244 -    <ClCompile Include="qam\qam_upgrade.c" />
 245 -    <ClCompile Include="qam\qam_verify.c" />
 246 -    <ClCompile Include="rep\rep_auto.c" />
 247 -    <ClCompile Include="rep\rep_backup.c" />
 248 -    <ClCompile Include="rep\rep_elect.c" />
 249 -    <ClCompile Include="rep\rep_lease.c" />
 250 -    <ClCompile Include="rep\rep_log.c" />
 251 -    <ClCompile Include="rep\rep_method.c" />
 252 -    <ClCompile Include="rep\rep_record.c" />
 253 -    <ClCompile Include="rep\rep_region.c" />
 254 -    <ClCompile Include="rep\rep_stat.c" />
 255 -    <ClCompile Include="rep\rep_util.c" />
 256 -    <ClCompile Include="rep\rep_verify.c" />
 257 -    <ClCompile Include="repmgr\repmgr_auto.c" />
 258 -    <ClCompile Include="repmgr\repmgr_elect.c" />
 259 -    <ClCompile Include="repmgr\repmgr_method.c" />
 260 -    <ClCompile Include="repmgr\repmgr_msg.c" />
 261 -    <ClCompile Include="repmgr\repmgr_net.c" />
 262 -    <ClCompile Include="repmgr\repmgr_queue.c" />
 263 -    <ClCompile Include="repmgr\repmgr_sel.c" />
 264 -    <ClCompile Include="repmgr\repmgr_stat.c" />
 265 -    <ClCompile Include="repmgr\repmgr_util.c" />
 266 -    <ClCompile Include="repmgr\repmgr_windows.c" />
 267 -    <ClCompile Include="crypto\rijndael\rijndael-alg-fst.c" />
 268 -    <ClCompile Include="crypto\rijndael\rijndael-api-fst.c" />
 269 -    <ClCompile Include="sequence\seq_stat.c" />
 270 -    <ClCompile Include="sequence\sequence.c" />
 271 -    <ClCompile Include="hmac\sha1.c" />
 272 -    <ClCompile Include="clib\strsep.c" />
 273 -    <ClCompile Include="txn\txn.c" />
 274 -    <ClCompile Include="txn\txn_auto.c" />
 275 -    <ClCompile Include="txn\txn_chkpt.c" />
 276 -    <ClCompile Include="txn\txn_failchk.c" />
 277 -    <ClCompile Include="txn\txn_method.c" />
 278 -    <ClCompile Include="txn\txn_rec.c" />
 279 -    <ClCompile Include="txn\txn_recover.c" />
 280 -    <ClCompile Include="txn\txn_region.c" />
 281 -    <ClCompile Include="txn\txn_stat.c" />
 282 -    <ClCompile Include="txn\txn_util.c" />
 283 -    <ClCompile Include="common\util_cache.c" />
 284 -    <ClCompile Include="common\util_log.c" />
 285 -    <ClCompile Include="common\util_sig.c" />
 286 -    <ClCompile Include="xa\xa.c" />
 287 -    <ClCompile Include="xa\xa_db.c" />
 288 -    <ClCompile Include="xa\xa_map.c" />
 289 -    <ClCompile Include="common\zerofill.c" />
 290 +    <ClCompile Include="$(bsddbDir)\btree\bt_compact.c" />
 291 +    <ClCompile Include="$(bsddbDir)\btree\bt_compare.c" />
 292 +    <ClCompile Include="$(bsddbDir)\btree\bt_conv.c" />
 293 +    <ClCompile Include="$(bsddbDir)\btree\bt_curadj.c" />
 294 +    <ClCompile Include="$(bsddbDir)\btree\bt_cursor.c" />
 295 +    <ClCompile Include="$(bsddbDir)\btree\bt_delete.c" />
 296 +    <ClCompile Include="$(bsddbDir)\btree\bt_method.c" />
 297 +    <ClCompile Include="$(bsddbDir)\btree\bt_open.c" />
 298 +    <ClCompile Include="$(bsddbDir)\btree\bt_put.c" />
 299 +    <ClCompile Include="$(bsddbDir)\btree\bt_rec.c" />
 300 +    <ClCompile Include="$(bsddbDir)\btree\bt_reclaim.c" />
 301 +    <ClCompile Include="$(bsddbDir)\btree\bt_recno.c" />
 302 +    <ClCompile Include="$(bsddbDir)\btree\bt_rsearch.c" />
 303 +    <ClCompile Include="$(bsddbDir)\btree\bt_search.c" />
 304 +    <ClCompile Include="$(bsddbDir)\btree\bt_split.c" />
 305 +    <ClCompile Include="$(bsddbDir)\btree\bt_stat.c" />
 306 +    <ClCompile Include="$(bsddbDir)\btree\bt_upgrade.c" />
 307 +    <ClCompile Include="$(bsddbDir)\btree\bt_verify.c" />
 308 +    <ClCompile Include="$(bsddbDir)\btree\btree_auto.c" />
 309 +    <ClCompile Include="$(bsddbDir)\clib\strsep.c" />
 310 +    <ClCompile Include="$(bsddbDir)\common\db_byteorder.c" />
 311 +    <ClCompile Include="$(bsddbDir)\common\db_err.c" />
 312 +    <ClCompile Include="$(bsddbDir)\common\db_getlong.c" />
 313 +    <ClCompile Include="$(bsddbDir)\common\db_idspace.c" />
 314 +    <ClCompile Include="$(bsddbDir)\common\db_log2.c" />
 315 +    <ClCompile Include="$(bsddbDir)\common\db_shash.c" />
 316 +    <ClCompile Include="$(bsddbDir)\common\dbt.c" />
 317 +    <ClCompile Include="$(bsddbDir)\common\mkpath.c" />
 318 +    <ClCompile Include="$(bsddbDir)\common\openflags.c" />
 319 +    <ClCompile Include="$(bsddbDir)\common\os_method.c" />
 320 +    <ClCompile Include="$(bsddbDir)\common\util_cache.c" />
 321 +    <ClCompile Include="$(bsddbDir)\common\util_log.c" />
 322 +    <ClCompile Include="$(bsddbDir)\common\util_sig.c" />
 323 +    <ClCompile Include="$(bsddbDir)\common\zerofill.c" />
 324 +    <ClCompile Include="$(bsddbDir)\crypto\aes_method.c" />
 325 +    <ClCompile Include="$(bsddbDir)\crypto\crypto.c" />
 326 +    <ClCompile Include="$(bsddbDir)\crypto\mersenne\mt19937db.c" />
 327 +    <ClCompile Include="$(bsddbDir)\crypto\rijndael\rijndael-alg-fst.c" />
 328 +    <ClCompile Include="$(bsddbDir)\crypto\rijndael\rijndael-api-fst.c" />
 329 +    <ClCompile Include="$(bsddbDir)\db\crdel_auto.c" />
 330 +    <ClCompile Include="$(bsddbDir)\db\crdel_rec.c" />
 331 +    <ClCompile Include="$(bsddbDir)\db\db.c" />
 332 +    <ClCompile Include="$(bsddbDir)\db\db_am.c" />
 333 +    <ClCompile Include="$(bsddbDir)\db\db_auto.c" />
 334 +    <ClCompile Include="$(bsddbDir)\db\db_cam.c" />
 335 +    <ClCompile Include="$(bsddbDir)\db\db_cds.c" />
 336 +    <ClCompile Include="$(bsddbDir)\db\db_conv.c" />
 337 +    <ClCompile Include="$(bsddbDir)\db\db_dispatch.c" />
 338 +    <ClCompile Include="$(bsddbDir)\db\db_dup.c" />
 339 +    <ClCompile Include="$(bsddbDir)\db\db_iface.c" />
 340 +    <ClCompile Include="$(bsddbDir)\db\db_join.c" />
 341 +    <ClCompile Include="$(bsddbDir)\db\db_meta.c" />
 342 +    <ClCompile Include="$(bsddbDir)\db\db_method.c" />
 343 +    <ClCompile Include="$(bsddbDir)\db\db_open.c" />
 344 +    <ClCompile Include="$(bsddbDir)\db\db_overflow.c" />
 345 +    <ClCompile Include="$(bsddbDir)\db\db_ovfl_vrfy.c" />
 346 +    <ClCompile Include="$(bsddbDir)\db\db_pr.c" />
 347 +    <ClCompile Include="$(bsddbDir)\db\db_rec.c" />
 348 +    <ClCompile Include="$(bsddbDir)\db\db_reclaim.c" />
 349 +    <ClCompile Include="$(bsddbDir)\db\db_remove.c" />
 350 +    <ClCompile Include="$(bsddbDir)\db\db_rename.c" />
 351 +    <ClCompile Include="$(bsddbDir)\db\db_ret.c" />
 352 +    <ClCompile Include="$(bsddbDir)\db\db_setid.c" />
 353 +    <ClCompile Include="$(bsddbDir)\db\db_setlsn.c" />
 354 +    <ClCompile Include="$(bsddbDir)\db\db_stati.c" />
 355 +    <ClCompile Include="$(bsddbDir)\db\db_truncate.c" />
 356 +    <ClCompile Include="$(bsddbDir)\db\db_upg.c" />
 357 +    <ClCompile Include="$(bsddbDir)\db\db_upg_opd.c" />
 358 +    <ClCompile Include="$(bsddbDir)\db\db_vrfy.c" />
 359 +    <ClCompile Include="$(bsddbDir)\db\db_vrfyutil.c" />
 360 +    <ClCompile Include="$(bsddbDir)\dbm\dbm.c" />
 361 +    <ClCompile Include="$(bsddbDir)\dbreg\dbreg.c" />
 362 +    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_auto.c" />
 363 +    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_rec.c" />
 364 +    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_stat.c" />
 365 +    <ClCompile Include="$(bsddbDir)\dbreg\dbreg_util.c" />
 366 +    <ClCompile Include="$(bsddbDir)\env\env_alloc.c" />
 367 +    <ClCompile Include="$(bsddbDir)\env\env_config.c" />
 368 +    <ClCompile Include="$(bsddbDir)\env\env_failchk.c" />
 369 +    <ClCompile Include="$(bsddbDir)\env\env_file.c" />
 370 +    <ClCompile Include="$(bsddbDir)\env\env_globals.c" />
 371 +    <ClCompile Include="$(bsddbDir)\env\env_method.c" />
 372 +    <ClCompile Include="$(bsddbDir)\env\env_name.c" />
 373 +    <ClCompile Include="$(bsddbDir)\env\env_open.c" />
 374 +    <ClCompile Include="$(bsddbDir)\env\env_recover.c" />
 375 +    <ClCompile Include="$(bsddbDir)\env\env_region.c" />
 376 +    <ClCompile Include="$(bsddbDir)\env\env_register.c" />
 377 +    <ClCompile Include="$(bsddbDir)\env\env_sig.c" />
 378 +    <ClCompile Include="$(bsddbDir)\env\env_stat.c" />
 379 +    <ClCompile Include="$(bsddbDir)\fileops\fileops_auto.c" />
 380 +    <ClCompile Include="$(bsddbDir)\fileops\fop_basic.c" />
 381 +    <ClCompile Include="$(bsddbDir)\fileops\fop_rec.c" />
 382 +    <ClCompile Include="$(bsddbDir)\fileops\fop_util.c" />
 383 +    <ClCompile Include="$(bsddbDir)\hash\hash.c" />
 384 +    <ClCompile Include="$(bsddbDir)\hash\hash_auto.c" />
 385 +    <ClCompile Include="$(bsddbDir)\hash\hash_conv.c" />
 386 +    <ClCompile Include="$(bsddbDir)\hash\hash_dup.c" />
 387 +    <ClCompile Include="$(bsddbDir)\hash\hash_func.c" />
 388 +    <ClCompile Include="$(bsddbDir)\hash\hash_meta.c" />
 389 +    <ClCompile Include="$(bsddbDir)\hash\hash_method.c" />
 390 +    <ClCompile Include="$(bsddbDir)\hash\hash_open.c" />
 391 +    <ClCompile Include="$(bsddbDir)\hash\hash_page.c" />
 392 +    <ClCompile Include="$(bsddbDir)\hash\hash_rec.c" />
 393 +    <ClCompile Include="$(bsddbDir)\hash\hash_reclaim.c" />
 394 +    <ClCompile Include="$(bsddbDir)\hash\hash_stat.c" />
 395 +    <ClCompile Include="$(bsddbDir)\hash\hash_upgrade.c" />
 396 +    <ClCompile Include="$(bsddbDir)\hash\hash_verify.c" />
 397 +    <ClCompile Include="$(bsddbDir)\hmac\hmac.c" />
 398 +    <ClCompile Include="$(bsddbDir)\hmac\sha1.c" />
 399 +    <ClCompile Include="$(bsddbDir)\hsearch\hsearch.c" />
 400 +    <ClCompile Include="$(bsddbDir)\lock\lock.c" />
 401 +    <ClCompile Include="$(bsddbDir)\lock\lock_deadlock.c" />
 402 +    <ClCompile Include="$(bsddbDir)\lock\lock_failchk.c" />
 403 +    <ClCompile Include="$(bsddbDir)\lock\lock_id.c" />
 404 +    <ClCompile Include="$(bsddbDir)\lock\lock_list.c" />
 405 +    <ClCompile Include="$(bsddbDir)\lock\lock_method.c" />
 406 +    <ClCompile Include="$(bsddbDir)\lock\lock_region.c" />
 407 +    <ClCompile Include="$(bsddbDir)\lock\lock_stat.c" />
 408 +    <ClCompile Include="$(bsddbDir)\lock\lock_timer.c" />
 409 +    <ClCompile Include="$(bsddbDir)\lock\lock_util.c" />
 410 +    <ClCompile Include="$(bsddbDir)\log\log.c" />
 411 +    <ClCompile Include="$(bsddbDir)\log\log_archive.c" />
 412 +    <ClCompile Include="$(bsddbDir)\log\log_compare.c" />
 413 +    <ClCompile Include="$(bsddbDir)\log\log_debug.c" />
 414 +    <ClCompile Include="$(bsddbDir)\log\log_get.c" />
 415 +    <ClCompile Include="$(bsddbDir)\log\log_method.c" />
 416 +    <ClCompile Include="$(bsddbDir)\log\log_put.c" />
 417 +    <ClCompile Include="$(bsddbDir)\log\log_stat.c" />
 418 +    <ClCompile Include="$(bsddbDir)\mp\mp_alloc.c" />
 419 +    <ClCompile Include="$(bsddbDir)\mp\mp_bh.c" />
 420 +    <ClCompile Include="$(bsddbDir)\mp\mp_fget.c" />
 421 +    <ClCompile Include="$(bsddbDir)\mp\mp_fmethod.c" />
 422 +    <ClCompile Include="$(bsddbDir)\mp\mp_fopen.c" />
 423 +    <ClCompile Include="$(bsddbDir)\mp\mp_fput.c" />
 424 +    <ClCompile Include="$(bsddbDir)\mp\mp_fset.c" />
 425 +    <ClCompile Include="$(bsddbDir)\mp\mp_method.c" />
 426 +    <ClCompile Include="$(bsddbDir)\mp\mp_mvcc.c" />
 427 +    <ClCompile Include="$(bsddbDir)\mp\mp_region.c" />
 428 +    <ClCompile Include="$(bsddbDir)\mp\mp_register.c" />
 429 +    <ClCompile Include="$(bsddbDir)\mp\mp_resize.c" />
 430 +    <ClCompile Include="$(bsddbDir)\mp\mp_stat.c" />
 431 +    <ClCompile Include="$(bsddbDir)\mp\mp_sync.c" />
 432 +    <ClCompile Include="$(bsddbDir)\mp\mp_trickle.c" />
 433 +    <ClCompile Include="$(bsddbDir)\mutex\mut_alloc.c" />
 434 +    <ClCompile Include="$(bsddbDir)\mutex\mut_failchk.c" />
 435 +    <ClCompile Include="$(bsddbDir)\mutex\mut_method.c" />
 436 +    <ClCompile Include="$(bsddbDir)\mutex\mut_region.c" />
 437 +    <ClCompile Include="$(bsddbDir)\mutex\mut_stat.c" />
 438 +    <ClCompile Include="$(bsddbDir)\mutex\mut_win32.c" />
 439 +    <ClCompile Include="$(bsddbDir)\os\os_abort.c" />
 440 +    <ClCompile Include="$(bsddbDir)\os\os_addrinfo.c" />
 441 +    <ClCompile Include="$(bsddbDir)\os\os_alloc.c" />
 442 +    <ClCompile Include="$(bsddbDir)\os\os_ctime.c" />
 443 +    <ClCompile Include="$(bsddbDir)\os\os_pid.c" />
 444 +    <ClCompile Include="$(bsddbDir)\os\os_root.c" />
 445 +    <ClCompile Include="$(bsddbDir)\os\os_rpath.c" />
 446 +    <ClCompile Include="$(bsddbDir)\os\os_stack.c" />
 447 +    <ClCompile Include="$(bsddbDir)\os\os_tmpdir.c" />
 448 +    <ClCompile Include="$(bsddbDir)\os\os_uid.c" />
 449 +    <ClCompile Include="$(bsddbDir)\os_windows\os_abs.c" />
 450 +    <ClCompile Include="$(bsddbDir)\os_windows\os_clock.c" />
 451 +    <ClCompile Include="$(bsddbDir)\os_windows\os_config.c" />
 452 +    <ClCompile Include="$(bsddbDir)\os_windows\os_cpu.c" />
 453 +    <ClCompile Include="$(bsddbDir)\os_windows\os_dir.c" />
 454 +    <ClCompile Include="$(bsddbDir)\os_windows\os_errno.c" />
 455 +    <ClCompile Include="$(bsddbDir)\os_windows\os_fid.c" />
 456 +    <ClCompile Include="$(bsddbDir)\os_windows\os_flock.c" />
 457 +    <ClCompile Include="$(bsddbDir)\os_windows\os_fsync.c" />
 458 +    <ClCompile Include="$(bsddbDir)\os_windows\os_getenv.c" />
 459 +    <ClCompile Include="$(bsddbDir)\os_windows\os_handle.c" />
 460 +    <ClCompile Include="$(bsddbDir)\os_windows\os_map.c" />
 461 +    <ClCompile Include="$(bsddbDir)\os_windows\os_mkdir.c" />
 462 +    <ClCompile Include="$(bsddbDir)\os_windows\os_open.c" />
 463 +    <ClCompile Include="$(bsddbDir)\os_windows\os_rename.c" />
 464 +    <ClCompile Include="$(bsddbDir)\os_windows\os_rw.c" />
 465 +    <ClCompile Include="$(bsddbDir)\os_windows\os_seek.c" />
 466 +    <ClCompile Include="$(bsddbDir)\os_windows\os_stat.c" />
 467 +    <ClCompile Include="$(bsddbDir)\os_windows\os_truncate.c" />
 468 +    <ClCompile Include="$(bsddbDir)\os_windows\os_unlink.c" />
 469 +    <ClCompile Include="$(bsddbDir)\os_windows\os_yield.c" />
 470 +    <ClCompile Include="$(bsddbDir)\qam\qam.c" />
 471 +    <ClCompile Include="$(bsddbDir)\qam\qam_auto.c" />
 472 +    <ClCompile Include="$(bsddbDir)\qam\qam_conv.c" />
 473 +    <ClCompile Include="$(bsddbDir)\qam\qam_files.c" />
 474 +    <ClCompile Include="$(bsddbDir)\qam\qam_method.c" />
 475 +    <ClCompile Include="$(bsddbDir)\qam\qam_open.c" />
 476 +    <ClCompile Include="$(bsddbDir)\qam\qam_rec.c" />
 477 +    <ClCompile Include="$(bsddbDir)\qam\qam_stat.c" />
 478 +    <ClCompile Include="$(bsddbDir)\qam\qam_upgrade.c" />
 479 +    <ClCompile Include="$(bsddbDir)\qam\qam_verify.c" />
 480 +    <ClCompile Include="$(bsddbDir)\rep\rep_auto.c" />
 481 +    <ClCompile Include="$(bsddbDir)\rep\rep_backup.c" />
 482 +    <ClCompile Include="$(bsddbDir)\rep\rep_elect.c" />
 483 +    <ClCompile Include="$(bsddbDir)\rep\rep_lease.c" />
 484 +    <ClCompile Include="$(bsddbDir)\rep\rep_log.c" />
 485 +    <ClCompile Include="$(bsddbDir)\rep\rep_method.c" />
 486 +    <ClCompile Include="$(bsddbDir)\rep\rep_record.c" />
 487 +    <ClCompile Include="$(bsddbDir)\rep\rep_region.c" />
 488 +    <ClCompile Include="$(bsddbDir)\rep\rep_stat.c" />
 489 +    <ClCompile Include="$(bsddbDir)\rep\rep_util.c" />
 490 +    <ClCompile Include="$(bsddbDir)\rep\rep_verify.c" />
 491 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_auto.c" />
 492 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_elect.c" />
 493 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_method.c" />
 494 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_msg.c" />
 495 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_net.c" />
 496 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_queue.c" />
 497 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_sel.c" />
 498 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_stat.c" />
 499 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_util.c" />
 500 +    <ClCompile Include="$(bsddbDir)\repmgr\repmgr_windows.c" />
 501 +    <ClCompile Include="$(bsddbDir)\sequence\seq_stat.c" />
 502 +    <ClCompile Include="$(bsddbDir)\sequence\sequence.c" />
 503 +    <ClCompile Include="$(bsddbDir)\txn\txn.c" />
 504 +    <ClCompile Include="$(bsddbDir)\txn\txn_auto.c" />
 505 +    <ClCompile Include="$(bsddbDir)\txn\txn_chkpt.c" />
 506 +    <ClCompile Include="$(bsddbDir)\txn\txn_failchk.c" />
 507 +    <ClCompile Include="$(bsddbDir)\txn\txn_method.c" />
 508 +    <ClCompile Include="$(bsddbDir)\txn\txn_rec.c" />
 509 +    <ClCompile Include="$(bsddbDir)\txn\txn_recover.c" />
 510 +    <ClCompile Include="$(bsddbDir)\txn\txn_region.c" />
 511 +    <ClCompile Include="$(bsddbDir)\txn\txn_stat.c" />
 512 +    <ClCompile Include="$(bsddbDir)\txn\txn_util.c" />
 513 +    <ClCompile Include="$(bsddbDir)\xa\xa.c" />
 514 +    <ClCompile Include="$(bsddbDir)\xa\xa_db.c" />
 515 +    <ClCompile Include="$(bsddbDir)\xa\xa_map.c" />
 516    </ItemGroup>
 517    <ItemGroup>
 518 diff -r -Z -U 2 Python-2.7.5/PCbuild/_hashlib.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_hashlib.vcxproj
 519 --- Python-2.7.5/PCbuild/_hashlib.vcxproj	2013-10-05 12:36:03.210663800 -0700
 520 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_hashlib.vcxproj	2013-10-05 10:37:54.703707100 -0700
 521 @@ -135,9 +135,9 @@
 522    </PropertyGroup>
 523    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 524 -    <PreBuildEvent>
 525 -      <Command>cd "$(SolutionDir)"
 526 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 527 -</Command>
 528 -    </PreBuildEvent>
 529 +    <!-- <PreBuildEvent> -->
 530 +      <!-- <Command>cd "$(SolutionDir)" -->
 531 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 532 +<!-- </Command> -->
 533 +    <!-- </PreBuildEvent> -->
 534      <ClCompile>
 535        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 536 @@ -147,18 +147,18 @@
 537      </PreLinkEvent>
 538      <Link>
 539 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 540 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 541      </Link>
 542    </ItemDefinitionGroup>
 543    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 544 -    <PreBuildEvent>
 545 -      <Command>cd "$(SolutionDir)"
 546 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 547 -</Command>
 548 -    </PreBuildEvent>
 549 +    <!-- <PreBuildEvent> -->
 550 +      <!-- <Command>cd "$(SolutionDir)" -->
 551 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 552 +<!-- </Command> -->
 553 +    <!-- </PreBuildEvent> -->
 554      <Midl>
 555        <TargetEnvironment>X64</TargetEnvironment>
 556      </Midl>
 557      <ClCompile>
 558 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 559 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 560      </ClCompile>
 561      <PreLinkEvent>
 562 @@ -166,13 +166,13 @@
 563      </PreLinkEvent>
 564      <Link>
 565 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 566 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 567      </Link>
 568    </ItemDefinitionGroup>
 569    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 570 -    <PreBuildEvent>
 571 -      <Command>cd "$(SolutionDir)"
 572 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 573 -</Command>
 574 -    </PreBuildEvent>
 575 +    <!-- <PreBuildEvent> -->
 576 +      <!-- <Command>cd "$(SolutionDir)" -->
 577 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 578 +<!-- </Command> -->
 579 +    <!-- </PreBuildEvent> -->
 580      <ClCompile>
 581        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 582 @@ -182,18 +182,18 @@
 583      </PreLinkEvent>
 584      <Link>
 585 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 586 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 587      </Link>
 588    </ItemDefinitionGroup>
 589    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 590 -    <PreBuildEvent>
 591 -      <Command>cd "$(SolutionDir)"
 592 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 593 -</Command>
 594 -    </PreBuildEvent>
 595 +    <!-- <PreBuildEvent> -->
 596 +      <!-- <Command>cd "$(SolutionDir)" -->
 597 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 598 +<!-- </Command> -->
 599 +    <!-- </PreBuildEvent> -->
 600      <Midl>
 601        <TargetEnvironment>X64</TargetEnvironment>
 602      </Midl>
 603      <ClCompile>
 604 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 605 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 606      </ClCompile>
 607      <PreLinkEvent>
 608 @@ -201,13 +201,13 @@
 609      </PreLinkEvent>
 610      <Link>
 611 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 612 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 613      </Link>
 614    </ItemDefinitionGroup>
 615    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
 616 -    <PreBuildEvent>
 617 -      <Command>cd "$(SolutionDir)"
 618 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 619 -</Command>
 620 -    </PreBuildEvent>
 621 +    <!-- <PreBuildEvent> -->
 622 +      <!-- <Command>cd "$(SolutionDir)" -->
 623 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 624 +<!-- </Command> -->
 625 +    <!-- </PreBuildEvent> -->
 626      <ClCompile>
 627        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 628 @@ -217,18 +217,18 @@
 629      </PreLinkEvent>
 630      <Link>
 631 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 632 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 633      </Link>
 634    </ItemDefinitionGroup>
 635    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
 636 -    <PreBuildEvent>
 637 -      <Command>cd "$(SolutionDir)"
 638 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 639 -</Command>
 640 -    </PreBuildEvent>
 641 +    <!-- <PreBuildEvent> -->
 642 +      <!-- <Command>cd "$(SolutionDir)" -->
 643 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 644 +<!-- </Command> -->
 645 +    <!-- </PreBuildEvent> -->
 646      <Midl>
 647        <TargetEnvironment>X64</TargetEnvironment>
 648      </Midl>
 649      <ClCompile>
 650 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 651 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 652      </ClCompile>
 653      <PreLinkEvent>
 654 @@ -236,14 +236,14 @@
 655      </PreLinkEvent>
 656      <Link>
 657 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 658 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 659        <TargetMachine>MachineX64</TargetMachine>
 660      </Link>
 661    </ItemDefinitionGroup>
 662    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
 663 -    <PreBuildEvent>
 664 -      <Command>cd "$(SolutionDir)"
 665 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 666 -</Command>
 667 -    </PreBuildEvent>
 668 +    <!-- <PreBuildEvent> -->
 669 +      <!-- <Command>cd "$(SolutionDir)" -->
 670 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 671 +<!-- </Command> -->
 672 +    <!-- </PreBuildEvent> -->
 673      <ClCompile>
 674        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 675 @@ -253,18 +253,18 @@
 676      </PreLinkEvent>
 677      <Link>
 678 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 679 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 680      </Link>
 681    </ItemDefinitionGroup>
 682    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
 683 -    <PreBuildEvent>
 684 -      <Command>cd "$(SolutionDir)"
 685 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 686 -</Command>
 687 -    </PreBuildEvent>
 688 +    <!-- <PreBuildEvent> -->
 689 +      <!-- <Command>cd "$(SolutionDir)" -->
 690 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 691 +<!-- </Command> -->
 692 +    <!-- </PreBuildEvent> -->
 693      <Midl>
 694        <TargetEnvironment>X64</TargetEnvironment>
 695      </Midl>
 696      <ClCompile>
 697 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 698 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 699      </ClCompile>
 700      <PreLinkEvent>
 701 @@ -272,5 +272,5 @@
 702      </PreLinkEvent>
 703      <Link>
 704 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 705 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 706        <TargetMachine>MachineX64</TargetMachine>
 707      </Link>
 708 diff -r -Z -U 2 Python-2.7.5/PCbuild/_msi.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_msi.vcxproj
 709 --- Python-2.7.5/PCbuild/_msi.vcxproj	2013-10-05 12:36:02.765389900 -0700
 710 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_msi.vcxproj	2013-10-05 10:41:35.648396200 -0700
 711 @@ -136,5 +136,5 @@
 712    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 713      <Link>
 714 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 715 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 716        <BaseAddress>0x1D160000</BaseAddress>
 717      </Link>
 718 @@ -145,5 +145,5 @@
 719      </Midl>
 720      <Link>
 721 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 722 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 723        <BaseAddress>0x1D160000</BaseAddress>
 724      </Link>
 725 @@ -151,5 +151,5 @@
 726    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 727      <Link>
 728 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 729 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 730        <BaseAddress>0x1D160000</BaseAddress>
 731      </Link>
 732 @@ -160,5 +160,5 @@
 733      </Midl>
 734      <Link>
 735 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 736 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 737        <BaseAddress>0x1D160000</BaseAddress>
 738      </Link>
 739 @@ -166,5 +166,5 @@
 740    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
 741      <Link>
 742 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 743 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 744        <BaseAddress>0x1D160000</BaseAddress>
 745      </Link>
 746 @@ -175,5 +175,5 @@
 747      </Midl>
 748      <Link>
 749 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 750 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 751        <BaseAddress>0x1D160000</BaseAddress>
 752        <TargetMachine>MachineX64</TargetMachine>
 753 @@ -182,5 +182,5 @@
 754    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
 755      <Link>
 756 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 757 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 758        <BaseAddress>0x1D160000</BaseAddress>
 759      </Link>
 760 @@ -191,5 +191,5 @@
 761      </Midl>
 762      <Link>
 763 -      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 764 +      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
 765        <BaseAddress>0x1D160000</BaseAddress>
 766        <TargetMachine>MachineX64</TargetMachine>
 767 diff -r -Z -U 2 Python-2.7.5/PCbuild/_ssl.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_ssl.vcxproj
 768 --- Python-2.7.5/PCbuild/_ssl.vcxproj	2013-10-05 12:36:02.932467000 -0700
 769 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_ssl.vcxproj	2013-10-05 10:44:48.455973800 -0700
 770 @@ -135,9 +135,9 @@
 771    </PropertyGroup>
 772    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 773 -    <PreBuildEvent>
 774 -      <Command>cd "$(SolutionDir)"
 775 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 776 -</Command>
 777 -    </PreBuildEvent>
 778 +    <!-- <PreBuildEvent> -->
 779 +      <!-- <Command>cd "$(SolutionDir)" -->
 780 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 781 +<!-- </Command> -->
 782 +    <!-- </PreBuildEvent> -->
 783      <ClCompile>
 784        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 785 @@ -151,14 +151,14 @@
 786    </ItemDefinitionGroup>
 787    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 788 -    <PreBuildEvent>
 789 -      <Command>cd "$(SolutionDir)"
 790 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 791 -</Command>
 792 -    </PreBuildEvent>
 793 +    <!-- <PreBuildEvent> -->
 794 +      <!-- <Command>cd "$(SolutionDir)" -->
 795 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 796 +<!-- </Command> -->
 797 +    <!-- </PreBuildEvent> -->
 798      <Midl>
 799        <TargetEnvironment>X64</TargetEnvironment>
 800      </Midl>
 801      <ClCompile>
 802 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 803 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 804      </ClCompile>
 805      <PreLinkEvent>
 806 @@ -166,13 +166,13 @@
 807      </PreLinkEvent>
 808      <Link>
 809 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 810 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 811      </Link>
 812    </ItemDefinitionGroup>
 813    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 814 -    <PreBuildEvent>
 815 -      <Command>cd "$(SolutionDir)"
 816 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 817 -</Command>
 818 -    </PreBuildEvent>
 819 +    <!-- <PreBuildEvent> -->
 820 +      <!-- <Command>cd "$(SolutionDir)" -->
 821 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 822 +<!-- </Command> -->
 823 +    <!-- </PreBuildEvent> -->
 824      <ClCompile>
 825        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 826 @@ -186,14 +186,14 @@
 827    </ItemDefinitionGroup>
 828    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 829 -    <PreBuildEvent>
 830 -      <Command>cd "$(SolutionDir)"
 831 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 832 -</Command>
 833 -    </PreBuildEvent>
 834 +    <!-- <PreBuildEvent> -->
 835 +      <!-- <Command>cd "$(SolutionDir)" -->
 836 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 837 +<!-- </Command> -->
 838 +    <!-- </PreBuildEvent> -->
 839      <Midl>
 840        <TargetEnvironment>X64</TargetEnvironment>
 841      </Midl>
 842      <ClCompile>
 843 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 844 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 845      </ClCompile>
 846      <PreLinkEvent>
 847 @@ -201,13 +201,13 @@
 848      </PreLinkEvent>
 849      <Link>
 850 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 851 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 852      </Link>
 853    </ItemDefinitionGroup>
 854    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
 855 -    <PreBuildEvent>
 856 -      <Command>cd "$(SolutionDir)"
 857 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 858 -</Command>
 859 -    </PreBuildEvent>
 860 +    <!-- <PreBuildEvent> -->
 861 +      <!-- <Command>cd "$(SolutionDir)" -->
 862 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 863 +<!-- </Command> -->
 864 +    <!-- </PreBuildEvent> -->
 865      <ClCompile>
 866        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 867 @@ -221,14 +221,14 @@
 868    </ItemDefinitionGroup>
 869    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
 870 -    <PreBuildEvent>
 871 -      <Command>cd "$(SolutionDir)"
 872 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 873 -</Command>
 874 -    </PreBuildEvent>
 875 +    <!-- <PreBuildEvent> -->
 876 +      <!-- <Command>cd "$(SolutionDir)" -->
 877 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 878 +<!-- </Command> -->
 879 +    <!-- </PreBuildEvent> -->
 880      <Midl>
 881        <TargetEnvironment>X64</TargetEnvironment>
 882      </Midl>
 883      <ClCompile>
 884 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 885 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 886      </ClCompile>
 887      <PreLinkEvent>
 888 @@ -236,14 +236,14 @@
 889      </PreLinkEvent>
 890      <Link>
 891 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 892 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 893        <TargetMachine>MachineX64</TargetMachine>
 894      </Link>
 895    </ItemDefinitionGroup>
 896    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
 897 -    <PreBuildEvent>
 898 -      <Command>cd "$(SolutionDir)"
 899 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 900 -</Command>
 901 -    </PreBuildEvent>
 902 +    <!-- <PreBuildEvent> -->
 903 +      <!-- <Command>cd "$(SolutionDir)" -->
 904 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 905 +<!-- </Command> -->
 906 +    <!-- </PreBuildEvent> -->
 907      <ClCompile>
 908        <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 909 @@ -257,14 +257,14 @@
 910    </ItemDefinitionGroup>
 911    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
 912 -    <PreBuildEvent>
 913 -      <Command>cd "$(SolutionDir)"
 914 -"$(PythonExe)" build_ssl.py Release $(Platform) -a
 915 -</Command>
 916 -    </PreBuildEvent>
 917 +    <!-- <PreBuildEvent> -->
 918 +      <!-- <Command>cd "$(SolutionDir)" -->
 919 +<!-- "$(PythonExe)" build_ssl.py Release $(Platform) -a -->
 920 +<!-- </Command> -->
 921 +    <!-- </PreBuildEvent> -->
 922      <Midl>
 923        <TargetEnvironment>X64</TargetEnvironment>
 924      </Midl>
 925      <ClCompile>
 926 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 927 +      <AdditionalIncludeDirectories>$(opensslDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 928      </ClCompile>
 929      <PreLinkEvent>
 930 @@ -272,5 +272,5 @@
 931      </PreLinkEvent>
 932      <Link>
 933 -      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 934 +      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32dll\libeay32.lib;$(opensslDir)\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 935        <TargetMachine>MachineX64</TargetMachine>
 936      </Link>
 937 diff -r -Z -U 2 Python-2.7.5/PCbuild/_tkinter.vcxproj /home/Nick/development/debug/Python-2.7.5/PCbuild/_tkinter.vcxproj
 938 --- Python-2.7.5/PCbuild/_tkinter.vcxproj	2013-10-05 12:36:03.004518800 -0700
 939 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/_tkinter.vcxproj	2013-10-05 10:53:57.681936100 -0700
 940 @@ -152,5 +152,6 @@
 941      </ClCompile>
 942      <Link>
 943 -      <AdditionalDependencies>$(tcltk64LibDebug);%(AdditionalDependencies)</AdditionalDependencies>
 944 +      <AdditionalDependencies>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib;%(AdditionalDependencies)</AdditionalDependencies>
 945      </Link>
 946    </ItemDefinitionGroup>
 947 diff -r -Z -U 2 Python-2.7.5/PCbuild/pyproject.props /home/Nick/development/debug/Python-2.7.5/PCbuild/pyproject.props
 948 --- Python-2.7.5/PCbuild/pyproject.props	2013-10-05 12:35:34.511755400 -0700
 949 +++ /home/Nick/development/debug/Python-2.7.5/PCbuild/pyproject.props	2013-10-05 10:23:48.372618700 -0700
 950 @@ -7,5 +7,5 @@
 951      <PythonExe>$(SolutionDir)\python.exe</PythonExe>
 952      <externalsDir>..\..</externalsDir>
 953 -    <bsddb47Dir>$(externalsDir)\db-4.7.25.0\build_windows</bsddb47Dir>
 954 +    <bsddb47Dir>$(externalsDir)\db-4.7.25.0</bsddb47Dir>
 955      <bsddb47DepLibs>ws2_32.lib</bsddb47DepLibs>
 956      <bsddbDir>$(bsddb47Dir)</bsddbDir>
 957 @@ -15,5 +15,5 @@
 958      <sqlite3Dir>$(externalsDir)\sqlite-3.6.21</sqlite3Dir>
 959      <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
 960 -    <opensslDir>$(externalsDir)\openssl-0.9.8y</opensslDir>
 961 +    <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
 962      <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 963      <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.
  • [get | view] (2013-10-05 19:50:53, 48.2 KB) [[attachment:PCbuild_patches.txt]]
  • [get | view] (2013-10-06 00:57:08, 4.2 KB) [[attachment:manual_install.py]]
  • [get | view] (2013-10-05 21:46:11, 369.0 KB) [[attachment:openssl-headers-1.0.1e.zip]]
  • [get | view] (2013-10-06 21:33:42, 20.8 KB) [[attachment:plot.png]]
  • [get | view] (2013-10-05 20:00:49, 9.9 KB) [[attachment:python-2.7.5-amd64-pcbuild.zip]]
 All files | Selected Files: delete move to page copy to page

You are not allowed to attach a file to this page.

Unable to edit the page? See the FrontPage for instructions.