Mark Hammond renames the x86 projects back to what they were named

before the patch by Trent Mick.  Since he now also works for
ActiveState, I suppose he overrides Trent. :-)

diff --git a/PCbuild/_tkinter.dsp b/PCbuild/_tkinter.dsp
index 5727ae434e2a0cc9fd7eab5e76c457cdccf4fbe2..33cfb05880cbe7cc9e1fadc5e9d4bf1709995658 100644 (file)
--- a/PCbuild/_tkinter.dsp
+++ b/PCbuild/_tkinter.dsp
@@ -20,8 +20,8 @@ CFG=_tkinter - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
-!MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CFG=_tkinter - Win32 Alpha Debug
 # PROP Scc_ProjName "_tkinter"\r
 # PROP Scc_LocalPath "..\..\.."\r
 \r
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"\r
+!IF  "$(CFG)" == "_tkinter - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -60,7 +60,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -159,17 +159,17 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "_tkinter - Win32 x86 Release"\r
-# Name "_tkinter - Win32 x86 Debug"\r
+# Name "_tkinter - Win32 Release"\r
+# Name "_tkinter - Win32 Debug"\r
 # Name "_tkinter - Win32 Alpha Debug"\r
 # Name "_tkinter - Win32 Alpha Release"\r
 # Begin Source File\r
 \r
 SOURCE=..\Modules\_tkinter.c\r
 \r
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"\r
+!IF  "$(CFG)" == "_tkinter - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"\r
 \r
@@ -182,9 +182,9 @@ SOURCE=..\Modules\_tkinter.c
 \r
 SOURCE=..\Modules\tkappinit.c\r
 \r
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"\r
+!IF  "$(CFG)" == "_tkinter - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/parser.dsp b/PCbuild/parser.dsp
index 7f999dde1e3e31606c8355bc57b28fd52941254e..be27a6cefb86de7cc3a34fb9a063704d8565e703 100644 (file)
--- a/PCbuild/parser.dsp
+++ b/PCbuild/parser.dsp
@@ -18,8 +18,8 @@ CFG=parser - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE \r
@@ -29,7 +29,7 @@ CFG=parser - Win32 Alpha Debug
 # PROP Scc_ProjName "parser"\r
 # PROP Scc_LocalPath ".."\r
 \r
-!IF  "$(CFG)" == "parser - Win32 x86 Release"\r
+!IF  "$(CFG)" == "parser - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -60,7 +60,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /libpath:"Release" /export:initparser\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "parser - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -159,17 +159,17 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "parser - Win32 x86 Release"\r
-# Name "parser - Win32 x86 Debug"\r
+# Name "parser - Win32 Release"\r
+# Name "parser - Win32 Debug"\r
 # Name "parser - Win32 Alpha Debug"\r
 # Name "parser - Win32 Alpha Release"\r
 # Begin Source File\r
 \r
 SOURCE=..\Modules\parsermodule.c\r
 \r
-!IF  "$(CFG)" == "parser - Win32 x86 Release"\r
+!IF  "$(CFG)" == "parser - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "parser - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/python.dsp b/PCbuild/python.dsp
index d082a12df052127e181739a842c3ba5daf5e5138..31209a00468daf1acab1b2456ea4a27e15724ae7 100644 (file)
--- a/PCbuild/python.dsp
+++ b/PCbuild/python.dsp
@@ -18,8 +18,8 @@ CFG=python - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")\r
 !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")\r
 !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")\r
 !MESSAGE \r
@@ -29,7 +29,7 @@ CFG=python - Win32 Alpha Debug
 # PROP Scc_ProjName "python"\r
 # PROP Scc_LocalPath ".."\r
 \r
-!IF  "$(CFG)" == "python - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -55,7 +55,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -139,8 +139,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "python - Win32 x86 Release"\r
-# Name "python - Win32 x86 Debug"\r
+# Name "python - Win32 Release"\r
+# Name "python - Win32 Debug"\r
 # Name "python - Win32 Alpha Debug"\r
 # Name "python - Win32 Alpha Release"\r
 # Begin Source File\r
@@ -151,9 +151,9 @@ SOURCE=..\PC\pycon.ico
 \r
 SOURCE=..\Modules\python.c\r
 \r
