Compilation was broken on Windows since the introduction of Advanced String Formatting.

Only PCBuild (vs9) was really tested.
Changes for older compilers were done manually.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index ca504d644aef7f1ad0d8fa3aceb9ed59758cfc96..0f4f9d2a52fbe8d5030aed5181aa673da2364e18 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -125,6 +125,10 @@ SOURCE=..\..\Modules\_codecsmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_collectionsmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_csv.c\r
 # End Source File\r
 # Begin Source File\r
@@ -253,10 +257,6 @@ SOURCE=..\..\Objects\codeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\collectionsmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\compile.c\r
 # End Source File\r
 # Begin Source File\r
@@ -333,6 +333,14 @@ SOURCE=..\..\Objects\floatobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Python\formatter_string.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Python\formatter_unicode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\frameobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -583,10 +591,6 @@ SOURCE=..\..\Objects\rangeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\rgbimgmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\rotatingtree.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index bce0c614b591a99c0a6b9f6354a0aba6355f71b8..a637ce2ea3e17eed5e5a150504419b2f016c2351 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -514,6 +514,12 @@
                <File
                        RelativePath="..\..\Objects\floatobject.c">
                </File>
+               <File
+                       RelativePath="..\..\Python\formatter_string.c">
+               </File>
+               <File
+                       RelativePath="..\..\Python\formatter_unicode.c">
+               </File>
                <File
                        RelativePath="..\..\Objects\frameobject.c">
                </File>

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index ff52b1e2ef9cb034ddbad3253bd8e8bdd295ef03..2bbfec485aad1fbf7ecc355dbe162df06591d58d 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1626,6 +1626,14 @@
                                RelativePath="..\..\Python\errors.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\Python\formatter_string.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Python\formatter_unicode.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Python\frozen.c"\r
                                >\r

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 2a8101a7d0f71b713f452dce59a02fe993613c81..39470748ebbc6297c3fe7a3bfafc3bf63b760f1e 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1626,6 +1626,14 @@
                                RelativePath="..\Python\errors.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\Python\formatter_string.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\formatter_unicode.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\Python\frozen.c"
                                >