Manually apply most of patch 1031 to try to get python to build on Windows.

I skipped the adding of libraries because it was harder and I'm less
confident about getting it right.  Also I'm not sure why they are required
now and weren't required before.

diff --git a/PCbuild8/pyproject.vsprops b/PCbuild8/pyproject.vsprops
index e4c5f736bc0a4a26999fda1dc6f3d7258611fa21..b120ba8d37441308e33447b654980a40588f637d 100644 (file)
--- a/PCbuild8/pyproject.vsprops
+++ b/PCbuild8/pyproject.vsprops
@@ -21,7 +21,7 @@
        />\r
        <UserMacro\r
                Name="PyDllName"\r
-               Value="python26"\r
+               Value="python30"\r
        />\r
        <UserMacro\r
                Name="bsddbDir"\r

diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index 2a6e413e25ab24947764df2b9db148008da2b65f..8e45acd6afa3453333653c048178f2d8fe0c823a 100644 (file)
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -787,6 +787,10 @@
                                RelativePath="..\..\Objects\bufferobject.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\bytesobject.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Objects\cellobject.c"\r
                                >\r
@@ -1393,6 +1397,10 @@
                                RelativePath="..\..\Modules\_csv.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_fileio.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\_functoolsmodule.c"\r
                                >\r
@@ -1437,6 +1445,10 @@
                                RelativePath="..\..\Modules\arraymodule.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\atexitmodule.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\audioop.c"\r
                                >\r
@@ -1465,10 +1477,6 @@
                                RelativePath="..\..\Modules\gcmodule.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\imageop.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\itertoolsmodule.c"\r
                                >\r
@@ -1481,18 +1489,6 @@
                                RelativePath="..\..\Modules\mathmodule.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\md5.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\md5.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\md5module.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\mmapmodule.c"\r
                                >\r
@@ -1525,10 +1521,6 @@
                                RelativePath="..\..\Modules\sha512module.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\shamodule.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\signalmodule.c"\r
                                >\r