-!IF  "$(CFG)" == "python - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/python15.dsp b/PCbuild/python15.dsp
index e7e7384aaa979886074e61a6f75bf4d47971126d..3cb448057aa2d7c233580e2dd1aa205162fca369 100644 (file)
--- a/PCbuild/python15.dsp
+++ b/PCbuild/python15.dsp
@@ -18,8 +18,8 @@ CFG=python15 - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "python15 - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "python15 - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "python15 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE \r
@@ -29,7 +29,7 @@ CFG=python15 - Win32 Alpha Debug
 # PROP Scc_ProjName "python15"\r
 # PROP Scc_LocalPath ".."\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -60,7 +60,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /libpath:"Release"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -159,17 +159,17 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "python15 - Win32 x86 Release"\r
-# Name "python15 - Win32 x86 Debug"\r
+# Name "python15 - Win32 Release"\r
+# Name "python15 - Win32 Debug"\r
 # Name "python15 - Win32 Alpha Debug"\r
 # Name "python15 - Win32 Alpha Release"\r
 # Begin Source File\r
 \r
 SOURCE=..\Modules\_localemodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -182,9 +182,9 @@ SOURCE=..\Modules\_localemodule.c
 \r
 SOURCE=..\Objects\abstract.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -197,9 +197,9 @@ SOURCE=..\Objects\abstract.c
 \r
 SOURCE=..\Parser\acceler.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -212,9 +212,9 @@ SOURCE=..\Parser\acceler.c
 \r
 SOURCE=..\Modules\arraymodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -227,9 +227,9 @@ SOURCE=..\Modules\arraymodule.c
 \r
 SOURCE=..\Modules\audioop.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -242,9 +242,9 @@ SOURCE=..\Modules\audioop.c
 \r
 SOURCE=..\Modules\binascii.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -257,9 +257,9 @@ SOURCE=..\Modules\binascii.c
 \r
 SOURCE=..\Parser\bitset.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -272,9 +272,9 @@ SOURCE=..\Parser\bitset.c
 \r
 SOURCE=..\Python\bltinmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -287,9 +287,9 @@ SOURCE=..\Python\bltinmodule.c
 \r
 SOURCE=..\Objects\bufferobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -302,9 +302,9 @@ SOURCE=..\Objects\bufferobject.c
 \r
 SOURCE=..\Python\ceval.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -317,9 +317,9 @@ SOURCE=..\Python\ceval.c
 \r
 SOURCE=..\Objects\classobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -332,9 +332,9 @@ SOURCE=..\Objects\classobject.c
 \r
 SOURCE=..\Modules\cmathmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -347,9 +347,9 @@ SOURCE=..\Modules\cmathmodule.c
 \r
 SOURCE=..\Objects\cobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -362,9 +362,9 @@ SOURCE=..\Objects\cobject.c
 \r
 SOURCE=..\Python\compile.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -377,9 +377,9 @@ SOURCE=..\Python\compile.c
 \r
 SOURCE=..\Objects\complexobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -392,9 +392,9 @@ SOURCE=..\Objects\complexobject.c
 \r
 SOURCE=..\PC\config.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -407,9 +407,9 @@ SOURCE=..\PC\config.c
 \r
 SOURCE=..\Modules\cPickle.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -422,9 +422,9 @@ SOURCE=..\Modules\cPickle.c
 \r
 SOURCE=..\Modules\cStringIO.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -437,9 +437,9 @@ SOURCE=..\Modules\cStringIO.c
 \r
 SOURCE=..\Objects\dictobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -452,9 +452,9 @@ SOURCE=..\Objects\dictobject.c
 \r
 SOURCE=..\PC\dl_nt.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -467,9 +467,9 @@ SOURCE=..\PC\dl_nt.c
 \r
 SOURCE=..\Python\dynload_win.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -482,9 +482,9 @@ SOURCE=..\Python\dynload_win.c
 \r
 SOURCE=..\Modules\errnomodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -497,9 +497,9 @@ SOURCE=..\Modules\errnomodule.c
 \r
 SOURCE=..\Python\errors.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -512,9 +512,9 @@ SOURCE=..\Python\errors.c
 \r
 SOURCE=..\Objects\fileobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -527,9 +527,9 @@ SOURCE=..\Objects\fileobject.c
 \r
 SOURCE=..\Objects\floatobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -542,9 +542,9 @@ SOURCE=..\Objects\floatobject.c
 \r
 SOURCE=..\Modules\fpectlmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -557,9 +557,9 @@ SOURCE=..\Modules\fpectlmodule.c
 \r
 SOURCE=..\Modules\fpetestmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -572,9 +572,9 @@ SOURCE=..\Modules\fpetestmodule.c
 \r
 SOURCE=..\Objects\frameobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -587,9 +587,9 @@ SOURCE=..\Objects\frameobject.c
 \r
 SOURCE=..\Python\frozen.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -602,9 +602,9 @@ SOURCE=..\Python\frozen.c
 \r
 SOURCE=..\Objects\funcobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -617,9 +617,9 @@ SOURCE=..\Objects\funcobject.c
 \r
 SOURCE=..\Python\getargs.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -632,9 +632,9 @@ SOURCE=..\Python\getargs.c
 \r
 SOURCE=..\Modules\getbuildinfo.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -647,9 +647,9 @@ SOURCE=..\Modules\getbuildinfo.c
 \r
 SOURCE=..\Python\getcompiler.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -662,9 +662,9 @@ SOURCE=..\Python\getcompiler.c
 \r
 SOURCE=..\Python\getcopyright.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -677,9 +677,9 @@ SOURCE=..\Python\getcopyright.c
 \r
 SOURCE=..\Python\getmtime.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -692,9 +692,9 @@ SOURCE=..\Python\getmtime.c
 \r
 SOURCE=..\Python\getopt.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -707,9 +707,9 @@ SOURCE=..\Python\getopt.c
 \r
 SOURCE=..\PC\getpathp.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -722,9 +722,9 @@ SOURCE=..\PC\getpathp.c
 \r
 SOURCE=..\Python\getplatform.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -737,9 +737,9 @@ SOURCE=..\Python\getplatform.c
 \r
 SOURCE=..\Python\getversion.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -752,9 +752,9 @@ SOURCE=..\Python\getversion.c
 \r
 SOURCE=..\Python\graminit.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -767,9 +767,9 @@ SOURCE=..\Python\graminit.c
 \r
 SOURCE=..\Parser\grammar1.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -782,9 +782,9 @@ SOURCE=..\Parser\grammar1.c
 \r
 SOURCE=..\Modules\imageop.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -797,9 +797,9 @@ SOURCE=..\Modules\imageop.c
 \r
 SOURCE=..\Python\import.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -812,11 +812,11 @@ SOURCE=..\Python\import.c
 \r
 SOURCE=..\PC\import_nt.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
 # ADD CPP /I "..\Python"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 # ADD CPP /I "..\Python"\r
 \r
