From ff8505dc89faaa313b31ffe3fb7d7ee7e32c9b37 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sat, 3 Jan 2004 05:45:59 +0000
Subject: Tons of changes to get this closer to being buildable from this
 directory; still far away, but a lot closer than it was.

---
 PC/VC6/_bsddb.dsp           |   6 +-
 PC/VC6/_csv.dsp             |   6 +-
 PC/VC6/_socket.dsp          |   6 +-
 PC/VC6/_sre.dsp             |   6 +-
 PC/VC6/_ssl.dsp             |   2 +-
 PC/VC6/_symtable.dsp        |   6 +-
 PC/VC6/_testcapi.dsp        |   6 +-
 PC/VC6/_tkinter.dsp         |   8 +-
 PC/VC6/bz2.dsp              |   6 +-
 PC/VC6/datetime.dsp         |   6 +-
 PC/VC6/make_versioninfo.dsp |  16 +--
 PC/VC6/mmap.dsp             |   6 +-
 PC/VC6/parser.dsp           |   6 +-
 PC/VC6/pyexpat.dsp          |  12 +-
 PC/VC6/python.dsp           |  12 +-
 PC/VC6/pythoncore.dsp       | 246 ++++++++++++++++++------------------
 PC/VC6/pythonw.dsp          |   8 +-
 PC/VC6/readme.txt           | 302 ++++++++++++++++++++++++++++++++++++++++++++
 PC/VC6/select.dsp           |   6 +-
 PC/VC6/unicodedata.dsp      |   6 +-
 PC/VC6/w9xpopen.dsp         |   2 +-
 PC/VC6/winreg.dsp           |   6 +-
 PC/VC6/winsound.dsp         |   6 +-
 PC/VC6/zlib.dsp             |  14 +-
 24 files changed, 504 insertions(+), 202 deletions(-)
 create mode 100644 PC/VC6/readme.txt

diff --git a/PC/VC6/_bsddb.dsp b/PC/VC6/_bsddb.dsp
index 752ff09..301f8b4 100644
--- a/PC/VC6/_bsddb.dsp
+++ b/PC/VC6/_bsddb.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\db-4.1.25\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\db-4.1.25\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_bsddb - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\_bsddb.c
+SOURCE=..\..\Modules\_bsddb.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_csv.dsp b/PC/VC6/_csv.dsp
index 31b62d7..06092a9 100644
--- a/PC/VC6/_csv.dsp
+++ b/PC/VC6/_csv.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_csv - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\_csv.c
+SOURCE=..\..\Modules\_csv.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_socket.dsp b/PC/VC6/_socket.dsp
index 9076838..85d2bf0 100644
--- a/PC/VC6/_socket.dsp
+++ b/PC/VC6/_socket.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_socket - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\socketmodule.c
+SOURCE=..\..\Modules\socketmodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_sre.dsp b/PC/VC6/_sre.dsp
index cc141b0..90218ed 100644
--- a/PC/VC6/_sre.dsp
+++ b/PC/VC6/_sre.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_sre - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\_sre.c
+SOURCE=..\..\Modules\_sre.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_ssl.dsp b/PC/VC6/_ssl.dsp
index 22447eb..e8bb993 100644
--- a/PC/VC6/_ssl.dsp
+++ b/PC/VC6/_ssl.dsp
@@ -83,7 +83,7 @@ CFG=_ssl - Win32 Debug
 
 # Begin Source File
 
-SOURCE=..\Modules\_ssl.c
+SOURCE=..\..\Modules\_ssl.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_symtable.dsp b/PC/VC6/_symtable.dsp
index 8a7e9d3..a6f662d 100644
--- a/PC/VC6/_symtable.dsp
+++ b/PC/VC6/_symtable.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_symtable - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\symtablemodule.c
+SOURCE=..\..\Modules\symtablemodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_testcapi.dsp b/PC/VC6/_testcapi.dsp
index 7f401b6..5215b63 100644
--- a/PC/VC6/_testcapi.dsp
+++ b/PC/VC6/_testcapi.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "_testcapi - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\_testcapimodule.c
+SOURCE=..\..\Modules\_testcapimodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/_tkinter.dsp b/PC/VC6/_tkinter.dsp
index 836ff0f..d0bb2f0 100644
--- a/PC/VC6/_tkinter.dsp
+++ b/PC/VC6/_tkinter.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\tcl84\include" /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\..\tcl84\include" /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -93,11 +93,11 @@ LINK32=link.exe
 # Name "_tkinter - Win32 Release"
 # Begin Source File
 
