From e7fa408741b482f30ed165d760330dbe626e71db Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sun, 17 Feb 2008 20:56:31 +0000
Subject: 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.
---
 PC/VC6/pythoncore.dsp      | 20 ++++++++++++--------
 PC/VS7.1/pythoncore.vcproj |  6 ++++++
 PC/VS8.0/pythoncore.vcproj |  8 ++++++++
 PCbuild/pythoncore.vcproj  |  8 ++++++++
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index ca504d6..0f4f9d2 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -125,6 +125,10 @@ SOURCE=..\..\Modules\_codecsmodule.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_collectionsmodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_csv.c
 # End Source File
 # Begin Source File
@@ -253,10 +257,6 @@ SOURCE=..\..\Objects\codeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\collectionsmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Python\compile.c
 # End Source File
 # Begin Source File
@@ -333,6 +333,14 @@ SOURCE=..\..\Objects\floatobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Python\formatter_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Python\formatter_unicode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\frameobject.c
 # End Source File
 # Begin Source File
@@ -583,10 +591,6 @@ SOURCE=..\..\Objects\rangeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\rgbimgmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\rotatingtree.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index bce0c61..a637ce2 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -515,6 +515,12 @@
 			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>
 		<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index ff52b1e..2bbfec4 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1627,6 +1627,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Python\frozen.c"
 				>
 			</File>
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 2a8101a..3947074 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1627,6 +1627,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Python\frozen.c"
 				>
 			</File>
-- 
cgit v0.12