@@ -837,9 +837,9 @@ SOURCE=..\PC\import_nt.c
 \r
 SOURCE=..\Python\importdl.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -852,9 +852,9 @@ SOURCE=..\Python\importdl.c
 \r
 SOURCE=..\Objects\intobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -867,9 +867,9 @@ SOURCE=..\Objects\intobject.c
 \r
 SOURCE=..\Parser\listnode.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -882,9 +882,9 @@ SOURCE=..\Parser\listnode.c
 \r
 SOURCE=..\Objects\listobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -897,9 +897,9 @@ SOURCE=..\Objects\listobject.c
 \r
 SOURCE=..\Objects\longobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -912,9 +912,9 @@ SOURCE=..\Objects\longobject.c
 \r
 SOURCE=..\Modules\main.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -927,9 +927,9 @@ SOURCE=..\Modules\main.c
 \r
 SOURCE=..\Python\marshal.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -942,9 +942,9 @@ SOURCE=..\Python\marshal.c
 \r
 SOURCE=..\Modules\mathmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -957,9 +957,9 @@ SOURCE=..\Modules\mathmodule.c
 \r
 SOURCE=..\Modules\md5c.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -972,9 +972,9 @@ SOURCE=..\Modules\md5c.c
 \r
 SOURCE=..\Modules\md5module.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -987,9 +987,9 @@ SOURCE=..\Modules\md5module.c
 \r
 SOURCE=..\Parser\metagrammar.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1002,9 +1002,9 @@ SOURCE=..\Parser\metagrammar.c
 \r
 SOURCE=..\Objects\methodobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1017,9 +1017,9 @@ SOURCE=..\Objects\methodobject.c
 \r
 SOURCE=..\Python\modsupport.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1032,9 +1032,9 @@ SOURCE=..\Python\modsupport.c
 \r
 SOURCE=..\Objects\moduleobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1047,9 +1047,9 @@ SOURCE=..\Objects\moduleobject.c
 \r
 SOURCE=..\PC\msvcrtmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1062,9 +1062,9 @@ SOURCE=..\PC\msvcrtmodule.c
 \r
 SOURCE=..\Parser\myreadline.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1077,9 +1077,9 @@ SOURCE=..\Parser\myreadline.c
 \r
 SOURCE=..\Python\mystrtoul.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1092,9 +1092,9 @@ SOURCE=..\Python\mystrtoul.c
 \r
 SOURCE=..\Modules\newmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1107,9 +1107,9 @@ SOURCE=..\Modules\newmodule.c
 \r
 SOURCE=..\Parser\node.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1122,9 +1122,9 @@ SOURCE=..\Parser\node.c
 \r
 SOURCE=..\Objects\object.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1137,9 +1137,9 @@ SOURCE=..\Objects\object.c
 \r
 SOURCE=..\Modules\operator.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1152,9 +1152,9 @@ SOURCE=..\Modules\operator.c
 \r
 SOURCE=..\Parser\parser.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1167,9 +1167,9 @@ SOURCE=..\Parser\parser.c
 \r
 SOURCE=..\Parser\parsetok.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1182,9 +1182,9 @@ SOURCE=..\Parser\parsetok.c
 \r
 SOURCE=..\Modules\pcremodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1197,9 +1197,9 @@ SOURCE=..\Modules\pcremodule.c
 \r
 SOURCE=..\Modules\posixmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1212,9 +1212,9 @@ SOURCE=..\Modules\posixmodule.c
 \r
 SOURCE=..\Python\pyfpe.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1227,9 +1227,9 @@ SOURCE=..\Python\pyfpe.c
 \r
 SOURCE=..\Modules\pypcre.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1242,9 +1242,9 @@ SOURCE=..\Modules\pypcre.c
 \r
 SOURCE=..\Python\pystate.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1261,9 +1261,9 @@ SOURCE=..\PC\python_nt.rc
 \r
 SOURCE=..\Python\pythonrun.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1276,9 +1276,9 @@ SOURCE=..\Python\pythonrun.c
 \r
 SOURCE=..\Objects\rangeobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1291,9 +1291,9 @@ SOURCE=..\Objects\rangeobject.c
 \r
 SOURCE=..\Modules\regexmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1306,9 +1306,9 @@ SOURCE=..\Modules\regexmodule.c
 \r
 SOURCE=..\Modules\regexpr.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1321,9 +1321,9 @@ SOURCE=..\Modules\regexpr.c
 \r
 SOURCE=..\Modules\rgbimgmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1336,9 +1336,9 @@ SOURCE=..\Modules\rgbimgmodule.c
 \r
 SOURCE=..\Modules\rotormodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1351,9 +1351,9 @@ SOURCE=..\Modules\rotormodule.c
 \r
 SOURCE=..\Modules\selectmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1366,9 +1366,9 @@ SOURCE=..\Modules\selectmodule.c
 \r
 SOURCE=..\Modules\shamodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1381,9 +1381,9 @@ SOURCE=..\Modules\shamodule.c
 \r
 SOURCE=..\Modules\signalmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1396,9 +1396,9 @@ SOURCE=..\Modules\signalmodule.c
 \r
 SOURCE=..\Objects\sliceobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1411,9 +1411,9 @@ SOURCE=..\Objects\sliceobject.c
 \r
 SOURCE=..\Modules\socketmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1426,9 +1426,9 @@ SOURCE=..\Modules\socketmodule.c
 \r
 SOURCE=..\Modules\soundex.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1441,9 +1441,9 @@ SOURCE=..\Modules\soundex.c
 \r
 SOURCE=..\Objects\stringobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1456,9 +1456,9 @@ SOURCE=..\Objects\stringobject.c
 \r
 SOURCE=..\Modules\stropmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1471,9 +1471,9 @@ SOURCE=..\Modules\stropmodule.c
 \r
 SOURCE=..\Python\structmember.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1486,9 +1486,9 @@ SOURCE=..\Python\structmember.c
 \r
 SOURCE=..\Modules\structmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1501,9 +1501,9 @@ SOURCE=..\Modules\structmodule.c
 \r
 SOURCE=..\Python\sysmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1516,9 +1516,9 @@ SOURCE=..\Python\sysmodule.c
 \r
 SOURCE=..\Python\thread.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1531,9 +1531,9 @@ SOURCE=..\Python\thread.c
 \r
 SOURCE=..\Modules\threadmodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1546,9 +1546,9 @@ SOURCE=..\Modules\threadmodule.c
 \r
 SOURCE=..\Modules\timemodule.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1561,9 +1561,9 @@ SOURCE=..\Modules\timemodule.c
 \r
 SOURCE=..\Parser\tokenizer.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1576,9 +1576,9 @@ SOURCE=..\Parser\tokenizer.c
 \r
 SOURCE=..\Python\traceback.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1591,9 +1591,9 @@ SOURCE=..\Python\traceback.c
 \r
 SOURCE=..\Objects\tupleobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1606,9 +1606,9 @@ SOURCE=..\Objects\tupleobject.c
 \r
 SOURCE=..\Objects\typeobject.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1621,9 +1621,9 @@ SOURCE=..\Objects\typeobject.c
 \r
 SOURCE=..\PC\winsound.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r