-SOURCE=..\Modules\_tkinter.c
+SOURCE=..\..\Modules\_tkinter.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\tkappinit.c
+SOURCE=..\..\Modules\tkappinit.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp
index 556eb62..719ab5b 100644
--- a/PC/VC6/bz2.dsp
+++ b/PC/VC6/bz2.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.2" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -76,7 +76,7 @@ PreLink_Cmds=cd ..\..\bzip2-1.0.2	nmake /nologo /f makefile.msc
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bzip2-1.0.2" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.2" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -101,7 +101,7 @@ PreLink_Cmds=cd ..\..\bzip2-1.0.2	nmake /nologo /f makefile.msc
 # Name "bz2 - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\bz2module.c
+SOURCE=..\..\Modules\bz2module.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/datetime.dsp b/PC/VC6/datetime.dsp
index 9339d08..50e7032 100644
--- a/PC/VC6/datetime.dsp
+++ b/PC/VC6/datetime.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "datetime - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\datetimemodule.c
+SOURCE=..\..\Modules\datetimemodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/make_versioninfo.dsp b/PC/VC6/make_versioninfo.dsp
index d18189c..a883100 100644
--- a/PC/VC6/make_versioninfo.dsp
+++ b/PC/VC6/make_versioninfo.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -56,8 +56,8 @@ LINK32=link.exe
 InputPath=.\make_versioninfo.exe
 SOURCE="$(InputPath)"
 
-"..\PC\pythonnt_rc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\make_versioninfo.exe >..\PC\pythonnt_rc.h
+"..\pythonnt_rc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	.\make_versioninfo.exe >..\pythonnt_rc.h
 
 # End Custom Build
 
@@ -75,9 +75,9 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "..\..\Include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -89,8 +89,8 @@ LINK32=link.exe
 InputPath=.\make_versioninfo_d.exe
 SOURCE="$(InputPath)"
 
-"..\PC\pythonnt_rc_d.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h
+"..\pythonnt_rc_d.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	.\make_versioninfo_d.exe >..\pythonnt_rc_d.h
 
 # End Custom Build
 
@@ -102,7 +102,7 @@ SOURCE="$(InputPath)"
 # Name "make_versioninfo - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\make_versioninfo.c
+SOURCE=..\..\make_versioninfo.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/mmap.dsp b/PC/VC6/mmap.dsp
index 3d01cae..61e8cc7 100644
--- a/PC/VC6/mmap.dsp
+++ b/PC/VC6/mmap.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "mmap - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\mmapmodule.c
+SOURCE=..\..\Modules\mmapmodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/parser.dsp b/PC/VC6/parser.dsp
index 709076f..e03c480 100644
--- a/PC/VC6/parser.dsp
+++ b/PC/VC6/parser.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "parser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\parsermodule.c
+SOURCE=..\..\Modules\parsermodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/pyexpat.dsp b/PC/VC6/pyexpat.dsp
index faf70c8..4035a54 100644
--- a/PC/VC6/pyexpat.dsp
+++ b/PC/VC6/pyexpat.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\Modules\expat" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\Modules\expat" /D "_DEBUG" /D "HAVE_EXPAT_H" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\Modules\expat" /D "_DEBUG" /D "HAVE_EXPAT_H" /D "WIN32" /D "_WINDOWS" /D "XML_NS" /D "XML_DTD" /D BYTEORDER=1234 /D XML_CONTEXT_BYTES=1024 /D "XML_STATIC" /D "HAVE_MEMMOVE" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,19 +93,19 @@ LINK32=link.exe
 # Name "pyexpat - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\pyexpat.c
+SOURCE=..\..\Modules\pyexpat.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\expat\xmlparse.c
+SOURCE=..\..\Modules\expat\xmlparse.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\expat\xmlrole.c
+SOURCE=..\..\Modules\expat\xmlrole.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\expat\xmltok.c
+SOURCE=..\..\Modules\expat\xmltok.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/python.dsp b/PC/VC6/python.dsp
index 1c72974..9135348 100644
--- a/PC/VC6/python.dsp
+++ b/PC/VC6/python.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,9 +67,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "....\\Include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -86,15 +86,15 @@ LINK32=link.exe
 # Name "python - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\pycon.ico
+SOURCE=..\pycon.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\python.c
+SOURCE=..\..\Modules\python.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\python_exe.rc
+SOURCE=..\python_exe.rc
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 768e4c0..2c68b0c 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -44,11 +44,11 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\Include" /d "NDEBUG"
+# ADD RSC /l 0x409 /i "..\..\Include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -72,11 +72,11 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "..\..\Include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -93,477 +93,477 @@ LINK32=link.exe
 # Name "pythoncore - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\_codecsmodule.c
+SOURCE=..\..\Modules\_codecsmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\_hotshot.c
+SOURCE=..\..\Modules\_hotshot.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\_localemodule.c
+SOURCE=..\..\Modules\_localemodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\_randommodule.c
+SOURCE=..\..\Modules\_randommodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\_weakref.c
+SOURCE=..\..\Modules\_weakref.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\abstract.c
+SOURCE=..\..\Objects\abstract.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\acceler.c
+SOURCE=..\..\Parser\acceler.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\arraymodule.c
+SOURCE=..\..\Modules\arraymodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\audioop.c
+SOURCE=..\..\Modules\audioop.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\binascii.c
+SOURCE=..\..\Modules\binascii.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\bitset.c
+SOURCE=..\..\Parser\bitset.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\bltinmodule.c
+SOURCE=..\..\Python\bltinmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\boolobject.c
+SOURCE=..\..\Objects\boolobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\bufferobject.c
+SOURCE=..\..\Objects\bufferobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\cellobject.c
+SOURCE=..\..\Objects\cellobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\ceval.c
+SOURCE=..\..\Python\ceval.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\classobject.c
+SOURCE=..\..\Objects\classobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\cmathmodule.c
+SOURCE=..\..\Modules\cmathmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\cobject.c
+SOURCE=..\..\Objects\cobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\codecs.c
+SOURCE=..\..\Python\codecs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\compile.c
+SOURCE=..\..\Python\compile.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\complexobject.c
+SOURCE=..\..\Objects\complexobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\config.c
+SOURCE=..\config.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\cPickle.c
+SOURCE=..\..\Modules\cPickle.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\cStringIO.c
+SOURCE=..\..\Modules\cStringIO.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\descrobject.c
+SOURCE=..\..\Objects\descrobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\dictobject.c
+SOURCE=..\..\Objects\dictobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\dl_nt.c
+SOURCE=..\dl_nt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\dynload_win.c
+SOURCE=..\..\Python\dynload_win.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\enumobject.c
+SOURCE=..\..\Objects\enumobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\errnomodule.c
+SOURCE=..\..\Modules\errnomodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\errors.c
+SOURCE=..\..\Python\errors.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\exceptions.c
+SOURCE=..\..\Python\exceptions.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\fileobject.c
+SOURCE=..\..\Objects\fileobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\floatobject.c
+SOURCE=..\..\Objects\floatobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\frameobject.c
+SOURCE=..\..\Objects\frameobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\frozen.c
+SOURCE=..\..\Python\frozen.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\funcobject.c
+SOURCE=..\..\Objects\funcobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\future.c
+SOURCE=..\..\Python\future.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\gcmodule.c
+SOURCE=..\..\Modules\gcmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getargs.c
+SOURCE=..\..\Python\getargs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\getbuildinfo.c
+SOURCE=..\..\Modules\getbuildinfo.c
 # ADD CPP /D BUILD=46
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getcompiler.c
+SOURCE=..\..\Python\getcompiler.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getcopyright.c
+SOURCE=..\..\Python\getcopyright.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getmtime.c
+SOURCE=..\..\Python\getmtime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getopt.c
+SOURCE=..\..\Python\getopt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\getpathp.c
+SOURCE=..\getpathp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getplatform.c
+SOURCE=..\..\Python\getplatform.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\getversion.c
+SOURCE=..\..\Python\getversion.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\graminit.c
+SOURCE=..\..\Python\graminit.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\grammar1.c
+SOURCE=..\..\Parser\grammar1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\heapqmodule.c
+SOURCE=..\..\Modules\heapqmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\imageop.c
+SOURCE=..\..\Modules\imageop.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\import.c
+SOURCE=..\..\Python\import.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\import_nt.c
-# ADD CPP /I "..\Python"
+SOURCE=..\import_nt.c
+# ADD CPP /I "..\..\Python"
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\importdl.c
+SOURCE=..\..\Python\importdl.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\intobject.c
+SOURCE=..\..\Objects\intobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\iterobject.c
+SOURCE=..\..\Objects\iterobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\itertoolsmodule.c
+SOURCE=..\..\Modules\itertoolsmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\listnode.c
+SOURCE=..\..\Parser\listnode.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\listobject.c
+SOURCE=..\..\Objects\listobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\longobject.c
+SOURCE=..\..\Objects\longobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\main.c
+SOURCE=..\..\Modules\main.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\marshal.c
+SOURCE=..\..\Python\marshal.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\mathmodule.c
+SOURCE=..\..\Modules\mathmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\md5c.c
+SOURCE=..\..\Modules\md5c.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\md5module.c
+SOURCE=..\..\Modules\md5module.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\metagrammar.c
+SOURCE=..\..\Parser\metagrammar.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\methodobject.c
+SOURCE=..\..\Objects\methodobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\modsupport.c
+SOURCE=..\..\Python\modsupport.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\moduleobject.c
+SOURCE=..\..\Objects\moduleobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\msvcrtmodule.c
+SOURCE=..\msvcrtmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\myreadline.c
+SOURCE=..\..\Parser\myreadline.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\mysnprintf.c
+SOURCE=..\..\Python\mysnprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\mystrtoul.c
+SOURCE=..\..\Python\mystrtoul.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\node.c
+SOURCE=..\..\Parser\node.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\object.c
+SOURCE=..\..\Objects\object.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\obmalloc.c
+SOURCE=..\..\Objects\obmalloc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\operator.c
+SOURCE=..\..\Modules\operator.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\parser.c
+SOURCE=..\..\Parser\parser.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\parsetok.c
+SOURCE=..\..\Parser\parsetok.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\pcremodule.c
+SOURCE=..\..\Modules\pcremodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\posixmodule.c
+SOURCE=..\..\Modules\posixmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\pyfpe.c
+SOURCE=..\..\Python\pyfpe.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\pypcre.c
+SOURCE=..\..\Modules\pypcre.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\pystate.c
+SOURCE=..\..\Python\pystate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\python_nt.rc
+SOURCE=..\python_nt.rc
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\pythonrun.c
+SOURCE=..\..\Python\pythonrun.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\rangeobject.c
+SOURCE=..\..\Objects\rangeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\regexmodule.c
+SOURCE=..\..\Modules\regexmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\regexpr.c
+SOURCE=..\..\Modules\regexpr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\rgbimgmodule.c
+SOURCE=..\..\Modules\rgbimgmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\rotormodule.c
+SOURCE=..\..\Modules\rotormodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\setobject.c
+SOURCE=..\..\Objects\setobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\shamodule.c
+SOURCE=..\..\Modules\shamodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\signalmodule.c
+SOURCE=..\..\Modules\signalmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\sliceobject.c
+SOURCE=..\..\Objects\sliceobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\stringobject.c
+SOURCE=..\..\Objects\stringobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\stropmodule.c
+SOURCE=..\..\Modules\stropmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\structmember.c
+SOURCE=..\..\Python\structmember.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\structmodule.c
+SOURCE=..\..\Modules\structmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\structseq.c
+SOURCE=..\..\Objects\structseq.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\symtable.c
+SOURCE=..\..\Python\symtable.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\sysmodule.c
+SOURCE=..\..\Python\sysmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\thread.c
+SOURCE=..\..\Python\thread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\threadmodule.c
+SOURCE=..\..\Modules\threadmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\timemodule.c
+SOURCE=..\..\Modules\timemodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Parser\tokenizer.c
+SOURCE=..\..\Parser\tokenizer.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Python\traceback.c
+SOURCE=..\..\Python\traceback.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\tupleobject.c
+SOURCE=..\..\Objects\tupleobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\typeobject.c
+SOURCE=..\..\Objects\typeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\unicodectype.c
+SOURCE=..\..\Objects\unicodectype.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\unicodeobject.c
+SOURCE=..\..\Objects\unicodeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Objects\weakrefobject.c
+SOURCE=..\..\Objects\weakrefobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\xreadlinesmodule.c
+SOURCE=..\..\Modules\xreadlinesmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\xxsubtype.c
+SOURCE=..\..\Modules\xxsubtype.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\yuvconvert.c
+SOURCE=..\..\Modules\yuvconvert.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\Modules\zipimport.c
+SOURCE=..\..\Modules\zipimport.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/pythonw.dsp b/PC/VC6/pythonw.dsp
index 98fe0f4..e9c325c 100644
--- a/PC/VC6/pythonw.dsp
+++ b/PC/VC6/pythonw.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -91,11 +91,11 @@ LINK32=link.exe
 # Name "pythonw - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\python_exe.rc