@@ -1636,9 +1636,9 @@ SOURCE=..\PC\winsound.c
 \r
 SOURCE=..\Modules\yuvconvert.c\r
 \r
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/pythonw.dsp b/PCbuild/pythonw.dsp
index e771c8528b2fe66e31f1ca588ee9c64f9e549b9d..d9688aeaa36dc88d2c4e7d36bb73aa8dc2fff079 100644 (file)
--- a/PCbuild/pythonw.dsp
+++ b/PCbuild/pythonw.dsp
@@ -18,8 +18,8 @@ CFG=pythonw - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")\r
 !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")\r
 !MESSAGE \r
@@ -29,7 +29,7 @@ CFG=pythonw - Win32 Alpha Debug
 # PROP Scc_ProjName "pythonw"\r
 # PROP Scc_LocalPath "..\pc"\r
 \r
-!IF  "$(CFG)" == "pythonw - Win32 x86 Release"\r
+!IF  "$(CFG)" == "pythonw - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -59,7 +59,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /libpath:"Release"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -157,8 +157,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "pythonw - Win32 x86 Release"\r
-# Name "pythonw - Win32 x86 Debug"\r
+# Name "pythonw - Win32 Release"\r
+# Name "pythonw - Win32 Debug"\r
 # Name "pythonw - Win32 Alpha Debug"\r
 # Name "pythonw - Win32 Alpha Release"\r
 # Begin Source File\r
@@ -169,9 +169,9 @@ SOURCE=..\PC\python_exe.rc
 \r
 SOURCE=..\PC\WinMain.c\r
 \r
-!IF  "$(CFG)" == "pythonw - Win32 x86 Release"\r
+!IF  "$(CFG)" == "pythonw - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index 3d4aeb6f04f45739ade71789db4a408802ca6a20..b3dd71a8286fe89bb2115182cf639d7ab794397c 100644 (file)
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
-CFG=zlib - Win32 x86 Debug\r
+CFG=zlib - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,12 @@ CFG=zlib - Win32 x86 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"\r
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "zlib - Win32 x86 Release"\r
+!IF  "$(CFG)" == "zlib - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -57,7 +57,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "zlib - Win32 x86 Debug"\r
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -89,8 +89,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "zlib - Win32 x86 Release"\r
-# Name "zlib - Win32 x86 Debug"\r
+# Name "zlib - Win32 Release"\r
+# Name "zlib - Win32 Debug"\r
 # Begin Source File\r
 \r
 SOURCE=..\Modules\zlibmodule.c\r