+SOURCE=..\python_exe.rc
 # End Source File
 # Begin Source File
 
-SOURCE=..\PC\WinMain.c
+SOURCE=..\WinMain.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
new file mode 100644
index 0000000..3abb844
--- /dev/null
+++ b/PC/VC6/readme.txt
@@ -0,0 +1,302 @@
+Building Python using VC++ 6.0 or 5.0
+-------------------------------------
+This directory is used to build Python for Win32 platforms, e.g. Windows
+95, 98 and NT.  It requires Microsoft Visual C++ 6.x or 5.x.
+(For other Windows platforms and compilers, see ../readme.txt.)
+
+All you need to do is open the workspace "pcbuild.dsw" in MSVC++, select
+the Debug or Release setting (using Build -> Set Active Configuration...),
+and build the projects.
+
+The proper order to build subprojects:
+
+1) pythoncore (this builds the main Python DLL and library files,
+               python21.{dll, lib} in Release mode)
+              NOTE:  in previous releases, this subproject was
+              named after the release number, e.g. python20.
+
+2) python (this builds the main Python executable,
+           python.exe in Release mode)
+
+3) the other subprojects, as desired or needed (note:  you probably don't
+   want to build most of the other subprojects, unless you're building an
+   entire Python distribution from scratch, or specifically making changes
+   to the subsystems they implement; see SUBPROJECTS below)
+
+When using the Debug setting, the output files have a _d added to
+their name:  python21_d.dll, python_d.exe, parser_d.pyd, and so on.
+
+SUBPROJECTS
+-----------
+These subprojects should build out of the box.  Subprojects other than the
+main ones (pythoncore, python, pythonw) generally build a DLL (renamed to
+.pyd) from a specific module so that users don't have to load the code
+supporting that module unless they import the module.
+
+pythoncore
+    .dll and .lib
+python
+    .exe
+pythonw
+    pythonw.exe, a variant of python.exe that doesn't pop up a DOS box
+_csv
+    C support for the comma-separated values module
+_socket
+    socketmodule.c
+_sre
+    Unicode-aware regular expression engine
+_symtable
+    the _symtable module, symtablemodule.c
+_testcapi
+    tests of the Python C API, run via Lib/test/test_capi.py, and
+    implemented by module Modules/_testcapimodule.c
+datetime
+    datetimemodule.c
+mmap
+    mmapmodule.c
+parser
+    the parser module
+pyexpat
+    Python wrapper for accelerated XML parsing, which incorporates stable
+    code from the Expat project:  http://sourceforge.net/projects/expat/
+select
+    selectmodule.c
+unicodedata
+    large tables of Unicode data
+winreg
+    Windows registry API
+winsound
+    play sounds (typically .wav files) under Windows
+
+The following subprojects will generally NOT build out of the box.  They
+wrap code Python doesn't control, and you'll need to download the base
+packages first and unpack them into siblings of PCbuilds's parent
+directory; for example, if your PCbuild is  .......\dist\src\PCbuild\,
+unpack into new subdirectories of dist\.
+
+_tkinter
+    Python wrapper for the Tk windowing system.  Requires building
+    Tcl/Tk first.  Following are instructions for Tcl/Tk 8.4.3:
+
+    Get source
+    ----------
+    Go to
+        http://prdownloads.sourceforge.net/tcl/
+    and download
+        tcl843-src.zip
+        tk843-src.zip
+    Unzip into
+        dist\tcl8.4.3\
+        dist\tk8.4.3\
+    respectively.
+
+    Build Tcl first (done here w/ MSVC 6 on Win98SE)
+    ---------------
+    cd dist\tcl8.4.3\win
+    run vcvars32.bat [necessary even on Win2K]
+    nmake -f makefile.vc
+    nmake -f makefile.vc INSTALLDIR=..\..\tcl84 install
+
+    XXX Should we compile with OPTS=threads?
+
+    XXX Some tests failed in "nmake -f makefile.vc test".
+    XXX all.tcl:  Total 10480   Passed 9743    Skipped 719     Failed 18
+    XXX
+    XXX That was on Win98SE.  On Win2K:
+    XXX all.tcl   Total 10480   Passed 9781    Skipped 698     Failed  1
+
+    Build Tk
+    --------
+    cd dist\tk8.4.3\win
+    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.3
+    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.3 INSTALLDIR=..\..\tcl84 install
+
+    XXX Should we compile with OPTS=threads?
+
+    XXX I have no idea whether "nmake -f makefile.vc test" passed or
+    XXX failed.  It popped up tons of little windows, and did lots of
+    XXX stuff, and nothing blew up.
+
+    XXX Our installer copies a lot of stuff out of the Tcl/Tk install
+    XXX directory.  Is all of that really needed for Python use of Tcl/Tk?
+
+    Make sure the installer matches
+    -------------------------------
+    Ensure that the Wise compiler vrbl _TCLDIR_ is set to the name of
+    the common Tcl/Tk installation directory (tcl84 for the instructions
+    above).  This is needed so the installer can copy various Tcl/Tk
+    files into the Python distribution.
+
+
+zlib
+    Python wrapper for the zlib compression library.  Get the source code
+    for version 1.1.4 from a convenient mirror at:
+        http://www.gzip.org/zlib/
+    Unpack into dist\zlib-1.1.4.
+    A custom pre-link step in the zlib project settings should manage to
+    build zlib-1.1.4\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+    linked in PCbuild\.
+    However, the zlib project is not smart enough to remove anything under
+    zlib-1.1.4\ when you do a clean, so if you want to rebuild zlib.lib
+    you need to clean up zlib-1.1.4\ by hand.
+
+bz2
+    Python wrapper for the libbz2 compression library.  Homepage
+        http://sources.redhat.com/bzip2/
+    Download the source tarball, bzip2-1.0.2.tar.gz.
+    Unpack into dist\bzip2-1.0.2.  WARNING:  If you're using WinZip, you
+    must disable its "TAR file smart CR/LF conversion" feature (under
+    Options -> Configuration -> Miscellaneous -> Other) for the duration.
+
+    A custom pre-link step in the bz2 project settings should manage to
+    build bzip2-1.0.2\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
+    linked in PCbuild\.
+    However, the bz2 project is not smart enough to remove anything under
+    bzip2-1.0.2\ when you do a clean, so if you want to rebuild bzip2.lib
+    you need to clean up bzip2-1.0.2\ by hand.
+
+    The build step shouldn't yield any warnings or errors, and should end
+    by displaying 6 blocks each terminated with
+        FC: no differences encountered
+    If FC finds differences, see the warning abou WinZip above (when I
+    first tried it, sample3.ref failed due to CRLF conversion).
+
+    All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
+    project links in.
+
+
+_bsddb
+    Go to Sleepycat's download page:
+        http://www.sleepycat.com/download/
+
+    and download version 4.1.25.  The file name is db-4.1.25.NC.zip.
+    XXX with or without strong cryptography?  I picked "without".
+
+    Unpack into
+        dist\db-4.1.25
+
+    [If using WinZip to unpack the db-4.1.25.NC distro, that requires
+     renaming the directory (to remove ".NC") after unpacking.
+    ]
+
+    Open
+        dist\db-4.1.25\docs\index.html
+
+    and follow the Windows instructions for building the Sleepycat
+    software.  Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
+    Build the Release version ("build_all -- Win32 Release").
+
+    XXX We're actually linking against Release_static\libdb41s.lib.
+    XXX This yields the following warnings:
+"""
+Compiling...
+_bsddb.c
+Linking...
+   Creating library ./_bsddb.lib and object ./_bsddb.exp
+LINK : warning LNK4049: locally defined symbol "_malloc" imported
+LINK : warning LNK4049: locally defined symbol "_free" imported
+LINK : warning LNK4049: locally defined symbol "_fclose" imported
+LINK : warning LNK4049: locally defined symbol "_fopen" imported
+_bsddb.pyd - 0 error(s), 4 warning(s)
+"""
+    XXX This isn't encouraging, but I don't know what to do about it.
+
+    To run extensive tests, pass "-u bsddb" to regrtest.py.  test_bsddb3.py
+    is then enabled.  Running in verbose mode may be helpful.
+
+    XXX The test_bsddb3 tests don't always pass, on Windows (according to
+    XXX me) or on Linux (according to Barry).  I had much better luck
+    XXX on Win2K than on Win98SE.  The common failure mode across platforms
+    XXX is
+    XXX     DBAgainError: (11, 'Resource temporarily unavailable -- unable
+    XXX                         to join the environment')
+    XXX
+    XXX and it appears timing-dependent.  On Win2K I also saw this once:
+    XXX
+    XXX test02_SimpleLocks (bsddb.test.test_thread.HashSimpleThreaded) ...
+    XXX Exception in thread reader 1:
+    XXX Traceback (most recent call last):
+    XXX File "C:\Code\python\lib\threading.py", line 411, in __bootstrap
+    XXX    self.run()
+    XXX File "C:\Code\python\lib\threading.py", line 399, in run
+    XXX    apply(self.__target, self.__args, self.__kwargs)
+    XXX File "C:\Code\python\lib\bsddb\test\test_thread.py", line 268, in
+    XXX                  readerThread
+    XXX    rec = c.next()
+    XXX DBLockDeadlockError: (-30996, 'DB_LOCK_DEADLOCK: Locker killed
+    XXX                                to resolve a deadlock')
+    XXX
+    XXX I'm told that DBLockDeadlockError is expected at times.  It
+    XXX doesn't cause a test to fail when it happens (exceptions in
+    XXX threads are invisible to unittest).
+
+
+_ssl
+    Python wrapper for the secure sockets library.
+
+    Get the latest source code for OpenSSL from
+        http://www.openssl.org
+
+    You (probably) don't want the "engine" code.  For example, get
+        openssl-0.9.6g.tar.gz
+    not
+        openssl-engine-0.9.6g.tar.gz
+
+    Unpack into the "dist" directory, retaining the folder name from
+    the archive - for example, the latest stable OpenSSL will install as
+        dist/openssl-0.9.6g
+
+    You can (theoretically) use any version of OpenSSL you like - the
+    build process will automatically select the latest version.
+
+    You must also install ActivePerl from
+        http://www.activestate.com/Products/ActivePerl/
+    as this is used by the OpenSSL build process.  Complain to them <wink>.
+
+    The MSVC project simply invokes PCBuild/build_ssl.py to perform
+    the build.  This Python script locates and builds your OpenSSL
+    installation, then invokes a simple makefile to build the final .pyd.
+
+    Win9x users:  see "Win9x note" below.
+
+    build_ssl.py attempts to catch the most common errors (such as not
+    being able to find OpenSSL sources, or not being able to find a Perl
+    that works with OpenSSL) and give a reasonable error message.
+    If you have a problem that doesn't seem to be handled correctly
+    (eg, you know you have ActivePerl but we can't find it), please take
+    a peek at build_ssl.py and suggest patches.  Note that build_ssl.py
+    should be able to be run directly from the command-line.
+
+    build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
+    this by hand.
+
+    Win9x note:  If, near the start of the build process, you see
+    something like
+
+        C:\Code\openssl-0.9.6g>set OPTS=no-asm
+        Out of environment space
+
+    then you're in trouble, and will probably also see these errors near
+    the end of the process:
+
+        NMAKE : fatal error U1073: don't know how to make
+            'crypto\md5\asm\m5_win32.asm'
+        Stop.
+        NMAKE : fatal error U1073: don't know how to make
+            'C:\Code\openssl-0.9.6g/out32/libeay32.lib'
+        Stop.
+
+    You need more environment space.  Win9x only has room for 256 bytes
+    by default, and especially after installing ActivePerl (which fiddles
+    the PATH envar), you're likely to run out.  KB Q230205
+
+        http://support.microsoft.com/default.aspx?scid=KB;en-us;q230205
+
+    explains how to edit CONFIG.SYS to cure this.
+
+
+YOUR OWN EXTENSION DLLs
+-----------------------
+If you want to create your own extension module DLL, there's an example
+with easy-to-follow instructions in ../PC/example/; read the file
+readme.txt there first.
diff --git a/PC/VC6/select.dsp b/PC/VC6/select.dsp
index 68e46a1..c5346c0 100644
--- a/PC/VC6/select.dsp
+++ b/PC/VC6/select.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\select113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\select113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\select113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\select113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "select - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\selectmodule.c
+SOURCE=..\..\Modules\selectmodule.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/unicodedata.dsp b/PC/VC6/unicodedata.dsp
index 8f67f07..859f37b 100644
--- a/PC/VC6/unicodedata.dsp
+++ b/PC/VC6/unicodedata.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "unicodedata - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\unicodedata.c
+SOURCE=..\..\Modules\unicodedata.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/w9xpopen.dsp b/PC/VC6/w9xpopen.dsp
index 9c50ba0..886a0e5 100644
--- a/PC/VC6/w9xpopen.dsp
+++ b/PC/VC6/w9xpopen.dsp
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "w9xpopen - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\w9xpopen.c
+SOURCE=..\w9xpopen.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/winreg.dsp b/PC/VC6/winreg.dsp
index da339e3..bac1496 100644
--- a/PC/VC6/winreg.dsp
+++ b/PC/VC6/winreg.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "winreg_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "winreg_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "winreg - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\_winreg.c
+SOURCE=..\_winreg.c
 
 !IF  "$(CFG)" == "winreg - Win32 Release"
 
diff --git a/PC/VC6/winsound.dsp b/PC/VC6/winsound.dsp
index 04a9e59..1183606 100644
--- a/PC/VC6/winsound.dsp
+++ b/PC/VC6/winsound.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\Include" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # Name "winsound - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\PC\winsound.c
+SOURCE=..\winsound.c
 # End Source File
 # End Target
 # End Project
diff --git a/PC/VC6/zlib.dsp b/PC/VC6/zlib.dsp
index ba0f250..42fe674 100644
--- a/PC/VC6/zlib.dsp
+++ b/PC/VC6/zlib.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 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:windows /dll /machine:I386
-# ADD LINK32 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd"
+# ADD LINK32 ..\..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking static zlib has been built
-PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
+PreLink_Cmds=cd ..\..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
@@ -77,7 +77,7 @@ PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 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:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept
+# ADD LINK32 ..\..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking static zlib has been built
-PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
+PreLink_Cmds=cd ..\..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
 # End Special Build Tool
 
 !ENDIF 
@@ -103,7 +103,7 @@ PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
 # Name "zlib - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\Modules\zlibmodule.c
+SOURCE=..\..\Modules\zlibmodule.c
 # End Source File
 # End Target
 # End Project
-- 
cgit v0.12

