Merged revisions 59642-59665 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59653 | martin.v.loewis | 2008-01-01 22:05:17 +0100 (Tue, 01 Jan 2008) | 3 lines

  Return results from Python callbacks to Tcl as Tcl objects.
  Fixes Tk issue #1851526
........
  r59654 | martin.v.loewis | 2008-01-01 22:08:18 +0100 (Tue, 01 Jan 2008) | 4 lines

  Always convert Text.index result to string.
  This improves compatibility with Tcl 8.5, which would
  otherwise return textindex objects.
........
  r59655 | martin.v.loewis | 2008-01-01 22:09:07 +0100 (Tue, 01 Jan 2008) | 2 lines

  News item for r59653.
........
  r59656 | martin.v.loewis | 2008-01-02 00:00:00 +0100 (Wed, 02 Jan 2008) | 1 line

  Don't link with Tix; Tix is loaded dynamically by Tcl.
........
  r59657 | martin.v.loewis | 2008-01-02 00:00:48 +0100 (Wed, 02 Jan 2008) | 1 line

  Use Visual Studio 2009 on the build slaves.
........
  r59658 | martin.v.loewis | 2008-01-02 00:36:24 +0100 (Wed, 02 Jan 2008) | 1 line

  Test in PCbuild directory.
........
  r59661 | kurt.kaiser | 2008-01-02 05:11:28 +0100 (Wed, 02 Jan 2008) | 6 lines

  Issue1177
  r58207 and r58247 patch logic is reversed.  I noticed this when I
  tried to use urllib to retrieve a file which required auth.

  Fix that and add a test for 401 error to verify.
........
  r59662 | kurt.kaiser | 2008-01-02 06:23:38 +0100 (Wed, 02 Jan 2008) | 2 lines

  Change docstrings to comments so test output will display normally.
........
  r59665 | christian.heimes | 2008-01-02 18:43:40 +0100 (Wed, 02 Jan 2008) | 5 lines

  Removed PCbuild8/ directory and added a new build directory for VS 2005
  based on the VS 2008 build directory to PC/VS8.0. The script
  PCbuild/vs8to9.py was added to sync changes from PCbuild to PC/VS8.0.

  Kristjan, the initial creator of the PCbuild8 directory is fine with the replacement. I've moved the new version of the VS 2005 build directory next to the other legacy build directories. The new sync script is based on the work of wreck and syncs changes in the project, property and solution files.
........

72 files changed, 5430 insertions, 6381 deletions

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index aecb317..33b5ed0 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -2977,7 +2977,7 @@ class Text(Widget):
         return self.tk.call(self._w, "image", "names")
     def index(self, index):
         """Return the index in the form line.char for INDEX."""
-        return self.tk.call(self._w, 'index', index)
+        return str(self.tk.call(self._w, 'index', index))
     def insert(self, index, chars, *args):
         """Insert CHARS before the characters at INDEX. An additional
         tag can be given in ARGS. Additional CHARS and tags can follow in ARGS."""
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 875903e..a87ab71 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -126,10 +126,23 @@ class urlopen_HttpTests(unittest.TestCase):
         finally:
             self.unfakehttp()
 
+    def test_read_bogus(self):
+        # urlopen() should raise IOError for many error codes.
+        self.fakehttp(b'''HTTP/1.1 401 Authentication Required
+Date: Wed, 02 Jan 2008 03:03:54 GMT
+Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+''')
+        try:
+            self.assertRaises(IOError, urllib.urlopen, "http://python.org/")
+        finally:
+            self.unfakehttp()
+
     def test_empty_socket(self):
         # urlopen() raises IOError if the underlying socket does not send any
         # data. (#1680230)
-        self.fakehttp(b"")
+        self.fakehttp(b'')
         try:
             self.assertRaises(IOError, urllib.urlopen, "http://something")
         finally:
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 81a8cd6..df21419 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -359,7 +359,7 @@ class URLopener:
 
         # According to RFC 2616, "2xx" code indicates that the client's
         # request was successfully received, understood, and accepted.
-        if not (200 <= response.status < 300):
+        if (200 <= response.status < 300):
             return addinfourl(response.fp, response.msg, "http:" + url)
         else:
             return self.http_error(
@@ -402,6 +402,77 @@ class URLopener:
             """Use HTTPS protocol."""
             return self._open_generic_http(self._https_connection, url, data)
 
+            import httplib
+            user_passwd = None
+            proxy_passwd = None
+            if isinstance(url, str):
+                host, selector = splithost(url)
+                if host:
+                    user_passwd, host = splituser(host)
+                    host = unquote(host)
+                realhost = host
+            else:
+                host, selector = url
+                # here, we determine, whether the proxy contains authorization information
+                proxy_passwd, host = splituser(host)
+                urltype, rest = splittype(selector)
+                url = rest
+                user_passwd = None
+                if urltype.lower() != 'https':
+                    realhost = None
+                else:
+                    realhost, rest = splithost(rest)
+                    if realhost:
+                        user_passwd, realhost = splituser(realhost)
+                    if user_passwd:
+                        selector = "%s://%s%s" % (urltype, realhost, rest)
+                #print "proxy via https:", host, selector
+            if not host: raise IOError('https error', 'no host given')
+            if proxy_passwd:
+                import base64
+                proxy_auth = base64.b64encode(proxy_passwd).strip()
+            else:
+                proxy_auth = None
+            if user_passwd:
+                import base64
+                auth = base64.b64encode(user_passwd).strip()
+            else:
+                auth = None
+            h = httplib.HTTPS(host, 0,
+                              key_file=self.key_file,
+                              cert_file=self.cert_file)
+            if data is not None:
+                h.putrequest('POST', selector)
+                h.putheader('Content-Type',
+                            'application/x-www-form-urlencoded')
+                h.putheader('Content-Length', '%d' % len(data))
+            else:
+                h.putrequest('GET', selector)
+            if proxy_auth: h.putheader('Proxy-Authorization', 'Basic %s' % proxy_auth)
+            if auth: h.putheader('Authorization', 'Basic %s' % auth)
+            if realhost: h.putheader('Host', realhost)
+            for args in self.addheaders: h.putheader(*args)
+            h.endheaders()
+            if data is not None:
+                h.send(data)
+            errcode, errmsg, headers = h.getreply()
+            fp = h.getfile()
+            if errcode == -1:
+                if fp: fp.close()
+                # something went wrong with the HTTP status line
+                raise IOError('http protocol error', 0,
+                                'got a bad status line', None)
+            # According to RFC 2616, "2xx" code indicates that the client's
+            # request was successfully received, understood, and accepted.
+            if (200 <= errcode < 300):
+                return addinfourl(fp, headers, "https:" + url)
+            else:
+                if data is None:
+                    return self.http_error(url, fp, errcode, errmsg, headers)
+                else:
+                    return self.http_error(url, fp, errcode, errmsg, headers,
+                                           data)
+
     def open_file(self, url):
         """Use local file or FTP depending on form of URL."""
         if not isinstance(url, str):
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index bc54b7b..0e93904 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1906,7 +1906,7 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
 	PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
 	PyObject *self, *func, *arg, *res, *s;
 	int i, rv;
-	Tcl_Obj *tres;
+	Tcl_Obj *obj_res;
 
 	ENTER_PYTHON
 
@@ -1939,13 +1939,13 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
 	if (res == NULL)
 		return PythonCmd_Error(interp);
 
-	tres = AsObj(res);
-	if (tres == NULL) {
+	obj_res = AsObj(res);
+	if (obj_res == NULL) {
 		Py_DECREF(res);
 		return PythonCmd_Error(interp);
 	}
 	else {
-		Tcl_SetObjResult(Tkapp_Interp(self), tres);
+		Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
 		rv = TCL_OK;
 	}
 
diff --git a/PCbuild8/_bsddb/_bsddb.vcproj b/PC/VS8.0/_bsddb.vcproj
index 9416b43..0dbeb28 100644
--- a/PCbuild8/_bsddb/_bsddb.vcproj
+++ b/PC/VS8.0/_bsddb.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_bsddb"

-	ProjectGUID="{E644B843-F7CA-4888-AA6D-653C77592856}"

+	ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"

 	RootNamespace="_bsddb"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,15 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -59,13 +52,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Debug /project db_static&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -86,16 +78,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -116,15 +105,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,13 +115,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug_AMD64\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Debug AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -161,16 +141,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -192,11 +169,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -206,16 +178,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -236,16 +204,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -268,11 +233,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,16 +242,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -312,16 +268,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGUpdate|Win32"

+			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -343,11 +296,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -357,16 +305,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -387,16 +331,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGUpdate|x64"

+			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -419,11 +360,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -433,15 +369,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"

+				BaseAddress="0x1e180000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -463,16 +396,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGInstrument|Win32"

+			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -494,11 +424,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -508,16 +433,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -538,16 +459,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGInstrument|x64"

+			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -570,11 +488,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bsddbDir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -584,15 +497,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"

+				BaseAddress="0x1e180000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -614,9 +524,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -625,26 +532,20 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\_bsddb.c"

+				RelativePath="..\..\Modules\bsddb.h"

 				>

 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			Name="Source Files"

 			>

+			<File

+				RelativePath="..\..\Modules\_bsddb.c"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/PCbuild8/_ctypes/_ctypes.vcproj b/PC/VS8.0/_ctypes.vcproj
index 85ca24b..bb68ad9 100644
--- a/PCbuild8/_ctypes/_ctypes.vcproj
+++ b/PC/VS8.0/_ctypes.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_ctypes"

-	ProjectGUID="{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}"

+	ProjectGUID="{0E9791DB-593A-465F-98BC-681011311618}"

 	RootNamespace="_ctypes"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -16,15 +17,12 @@
 		/>

 	</Platforms>

 	<ToolFiles>

-		<ToolFile

-			RelativePath=".\masm64.rules"

-		/>

 	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -34,9 +32,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -47,15 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -68,9 +55,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -91,16 +76,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -110,9 +92,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -124,15 +103,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -145,9 +116,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -168,16 +137,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -188,9 +154,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -201,12 +164,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -219,12 +177,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -245,16 +200,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -265,9 +217,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -279,12 +228,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -297,12 +241,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -323,16 +264,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -343,9 +281,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -356,12 +291,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -374,12 +304,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -400,16 +327,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -420,9 +344,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -434,12 +355,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -452,11 +368,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -478,16 +392,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -498,9 +409,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -511,12 +419,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -529,12 +432,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -555,16 +455,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -575,9 +472,6 @@
 				Name="VCCustomBuildTool"

 			/>

 			<Tool

-				Name="MASM64"

-			/>

-			<Tool

 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

@@ -589,12 +483,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -607,11 +496,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

+				SubSystem="0"

+				BaseAddress="0x1D1A0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -633,9 +520,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -644,9 +528,35 @@
 	</References>

 	<Files>

 		<Filter

+			Name="Header Files"

+			>

+			<File

+				RelativePath="..\..\Modules\_ctypes\ctypes.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"

+				>

+			</File>

+		</Filter>

+		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\Modules\_ctypes\_ctypes.c"

@@ -667,70 +577,6 @@
 			<File

 				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						DisableSpecificWarnings="4018"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\Modules\_ctypes\malloc_closure.c"

@@ -788,7 +634,15 @@
 					ExcludedFromBuild="true"

 					>

 					<Tool

-						Name="MASM64"

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -796,7 +650,16 @@
 					ExcludedFromBuild="true"

 					>

 					<Tool

-						Name="MASM64"

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(IntDir)\win64.obj"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -804,7 +667,16 @@
 					ExcludedFromBuild="true"

 					>

 					<Tool

-						Name="MASM64"

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="PGInstrument|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(IntDir)\win64.obj"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -812,47 +684,20 @@
 					ExcludedFromBuild="true"

 					>

 					<Tool

-						Name="MASM64"

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="PGUpdate|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(IntDir)\win64.obj"

 					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\Modules\_ctypes\ctypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/_ctypes_test/_ctypes_test.vcproj b/PC/VS8.0/_ctypes_test.vcproj
index 27f8e53..097241e 100644
--- a/PCbuild8/_ctypes_test/_ctypes_test.vcproj
+++ b/PC/VS8.0/_ctypes_test.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_ctypes_test"

-	ProjectGUID="{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"

+	ProjectGUID="{9EC7190A-249F-4180-A900-548FDCF3055F}"

 	RootNamespace="_ctypes_test"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -61,9 +54,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -84,16 +74,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -114,14 +101,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,9 +113,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -157,16 +133,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -187,11 +160,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -204,12 +172,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -230,16 +192,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -261,11 +220,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -278,12 +232,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -304,16 +252,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -334,11 +279,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -351,12 +291,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -377,16 +311,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -408,11 +339,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -425,11 +351,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -451,16 +372,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -481,11 +399,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -498,12 +411,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -524,16 +431,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -555,11 +459,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -572,11 +471,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -598,9 +492,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -609,31 +500,21 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"

+				RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"

 				>

 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			Name="Source Files"

 			>

 			<File

-				RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"

+				RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/pyexpat/pyexpat.vcproj b/PC/VS8.0/_elementtree.vcproj
index f45a0f7..32fac0c 100644
--- a/PCbuild8/pyexpat/pyexpat.vcproj
+++ b/PC/VS8.0/_elementtree.vcproj
@@ -2,10 +2,11 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="pyexpat"

-	ProjectGUID="{80EBF51A-6018-4589-9A53-5AAF2872E230}"

-	RootNamespace="pyexpat"

+	Name="_elementtree"

+	ProjectGUID="{17E1E049-C309-4D79-843F-AE483C264AEA}"

+	RootNamespace="_elementtree"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,15 +42,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -62,9 +56,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,16 +78,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -115,15 +105,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -136,9 +119,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,16 +141,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -190,11 +169,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -207,12 +182,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -233,16 +204,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -265,11 +233,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,12 +246,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -308,16 +268,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -339,11 +296,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -356,12 +309,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -382,16 +331,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -414,11 +360,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -431,11 +373,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -457,16 +396,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -488,11 +424,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -505,12 +437,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,16 +459,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -563,11 +488,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\Modules\expat"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -580,11 +501,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="odbccp32.lib"

+				BaseAddress="0x1D100000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -606,9 +524,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -617,32 +532,60 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\pyexpat.c"

+				RelativePath="..\..\Modules\expat\ascii.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\expat\xmlparse.c"

+				RelativePath="..\..\Modules\expat\asciitab.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\expat\xmlrole.c"

+				RelativePath="..\..\Modules\expat\expat.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\expat\xmltok.c"

+				RelativePath="..\..\Modules\expat\expat_config.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\expat_external.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\iasciitab.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\internal.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\latin1tab.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\macconfig.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\nametab.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\pyexpatns.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\utf8tab.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\winconfig.h"

 				>

 			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

 			<File

 				RelativePath="..\..\Modules\expat\xmlrole.h"

 				>

@@ -653,10 +596,24 @@
 			</File>

 		</Filter>

 		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			Name="Source Files"

 			>

+			<File

+				RelativePath="..\..\Modules\_elementtree.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmlparse.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmlrole.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmltok.c"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/PCbuild8/_msi/_msi.vcproj b/PC/VS8.0/_msi.vcproj
index dc581d1..99971c6 100644
--- a/PCbuild8/_msi/_msi.vcproj
+++ b/PC/VS8.0/_msi.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_msi"

-	ProjectGUID="{A25ADCC5-8DE1-4F88-B842-C287923280B1}"

+	ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"

 	RootNamespace="_msi"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -61,10 +54,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,16 +76,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -115,14 +103,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -135,10 +115,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,16 +137,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -189,11 +164,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -206,13 +176,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -233,16 +198,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -264,11 +226,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -281,13 +238,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -308,16 +260,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -338,11 +287,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -355,13 +299,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -382,16 +321,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -413,11 +349,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -430,12 +361,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -457,16 +384,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -487,11 +411,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -504,13 +423,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,16 +445,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -562,11 +473,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -579,12 +485,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"

+				BaseAddress="0x1D160000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -606,9 +508,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -618,26 +517,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\PC\_msi.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/_socket/_socket.vcproj b/PC/VS8.0/_socket.vcproj
index 28e80d6..8abd982 100644
--- a/PCbuild8/_socket/_socket.vcproj
+++ b/PC/VS8.0/_socket.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_socket"

-	ProjectGUID="{AE31A248-5367-4EB2-A511-8722BC351CB4}"

+	ProjectGUID="{86937F53-C189-40EF-8CE8-8759D8E7D480}"

 	RootNamespace="_socket"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -62,9 +55,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,16 +76,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -115,14 +103,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -136,9 +116,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,16 +137,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -189,11 +164,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -207,12 +177,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -233,16 +198,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -264,11 +226,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,12 +239,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -308,16 +260,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -338,11 +287,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -356,12 +300,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -382,16 +321,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -413,11 +349,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -431,11 +362,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1e1D0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -457,16 +384,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -487,11 +411,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -505,12 +424,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1D0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,16 +445,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -562,11 +473,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -580,11 +486,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1e1D0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -606,9 +508,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -617,31 +516,21 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\socketmodule.c"

+				RelativePath="..\..\Modules\socketmodule.h"

 				>

 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			Name="Source Files"

 			>

 			<File

-				RelativePath="..\..\Modules\socketmodule.h"

+				RelativePath="..\..\Modules\socketmodule.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/_sqlite3/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj
index f81c5a1..2343afa 100644
--- a/PCbuild8/_sqlite3/_sqlite3.vcproj
+++ b/PC/VS8.0/_sqlite3.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_sqlite3"

-	ProjectGUID="{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"

+	ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}"

 	RootNamespace="_sqlite3"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,15 +42,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -59,13 +53,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -86,16 +80,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -116,15 +107,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,13 +118,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -161,16 +145,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -192,11 +173,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -206,16 +183,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -236,16 +210,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -268,11 +239,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,16 +249,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -312,16 +276,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -343,11 +304,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -357,16 +314,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -387,16 +341,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -419,11 +370,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -433,15 +380,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -463,16 +408,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -494,11 +436,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -508,16 +446,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -538,16 +473,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -570,11 +502,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -584,15 +512,13 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build sqlite3 libs and dll"

+				CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"

+				BaseAddress="0x1e180000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -614,9 +540,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -625,99 +548,89 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\_sqlite\cache.c"

+				RelativePath="..\..\Modules\_sqlite\cache.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\connection.c"

+				RelativePath="..\..\Modules\_sqlite\connection.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\cursor.c"

+				RelativePath="..\..\Modules\_sqlite\cursor.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\microprotocols.c"

+				RelativePath="..\..\Modules\_sqlite\microprotocols.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\module.c"

+				RelativePath="..\..\Modules\_sqlite\module.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"

+				RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\row.c"

+				RelativePath="..\..\Modules\_sqlite\row.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\statement.c"

+				RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\util.c"

+				RelativePath="..\..\Modules\_sqlite\statement.h"

 				>

 			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

 			<File

-				RelativePath="..\..\Modules\_sqlite\cache.h"

+				RelativePath="..\..\Modules\_sqlite\util.h"

 				>

 			</File>

+		</Filter>

+		<Filter

+			Name="Source Files"

+			>

 			<File

-				RelativePath="..\..\Modules\_sqlite\connection.h"

+				RelativePath="..\..\Modules\_sqlite\cache.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\cursor.h"

+				RelativePath="..\..\Modules\_sqlite\connection.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\microprotocols.h"

+				RelativePath="..\..\Modules\_sqlite\cursor.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\module.h"

+				RelativePath="..\..\Modules\_sqlite\microprotocols.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"

+				RelativePath="..\..\Modules\_sqlite\module.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\row.h"

+				RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"

+				RelativePath="..\..\Modules\_sqlite\row.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\statement.h"

+				RelativePath="..\..\Modules\_sqlite\statement.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_sqlite\util.h"

+				RelativePath="..\..\Modules\_sqlite\util.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/_ssl/_ssl.vcproj b/PC/VS8.0/_ssl.vcproj
index 81162b8..72d4292 100644
--- a/PCbuild8/_ssl/_ssl.vcproj
+++ b/PC/VS8.0/_ssl.vcproj
@@ -1,668 +1,549 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="_ssl"
-	ProjectGUID="{ECF06871-0C44-4137-93EE-E75A2F10DBE7}"
-	RootNamespace="_ssl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\Modules\_ssl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="_ssl"

+	ProjectGUID="{C6E20F84-3247-4AD6-B051-B073268F73BA}"

+	RootNamespace="_ssl"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc32"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc64"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc32"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc64"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc32"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc64"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc32"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(opensslDir)\inc64"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				CommandLine=""

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\Modules\_hashopenssl.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\_ssl.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PCbuild8/_testcapi/_testcapi.vcproj b/PC/VS8.0/_testcapi.vcproj
index 61d94ab..76ad2d8 100644
--- a/PCbuild8/_testcapi/_testcapi.vcproj
+++ b/PC/VS8.0/_testcapi.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_testcapi"

-	ProjectGUID="{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"

+	ProjectGUID="{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"

 	RootNamespace="_testcapi"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -61,9 +54,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -84,16 +75,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -114,14 +102,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,9 +114,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -157,16 +135,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -187,11 +162,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -204,12 +174,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -230,16 +195,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -261,11 +223,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -278,12 +235,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -304,16 +256,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -334,11 +283,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -351,12 +295,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -377,16 +316,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -408,11 +344,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -425,11 +356,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1e1F0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -451,16 +378,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -481,11 +405,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -498,12 +417,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1e1F0000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -524,16 +438,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -555,11 +466,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -572,11 +478,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1e1F0000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -598,9 +500,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -610,26 +509,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\Modules\_testcapimodule.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PC/VS8.0/_tkinter.vcproj b/PC/VS8.0/_tkinter.vcproj
new file mode 100644
index 0000000..f1d9bb4
--- /dev/null
+++ b/PC/VS8.0/_tkinter.vcproj
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="_tkinter"

+	ProjectGUID="{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"

+	RootNamespace="_tkinter"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(tcltkDir)\include"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltkLib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltk64Lib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(tcltkDir)\include"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltkLib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltk64Lib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(tcltkDir)\include"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltkLib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltk64Lib)"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(tcltkDir)\include"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltkLib)"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"

+				PreprocessorDefinitions="WITH_APPINIT"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="$(tcltk64Lib)"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\Modules\_tkinter.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\tkappinit.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PC/VS8.0/bdist_wininst.vcproj b/PC/VS8.0/bdist_wininst.vcproj
new file mode 100644
index 0000000..08adac6
--- /dev/null
+++ b/PC/VS8.0/bdist_wininst.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="bdist_wininst"

+	ProjectGUID="{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"

+	RootNamespace="wininst"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="..\..\lib\distutils\command"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="1"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="0"

+				AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib imagehlp.lib"

+				OutputFile="..\..\lib\distutils\command\wininst-8.0.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="LIBC"

+				ProgramDatabaseFile="..\..\lib\distutils\command\wininst-8.0.pdb"

+				SubSystem="2"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\PC\bdist_wininst\extract.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\bdist_wininst\install.c"

+				>

+			</File>

+			<Filter

+				Name="zlib"

+				>

+				<File

+					RelativePath="..\..\Modules\zlib\adler32.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\Modules\zlib\crc32.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\Modules\zlib\inffast.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\Modules\zlib\inflate.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\Modules\zlib\inftrees.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\Modules\zlib\zutil.c"

+					>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="..\..\PC\bdist_wininst\archive.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath="..\..\PC\bdist_wininst\install.rc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\bdist_wininst\PythonPowered.bmp"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PC/VS8.0/build.bat b/PC/VS8.0/build.bat
new file mode 100644
index 0000000..a6d961e
--- /dev/null
+++ b/PC/VS8.0/build.bat
@@ -0,0 +1,17 @@
+@echo off

+rem A batch program to build or rebuild a particular configuration.

+rem just for convenience.

+

+setlocal

+set platf=Win32

+set conf=Release

+set build=/build

+

+:CheckOpts

+if "%1"=="-c" (set conf=%2)     & shift & shift & goto CheckOpts

+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts

+if "%1"=="-r" (set build=/rebuild)    & shift & goto CheckOpts

+

+set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"

+echo %cmd%

+%cmd%

diff --git a/PC/VS8.0/build_env.bat b/PC/VS8.0/build_env.bat
new file mode 100644
index 0000000..01024cf
--- /dev/null
+++ b/PC/VS8.0/build_env.bat
@@ -0,0 +1 @@
+@%comspec% /k env.bat %*

diff --git a/PCbuild8/build_pgo.bat b/PC/VS8.0/build_pgo.bat
index ec85323..d28a767 100644
--- a/PCbuild8/build_pgo.bat
+++ b/PC/VS8.0/build_pgo.bat
@@ -9,12 +9,12 @@ setlocal
 set platf=Win32

 

 rem use the performance testsuite.  This is quick and simple

-set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc

-set path1=..\tools\pybench

+set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc

+set path1=..\..\tools\pybench

 

 rem or the whole testsuite for more thorough testing

-set job2=..\lib\test\regrtest.py

-set path2=..\lib

+set job2=..\..\lib\test\regrtest.py

+set path2=..\..\lib

 

 set job=%job1%

 set clrpath=%path1%

@@ -23,17 +23,19 @@ set clrpath=%path1%
 if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts

 if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts

 

-set folder=%platf%PGO

-

+set PGI=%platf%-pgi

+set PGO=%platf%-pgo

 

 @echo on

 rem build the instrumented version

-call build -r -p %platf% -c PGInstrument

+call build -p %platf% -c PGInstrument

 

 rem remove .pyc files, .pgc files and execute the job

-%folder%\python.exe rmpyc.py %clrpath%

-del %folder%\*.pgc

-%folder%\python.exe %job%

+%PGI%\python.exe rmpyc.py %clrpath%

+del %PGI%\*.pgc

+%PGI%\python.exe %job%

 

 rem finally build the optimized version

-call build -r -p %platf% -c PGUpdate

+if exist %PGO% del /s /q %PGO%

+call build -p %platf% -c PGUpdate

+

diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat
new file mode 100644
index 0000000..04eab5b
--- /dev/null
+++ b/PC/VS8.0/build_ssl.bat
@@ -0,0 +1,12 @@
+@echo off

+if not defined HOST_PYTHON (

+  if %1 EQU Debug (

+    set HOST_PYTHON=python_d.exe

+    if not exist python30_d.dll exit 1

+  ) ELSE (

+    set HOST_PYTHON=python.exe

+    if not exist python30.dll exit 1

+  )

+)

+%HOST_PYTHON% build_ssl.py %1 %2 %3

+

diff --git a/PCbuild8/build_ssl.py b/PC/VS8.0/build_ssl.py
index 7658da1..ab5fcea 100644
--- a/PCbuild8/build_ssl.py
+++ b/PC/VS8.0/build_ssl.py
@@ -13,7 +13,17 @@
 # it should configure and build SSL, then build the _ssl and _hashlib
 # Python extensions without intervention.
 
-import os, sys, re
+# Modified by Christian Heimes
+# Now this script supports pre-generated makefiles and assembly files.
+# Developers don't need an installation of Perl anymore to build Python. A svn
+# checkout from our svn repository is enough.
+#
+# In Order to create the files in the case of an update you still need Perl.
+# Run build_ssl in this order:
+# python.exe build_ssl.py Release x64
+# python.exe build_ssl.py Release Win32
+
+import os, sys, re, shutil
 
 # Find all "foo.exe" files on the PATH.
 def find_all_on_path(filename, extras = None):
@@ -51,7 +61,6 @@ def find_working_perl(perls):
     else:
         print(" NO perl interpreters were found on this machine at all!")
     print(" Please install ActivePerl and ensure it appears on your path")
-    print("The Python SSL module was not built")
     return None
 
 # Locate the best SSL directory given a few roots to look into.
@@ -86,38 +95,82 @@ def find_best_ssl_dir(sources):
     sys.stdout.flush()
     return best_name
 
+def create_makefile64(makefile, m32):
+    """Create and fix makefile for 64bit
+
+    Replace 32 with 64bit directories
+    """
+    if not os.path.isfile(m32):
+        return
+    with open(m32) as fin:
+        with open(makefile, 'w') as fout:
+            for line in fin:
+                line = line.replace("=tmp32", "=tmp64")
+                line = line.replace("=out32", "=out64")
+                line = line.replace("=inc32", "=inc64")
+                # force 64 bit machine
+                line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64")
+                line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ")
+                # don't link against the lib on 64bit systems
+                line = line.replace("bufferoverflowu.lib", "")
+                fout.write(line)
+    os.unlink(m32)
+
+def fix_makefile(makefile):
+    """Fix some stuff in all makefiles
+    """
+    if not os.path.isfile(makefile):
+        return
+    with open(makefile) as fin:
+        lines = fin.readlines()
+    with open(makefile, 'w') as fout:
+        for line in lines:
+            if line.startswith("PERL="):
+                continue
+            if line.startswith("CP="):
+                line = "CP=copy\n"
+            if line.startswith("MKDIR="):
+                line = "MKDIR=mkdir\n"
+            if line.startswith("CFLAG="):
+                line = line.strip()
+                for algo in ("RC5", "MDC2", "IDEA"):
+                    noalgo = " -DOPENSSL_NO_%s" % algo
+                    if noalgo not in line:
+                        line = line + noalgo
+                line = line + '\n'
+            fout.write(line)
+
 def run_configure(configure, do_script):
+    print("perl Configure "+configure)
     os.system("perl Configure "+configure)
+    print(do_script)
     os.system(do_script)
 
 def main():
     build_all = "-a" in sys.argv
     if sys.argv[1] == "Release":
-        arch = "x86"
         debug = False
-        configure = "VC-WIN32"
-        do_script = "ms\\do_masm"
-        makefile = "ms\\nt.mak"
     elif sys.argv[1] == "Debug":
-        arch = "x86"
         debug = True
+    else:
+        raise ValueError(str(sys.argv))
+
+    if sys.argv[2] == "Win32":
+        arch = "x86"
         configure = "VC-WIN32"
-        do_script = "ms\\do_masm"
-        makefile="ms\\d32.mak"
-    elif sys.argv[1] == "ReleaseItanium":
-        arch = "ia64"
-        debug = False
-        configure = "VC-WIN64I"
-        do_script = "ms\\do_win64i"
-        makefile = "ms\\nt.mak"
-        os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
-    elif sys.argv[1] == "ReleaseAMD64":
+        do_script = "ms\\do_nasm"
+        makefile="ms\\nt.mak"
+        m32 = makefile
+    elif sys.argv[2] == "x64":
         arch="amd64"
-        debug=False
         configure = "VC-WIN64A"
         do_script = "ms\\do_win64a"
-        makefile = "ms\\nt.mak"
-        os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
+        makefile = "ms\\nt64.mak"
+        m32 = makefile.replace('64', '')
+        #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
+    else:
+        raise ValueError(str(sys.argv))
+
     make_flags = ""
     if build_all:
         make_flags = "-a"
@@ -126,23 +179,30 @@ def main():
     perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
     perl = find_working_perl(perls)
     if perl is None:
-        sys.exit(1)
+        print("No Perl installation was found. Existing Makefiles are used.")
 
     print("Found a working perl at '%s'" % (perl,))
     sys.stdout.flush()
     # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
     ssl_dir = find_best_ssl_dir(("..\\..\\..",))
     if ssl_dir is None:
-        print(os.path.abspath(os.getcwd()))
         sys.exit(1)
 
     old_cd = os.getcwd()
     try:
         os.chdir(ssl_dir)
+        # rebuild makefile when we do the role over from 32 to 64 build
+        if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile):
+            os.unlink(m32)
+
         # If the ssl makefiles do not exist, we invoke Perl to generate them.
         # Due to a bug in this script, the makefile sometimes ended up empty
         # Force a regeneration if it is.
         if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
+            if perl is None:
+                print("Perl is required to build the makefiles!")
+                sys.exit(1)
+
             print("Creating the makefiles...")
             sys.stdout.flush()
             # Put our working Perl at the front of our path
@@ -150,13 +210,31 @@ def main():
                                           os.pathsep + \
                                           os.environ["PATH"]
             run_configure(configure, do_script)
-            if arch=="x86" and debug:
-                # the do_masm script in openssl doesn't generate a debug
-                # build makefile so we generate it here:
-                os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
+            if debug:
+                print("OpenSSL debug builds aren't supported.")
+            #if arch=="x86" and debug:
+            #    # the do_masm script in openssl doesn't generate a debug
+            #    # build makefile so we generate it here:
+            #    os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
+
+            if arch == "amd64":
+                create_makefile64(makefile, m32)
+            fix_makefile(makefile)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
-        makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
+        if arch == "amd64":
+            rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm")
+            if rc:
+                print("ml64 assembler has failed.")
+                sys.exit(rc)
+
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+
+        #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
+        makeCommand = "nmake /nologo -f \"%s\"" % makefile
         print("Executing ssl makefiles:", makeCommand)
         sys.stdout.flush()
         rc = os.system(makeCommand)
diff --git a/PC/VS8.0/build_tkinter.py b/PC/VS8.0/build_tkinter.py
new file mode 100644
index 0000000..defafe8
--- /dev/null
+++ b/PC/VS8.0/build_tkinter.py
@@ -0,0 +1,86 @@
+"""Script to compile the dependencies of _tkinter
+
+Copyright (c) 2007 by Christian Heimes <christian@cheimes.de>
+
+Licensed to PSF under a Contributor Agreement.
+"""
+
+import os
+import sys
+import shutil
+
+here = os.path.abspath(os.path.dirname(__file__))
+par = os.path.pardir
+
+if 1:
+    TCL = "tcl8.4.16"
+    TK = "tk8.4.16"
+    TIX = "tix-8.4.0"
+else:
+    TCL = "tcl8.5b3"
+    TK = "tcl8.5b3"
+    TIX = "Tix8.4.2"
+
+ROOT = os.path.abspath(os.path.join(here, par, par, par))
+# Windows 2000 compatibility: WINVER 0x0500
+# http://msdn2.microsoft.com/en-us/library/aa383745.aspx
+NMAKE = "nmake /nologo /f %s COMPILERFLAGS=-DWINVER=0x0500 %s %s"
+
+def nmake(makefile, command="", **kw):
+    defines = ' '.join(k+'='+v for k, v in kw.items())
+    cmd = NMAKE % (makefile, defines, command)
+    print("\n\n"+cmd+"\n")
+    if os.system(cmd) != 0:
+        raise RuntimeError(cmd)
+
+def build(platform, clean):
+    if platform == "Win32":
+        dest = os.path.join(ROOT, "tcltk")
+        machine = "X86"
+    elif platform == "x64":
+        dest = os.path.join(ROOT, "tcltk64")
+        machine = "X64"
+    else:
+        raise ValueError(platform)
+
+    # TCL
+    tcldir = os.path.join(ROOT, TCL)
+    if 1:
+        os.chdir(os.path.join(tcldir, "win"))
+        if clean:
+            nmake("makefile.vc", "clean")
+        nmake("makefile.vc")
+        nmake("makefile.vc", "install", INSTALLDIR=dest)
+
+    # TK
+    if 1:
+        os.chdir(os.path.join(ROOT, TK, "win"))
+        if clean:
+            nmake("makefile.vc", "clean", TCLDIR=tcldir)
+        nmake("makefile.vc", TCLDIR=tcldir)
+        nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest)
+
+    # TIX
+    if 1:
+        # python9.mak is available at http://svn.python.org
+        os.chdir(os.path.join(ROOT, TIX, "win"))
+        if clean:
+            nmake("python9.mak", "clean")
+        nmake("python9.mak", MACHINE=machine)
+        nmake("python9.mak", "install")
+
+def main():
+    if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"):
+        print("%s Win32|x64" % sys.argv[0])
+        sys.exit(1)
+
+    if "-c" in sys.argv:
+        clean = True
+    else:
+        clean = False
+
+    build(sys.argv[1], clean)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/PCbuild8/bz2/bz2.vcproj b/PC/VS8.0/bz2.vcproj
index 68935de..8f78335 100644
--- a/PCbuild8/bz2/bz2.vcproj
+++ b/PC/VS8.0/bz2.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="bz2"

-	ProjectGUID="{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}"

+	ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"

 	RootNamespace="bz2"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,15 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -59,13 +52,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -86,16 +78,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -116,15 +105,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,13 +115,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -161,16 +141,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -192,11 +169,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -206,16 +178,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -236,16 +204,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -268,11 +233,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,16 +242,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -312,16 +268,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -343,11 +296,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -357,16 +305,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -387,16 +331,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -419,11 +360,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -433,15 +369,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -463,16 +396,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -494,11 +424,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -508,16 +433,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -538,16 +459,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -570,11 +488,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(bz2Dir)"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -584,15 +497,12 @@
 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="Build libbz2"

+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -614,9 +524,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -626,26 +533,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\Modules\bz2module.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PC/VS8.0/debug.vsprops b/PC/VS8.0/debug.vsprops
new file mode 100644
index 0000000..803da6e
--- /dev/null
+++ b/PC/VS8.0/debug.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="debug"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="_DEBUG"

+	/>

+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/PC/VS8.0/env.bat b/PC/VS8.0/env.bat
new file mode 100644
index 0000000..7717d01
--- /dev/null
+++ b/PC/VS8.0/env.bat
@@ -0,0 +1,5 @@
+@echo off

+set VS8=%ProgramFiles%\Microsoft Visual Studio 8

+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64

+echo.

+call "%VS8%\VC\vcvarsall.bat" %1

diff --git a/PC/VS8.0/field3.py b/PC/VS8.0/field3.py
new file mode 100644
index 0000000..edcbe36
--- /dev/null
+++ b/PC/VS8.0/field3.py
@@ -0,0 +1,35 @@
+# An absurd workaround for the lack of arithmetic in MS's resource compiler.
+# After building Python, run this, then paste the output into the appropriate
+# part of PC\python_nt.rc.
+# Example output:
+#
+# * For 2.3a0,
+# * PY_MICRO_VERSION = 0
+# * PY_RELEASE_LEVEL = 'alpha' = 0xA
+# * PY_RELEASE_SERIAL = 1
+# *
+# * and 0*1000 + 10*10 + 1 = 101.
+# */
+# #define FIELD3 101
+
+import sys
+
+major, minor, micro, level, serial = sys.version_info
+levelnum = {'alpha': 0xA,
+            'beta': 0xB,
+            'candidate': 0xC,
+            'final': 0xF,
+           }[level]
+string = sys.version.split()[0] # like '2.3a0'
+
+print(" * For %s," % string)
+print(" * PY_MICRO_VERSION = %d" % micro)
+print(" * PY_RELEASE_LEVEL = %r = %s" % (level, hex(levelnum)))
+print(" * PY_RELEASE_SERIAL = %d" % serial)
+print(" *")
+
+field3 = micro * 1000 + levelnum * 10 + serial
+
+print(" * and %d*1000 + %d*10 + %d = %d" % (micro, levelnum, serial, field3))
+print(" */")
+print("#define FIELD3", field3)
diff --git a/PC/VS8.0/idle.bat b/PC/VS8.0/idle.bat
new file mode 100644
index 0000000..274ae1a
--- /dev/null
+++ b/PC/VS8.0/idle.bat
@@ -0,0 +1,15 @@
+@echo off

+rem start idle

+rem Usage:  idle [-d]

+rem -d   Run Debug build (python_d.exe).  Else release build.

+

+setlocal

+set exe=python

+PATH %PATH%;..\..\..\tcltk\bin

+

+if "%1"=="-d" (set exe=python_d) & shift

+

+set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9

+

+echo on

+%cmd%

diff --git a/PC/VS8.0/make_buildinfo.c b/PC/VS8.0/make_buildinfo.c
new file mode 100644
index 0000000..133cfee
--- /dev/null
+++ b/PC/VS8.0/make_buildinfo.c
@@ -0,0 +1,94 @@
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
+#define CMD_SIZE 500
+
+/* This file creates the getbuildinfo.o object, by first
+   invoking subwcrev.exe (if found), and then invoking cl.exe.
+   As a side effect, it might generate PCBuild\getbuildinfo2.c
+   also. If this isn't a subversion checkout, or subwcrev isn't
+   found, it compiles ..\\..\\Modules\\getbuildinfo.c instead.
+
+   Currently, subwcrev.exe is found from the registry entries
+   of TortoiseSVN.
+
+   No attempt is made to place getbuildinfo.o into the proper
+   binary directory. This isn't necessary, as this tool is
+   invoked as a pre-link step for pythoncore, so that overwrites
+   any previous getbuildinfo.o.
+
+*/
+
+int make_buildinfo2()
+{
+	struct _stat st;
+	HKEY hTortoise;
+	char command[CMD_SIZE+1];
+	DWORD type, size;
+	if (_stat(".svn", &st) < 0)
+		return 0;
+	/* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */
+	if (_stat("no_subwcrev", &st) == 0)
+		return 0;
+	if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&
+	    RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)
+		/* Tortoise not installed */
+		return 0;
+	command[0] = '"';  /* quote the path to the executable */
+	size = sizeof(command) - 1;
+	if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||
+	    type != REG_SZ)
+		/* Registry corrupted */
+		return 0;
+	strcat_s(command, CMD_SIZE, "bin\\subwcrev.exe");
+	if (_stat(command+1, &st) < 0)
+		/* subwcrev.exe not part of the release */
+		return 0;
+	strcat_s(command, CMD_SIZE, "\" ..\\.. ..\\..\\Modules\\getbuildinfo.c getbuildinfo2.c");
+	puts(command); fflush(stdout);
+	if (system(command) < 0)
+		return 0;
+	return 1;
+}
+
+int main(int argc, char*argv[])
+{
+	char command[500] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
+	int do_unlink, result;
+	if (argc != 2) {
+		fprintf(stderr, "make_buildinfo $(ConfigurationName)\n");
+		return EXIT_FAILURE;
+	}
+	if (strcmp(argv[1], "Release") == 0) {
+		strcat_s(command, CMD_SIZE, "-MD ");
+	}
+	else if (strcmp(argv[1], "Debug") == 0) {
+		strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd ");
+	}
+	else if (strcmp(argv[1], "ReleaseItanium") == 0) {
+		strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
+	}
+	else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
+		strcat_s(command, CMD_SIZE, "-MD ");
+		strcat_s(command, CMD_SIZE, "-MD /USECL:MS_OPTERON ");
+	}
+	else {
+		fprintf(stderr, "unsupported configuration %s\n", argv[1]);
+		return EXIT_FAILURE;
+	}
+
+	if ((do_unlink = make_buildinfo2()))
+		strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV ");
+	else
+		strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
+	strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\..\\Include -I..\\..\\PC");
+	puts(command); fflush(stdout);
+	result = system(command);
+	if (do_unlink)
+		_unlink("getbuildinfo2.c");
+	if (result < 0)
+		return EXIT_FAILURE;
+	return 0;
+}
\ No newline at end of file
diff --git a/PC/VS8.0/make_buildinfo.vcproj b/PC/VS8.0/make_buildinfo.vcproj
new file mode 100644
index 0000000..3cc71e6
--- /dev/null
+++ b/PC/VS8.0/make_buildinfo.vcproj
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="windows-1250"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="make_buildinfo"

+	ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"

+	RootNamespace="make_buildinfo"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				InlineFunctionExpansion="1"

+				PreprocessorDefinitions="_CONSOLE"

+				RuntimeLibrary="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)/make_buildinfo.exe"

+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

+				SubSystem="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				PreprocessorDefinitions="_CONSOLE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\make_buildinfo.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj
new file mode 100644
index 0000000..b097162
--- /dev/null
+++ b/PC/VS8.0/make_versioninfo.vcproj
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="make_versioninfo"

+	ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"

+	RootNamespace="make_versioninfo"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description="Build PC/pythonnt_rc(_d).h"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"

+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(SolutionDir)make_versioninfo.exe"

+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

+				SubSystem="1"

+				BaseAddress="0x1d000000"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description="Build PC/pythonnt_rc(_d).h"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"

+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="true"

+				PreprocessorDefinitions="_CONSOLE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(SolutionDir)make_versioninfo.exe"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description="Build PC/pythonnt_rc(_d).h"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"

+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(SolutionDir)make_versioninfo_d.exe"

+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

+				SubSystem="1"

+				BaseAddress="0x1d000000"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description="Build PC/pythonnt_rc(_d).h"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"

+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="false"

+				PreprocessorDefinitions="_CONSOLE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(SolutionDir)make_versioninfo_d.exe"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\PC\make_versioninfo.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PC/VS8.0/pcbuild.sln b/PC/VS8.0/pcbuild.sln
new file mode 100644
index 0000000..954179e
--- /dev/null
+++ b/PC/VS8.0/pcbuild.sln
@@ -0,0 +1,471 @@
+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"

+	ProjectSection(ProjectDependencies) = postProject

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"

+	ProjectSection(SolutionItems) = preProject

+		..\..\Modules\getbuildinfo.c = ..\..\Modules\getbuildinfo.c

+		readme.txt = readme.txt

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"

+	ProjectSection(ProjectDependencies) = postProject

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}

+		{86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		PGInstrument|Win32 = PGInstrument|Win32

+		PGInstrument|x64 = PGInstrument|x64

+		PGUpdate|Win32 = PGUpdate|Win32

+		PGUpdate|x64 = PGUpdate|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64

+		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32

+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64

+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64

+		{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64

+		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32

+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64

+		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.Build.0 = Debug|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.ActiveCfg = Debug|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.Build.0 = Debug|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.ActiveCfg = Release|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.Build.0 = Release|Win32

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.ActiveCfg = Release|x64

+		{B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.Build.0 = Release|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32

+		{0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64

+		{0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64

+		{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64

+		{17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64

+		{31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64

+		{86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.ActiveCfg = Debug|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.Build.0 = Debug|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.ActiveCfg = Debug|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.Build.0 = Debug|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.ActiveCfg = Release|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.Build.0 = Release|Win32

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.ActiveCfg = Release|x64

+		{13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.Build.0 = Release|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64

+		{C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64

+		{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.Build.0 = Debug|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.ActiveCfg = Debug|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.Build.0 = Debug|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.ActiveCfg = Release|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.Build.0 = Release|Win32

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.ActiveCfg = Release|x64

+		{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.Build.0 = Release|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.Build.0 = Debug|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.ActiveCfg = Debug|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.Build.0 = Debug|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.ActiveCfg = Release|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.Build.0 = Release|Win32

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.ActiveCfg = Release|x64

+		{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.Build.0 = Release|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64

+		{18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64

+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.Build.0 = PGInstrument|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.Build.0 = PGUpdate|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64

+		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32

+		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/PC/VS8.0/pginstrument.vsprops b/PC/VS8.0/pginstrument.vsprops
new file mode 100644
index 0000000..38c5f18
--- /dev/null
+++ b/PC/VS8.0/pginstrument.vsprops
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pginstrument"

+	OutputDirectory="$(OutDirPGI)"

+	IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		Optimization="2"

+		InlineFunctionExpansion="1"

+		EnableIntrinsicFunctions="false"

+		FavorSizeOrSpeed="2"

+		OmitFramePointers="true"

+		EnableFiberSafeOptimizations="false"

+		WholeProgramOptimization="true"

+		StringPooling="true"

+		ExceptionHandling="0"

+		BufferSecurityCheck="false"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		OptimizeReferences="2"

+		EnableCOMDATFolding="2"

+		LinkTimeCodeGeneration="2"

+		ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"

+		ImportLibrary="$(OutDirPGI)\$(TargetName).lib"

+	/>

+	<UserMacro

+		Name="OutDirPGI"

+		Value="$(SolutionDir)$(PlatformName)-pgi\"

+	/>

+</VisualStudioPropertySheet>

diff --git a/PC/VS8.0/pgupdate.vsprops b/PC/VS8.0/pgupdate.vsprops
new file mode 100644
index 0000000..26cfc2d
--- /dev/null
+++ b/PC/VS8.0/pgupdate.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pgupdate"

+	OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"

+	InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"

+	>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalManifestDependencies=""

+		LinkTimeCodeGeneration="4"

+	/>

+</VisualStudioPropertySheet>

diff --git a/PC/VS8.0/pyd.vsprops b/PC/VS8.0/pyd.vsprops
new file mode 100644
index 0000000..1294146
--- /dev/null
+++ b/PC/VS8.0/pyd.vsprops
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pyd"

+	InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		RuntimeLibrary="2"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		OutputFile="$(OutDir)\$(ProjectName).pyd"

+		ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

+		ImportLibrary="$(OutDir)\$(TargetName).lib"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine=""

+	/>

+</VisualStudioPropertySheet>

diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops
new file mode 100644
index 0000000..18f4bcf
--- /dev/null
+++ b/PC/VS8.0/pyd_d.vsprops
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pyd_d"

+	InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		Optimization="0"

+		InlineFunctionExpansion="0"

+		EnableIntrinsicFunctions="false"

+		RuntimeLibrary="3"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		OutputFile="$(OutDir)\$(ProjectName)_d.pyd"

+		LinkIncremental="1"

+		ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"

+		ImportLibrary="$(OutDir)\$(TargetName).lib"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine=""

+	/>

+	<UserMacro

+		Name="PythonExe"

+		Value="$(SolutionDir)python_d.exe"

+	/>

+</VisualStudioPropertySheet>

diff --git a/PC/VS8.0/pyexpat.vcproj b/PC/VS8.0/pyexpat.vcproj
new file mode 100644
index 0000000..b59e4ec
--- /dev/null
+++ b/PC/VS8.0/pyexpat.vcproj
@@ -0,0 +1,553 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pyexpat"

+	ProjectGUID="{D06B6426-4762-44CC-8BAD-D79052507F2F}"

+	RootNamespace="pyexpat"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|x64"

+			ConfigurationType="2"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

+			CharacterSet="0"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".\..\..\Modules\expat"

+				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			>

+			<File

+				RelativePath="..\..\Modules\expat\xmlrole.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmltok.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\Modules\pyexpat.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmlparse.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmlrole.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\expat\xmltok.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
new file mode 100644
index 0000000..a09a794
--- /dev/null
+++ b/PC/VS8.0/pyproject.vsprops
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pyproject"

+	OutputDirectory="$(SolutionDir)"

+	IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		Optimization="2"

+		InlineFunctionExpansion="1"

+		EnableIntrinsicFunctions="true"

+		AdditionalIncludeDirectories="..\..\Include; ..\..\PC"

+		PreprocessorDefinitions="_WIN32"

+		StringPooling="true"

+		ExceptionHandling="0"

+		RuntimeLibrary="0"

+		EnableFunctionLevelLinking="true"

+		WarningLevel="3"

+		DebugInformationFormat="3"

+		CompileAs="0"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		LinkIncremental="1"

+		AdditionalLibraryDirectories="$(OutDir)"

+		GenerateDebugInformation="true"

+		ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"

+		SubSystem="2"

+		RandomizedBaseAddress="1"

+		DataExecutionPrevention="0"

+		TargetMachine="1"

+	/>

+	<Tool

+		Name="VCResourceCompilerTool"

+		AdditionalIncludeDirectories="..\..\PC;..\..\Include"

+	/>

+	<UserMacro

+		Name="PyDllName"

+		Value="python30"

+	/>

+	<UserMacro

+		Name="PythonExe"

+		Value="$(SolutionDir)\python.exe"

+	/>

+	<UserMacro

+		Name="bsddbDir"

+		Value="..\..\..\db-4.4.20\build_win32\"

+	/>

+	<UserMacro

+		Name="sqlite3Dir"

+		Value="..\..\..\sqlite-source-3.3.4\"

+	/>

+	<UserMacro

+		Name="bz2Dir"

+		Value="..\..\..\bzip2-1.0.3\"

+	/>

+	<UserMacro

+		Name="opensslDir"

+		Value="..\..\..\openssl-0.9.8g\"

+	/>

+	<UserMacro

+		Name="tcltkDir"

+		Value="..\..\..\tcltk\"

+	/>

+	<UserMacro

+		Name="tcltk64Dir"

+		Value="..\..\..\tcltk64"

+	/>

+	<UserMacro

+		Name="tcltkLib"

+		Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"

+	/>

+	<UserMacro

+		Name="tcltk64Lib"

+		Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"

+	/>

+</VisualStudioPropertySheet>

diff --git a/PCbuild8/python/python.vcproj b/PC/VS8.0/python.vcproj
index 2ec1b8a..7d10e14 100644
--- a/PCbuild8/python/python.vcproj
+++ b/PC/VS8.0/python.vcproj
@@ -3,9 +3,8 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="python"

-	ProjectGUID="{AE617428-B823-4B87-BC6D-DC7C12C746D3}"

-	RootNamespace="python"

-	Keyword="Win32Proj"

+	ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -19,10 +18,12 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Debug|Win32"

+			Name="Release|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -41,33 +42,31 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName)_d.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				TargetMachine="1"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -88,17 +87,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="Release|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -118,32 +116,31 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName)_d.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

-				StackReserveSize="3000000"

-				TargetMachine="17"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -164,18 +161,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

+			InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="0"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -194,32 +189,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				Optimization="0"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				RuntimeLibrary="3"

+				BrowseInformation="1"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python_d.exe"

 				SubSystem="1"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -240,18 +236,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

+			Name="Debug|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -271,31 +265,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				Optimization="0"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				RuntimeLibrary="3"

+				BrowseInformation="1"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python_d.exe"

 				SubSystem="1"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -316,18 +312,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -346,32 +340,32 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -392,18 +386,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -423,30 +415,32 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="17"

 			/>

 			<Tool

@@ -468,18 +462,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -498,32 +490,32 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -544,18 +536,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -575,30 +565,32 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_CONSOLE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

+				AdditionalDependencies="odbccp32.lib"

+				OutputFile="$(OutDir)\python.exe"

 				SubSystem="1"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="17"

 			/>

 			<Tool

@@ -620,9 +612,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -631,25 +620,7 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\Modules\python.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

 			<File

 				RelativePath="..\..\PC\pycon.ico"

@@ -660,6 +631,14 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\Modules\python.c"

+				>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 0fe3390..6a16cd9 100644
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -3,9 +3,9 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="pythoncore"

-	ProjectGUID="{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"

-	RootNamespace="PCBuild9"

-	Keyword="Win32Proj"

+	ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"

+	RootNamespace="pythoncore"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -19,10 +19,11 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Debug|Win32"

+			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -41,30 +42,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

+				RuntimeLibrary="2"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(PyDllName)_d.dll"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="getbuildinfo.o"

+				OutputFile="$(OutDir)\$(PyDllName).dll"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDir)$(PyDllName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,17 +89,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -115,30 +117,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

+				RuntimeLibrary="2"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(PyDllName)_d.dll"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="getbuildinfo.o"

+				OutputFile="$(OutDir)\$(PyDllName).dll"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDir)$(PyDllName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,18 +164,16 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"

+			InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="0"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -189,29 +192,36 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

-				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalOptions="/Zm200 "

+				Optimization="0"

+				InlineFunctionExpansion="0"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

+				RuntimeLibrary="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="getbuildinfo.o"

+				OutputFile="$(OutDir)\$(PyDllName)_d.dll"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -232,18 +242,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

+			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -263,29 +270,36 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

-				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				AdditionalOptions="/Zm200 "

+				Optimization="0"

+				InlineFunctionExpansion="0"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

+				RuntimeLibrary="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="getbuildinfo.o"

+				OutputFile="$(OutDir)\$(PyDllName)_d.dll"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -306,18 +320,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -336,29 +347,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

 				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe Release"

 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="getbuildinfo.o"

 				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -379,18 +394,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -410,28 +422,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

 				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="getbuildinfo.o"

 				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -453,18 +470,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -483,29 +497,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

 				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe Release"

 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="getbuildinfo.o"

 				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -526,18 +544,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -557,28 +572,33 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"

+				AdditionalOptions="/Zm200 "

+				AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"

+				PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"

 				RuntimeLibrary="2"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..\..\Include"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

+				Description="generate buildinfo"

+				CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"

 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="getbuildinfo.o"

 				OutputFile="$(OutDir)\$(PyDllName).dll"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				IgnoreDefaultLibraryNames="libc"

+				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"

+				BaseAddress="0x1e000000"

+				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -600,9 +620,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -611,362 +628,6 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Python"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\Python\asdl.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\ast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\atof.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\bltinmodule.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\ceval.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\codecs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\compile.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\dynload_win.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\errors.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\frozen.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\future.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getargs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getcompiler.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getcopyright.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getmtime.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getplatform.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\getversion.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\graminit.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\import.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\importdl.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\importdl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\marshal.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\modsupport.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\mysnprintf.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\mystrtoul.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\peephole.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pyarena.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pyfpe.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pystate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pystrcmp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pystrtod.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\formatter_unicode.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\Python-ast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\pythonrun.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\structmember.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\symtable.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\sysmodule.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\thread.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\thread_nt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Python\traceback.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Objects"

-			>

-			<File

-				RelativePath="..\..\Objects\abstract.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\boolobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\bytes_methods.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\bytesobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\cellobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\classobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\cobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\codeobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\complexobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\stringlib\count.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\descrobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\dictobject.c"

-				>

-			</File>

-			<!--File

-				RelativePath="..\..\Objects\doubledigits.c"

-				>

-			</File-->

-			<File

-				RelativePath="..\..\Objects\doubledigits.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\memoryobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\enumobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\exceptions.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\stringlib\fastsearch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\fileobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\stringlib\find.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\floatobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\frameobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\funcobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\genobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\iterobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\listobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\longobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\methodobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\moduleobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\object.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\obmalloc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\stringlib\partition.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\rangeobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\setobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\sliceobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\stringobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\structseq.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\tupleobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\typeobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\unicodectype.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\unicodeobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\unicodetype_db.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Objects\weakrefobject.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\..\PC\python_nt.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

 			Name="Include"

 			>

 			<File

@@ -1046,10 +707,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\Include\memoryobject.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\Include\enumobject.h"

 				>

 			</File>

@@ -1070,6 +727,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\Include\formatter_unicode.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\Include\frameobject.h"

 				>

 			</File>

@@ -1122,6 +783,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\Include\memoryobject.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\Include\metagrammar.h"

 				>

 			</File>

@@ -1303,114 +968,6 @@
 			</File>

 		</Filter>

 		<Filter

-			Name="PC"

-			>

-			<File

-				RelativePath="..\..\PC\_subprocess.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\_winreg.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\config.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\dl_nt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\errmap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\getbuildinfo.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\getpathp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\import_nt.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Python"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\PC\msvcrtmodule.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\pyconfig.h"

-				>

-			</File>

-		</Filter>

-		<Filter

 			Name="Modules"

 			>

 			<File

@@ -1592,70 +1149,6 @@
 			<File

 				RelativePath="..\..\Modules\zlibmodule.c"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\zlib"

-					/>

-				</FileConfiguration>

 			</File>

 			<Filter

 				Name="zlib"

@@ -1827,6 +1320,174 @@
 			</Filter>

 		</Filter>

 		<Filter

+			Name="Objects"

+			>

+			<File

+				RelativePath="..\..\Objects\abstract.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\boolobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\bytes_methods.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\bytesobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\cellobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\classobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\cobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\codeobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\complexobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\stringlib\count.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\descrobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\dictobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\enumobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\exceptions.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\stringlib\fastsearch.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\fileobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\stringlib\find.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\floatobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\frameobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\funcobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\genobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\iterobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\listobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\longobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\memoryobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\methodobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\moduleobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\object.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\obmalloc.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\stringlib\partition.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\rangeobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\setobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\sliceobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\stringobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\structseq.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\tupleobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\typeobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\unicodectype.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\unicodeobject.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\unicodetype_db.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Objects\weakrefobject.c"

+				>

+			</File>

+		</Filter>

+		<Filter

 			Name="Parser"

 			>

 			<File

@@ -1886,6 +1547,222 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="PC"

+			>

+			<File

+				RelativePath="..\..\PC\_subprocess.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\_winreg.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\config.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\dl_nt.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\errmap.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\getpathp.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\import_nt.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\msvcrtmodule.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\PC\pyconfig.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Python"

+			>

+			<File

+				RelativePath="..\..\Python\asdl.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\ast.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\atof.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\bltinmodule.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\ceval.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\codecs.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\compile.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\dynload_win.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\errors.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\formatter_unicode.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\frozen.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\future.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getargs.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getcompiler.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getcopyright.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getmtime.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getopt.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getplatform.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\getversion.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\graminit.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\import.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\importdl.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\importdl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\marshal.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\modsupport.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\mysnprintf.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\mystrtoul.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\peephole.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pyarena.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pyfpe.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pystate.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pystrcmp.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pystrtod.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\Python-ast.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\pythonrun.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\structmember.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\symtable.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\sysmodule.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\thread.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\thread_nt.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Python\traceback.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			>

+			<File

+				RelativePath="..\..\PC\python_nt.rc"

+				>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/pythonw/pythonw.vcproj b/PC/VS8.0/pythonw.vcproj
index 9e2dc7b..5037b78 100644
--- a/PCbuild8/pythonw/pythonw.vcproj
+++ b/PC/VS8.0/pythonw.vcproj
@@ -3,9 +3,8 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="pythonw"

-	ProjectGUID="{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}"

-	RootNamespace="pythonw"

-	Keyword="Win32Proj"

+	ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +20,9 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

+			InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="0"

 			>

 			<Tool

@@ -42,31 +43,28 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName)_d.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

+				OutputFile="$(OutDir)\pythonw_d.exe"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

+				BaseAddress="0x1d000000"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -88,17 +86,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -119,31 +115,28 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

+				EnableIntrinsicFunctions="false"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName)_d.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				StackReserveSize="3000000"

-				TargetMachine="17"

+				OutputFile="$(OutDir)\pythonw_d.exe"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -164,18 +157,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -194,30 +184,29 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

+				OutputFile="$(OutDir)\pythonw.exe"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1d000000"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -239,18 +228,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -270,30 +256,29 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				OutputFile="$(OutDir)\pythonw.exe"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -314,18 +299,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -344,30 +326,30 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

+				OutputFile="$(OutDir)\pythonw.exe"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="1"

 			/>

 			<Tool

@@ -389,18 +371,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -420,29 +399,30 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				OutputFile="$(OutDir)\pythonw.exe"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="17"

 			/>

 			<Tool

@@ -464,18 +444,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -494,30 +471,30 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

+				OutputFile="$(OutDir)\pythonw.exe"

 				StackReserveSize="2000000"

-				LargeAddressAware="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="1"

 			/>

 			<Tool

@@ -539,18 +516,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -570,29 +544,30 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				AdditionalIncludeDirectories=""

+				PreprocessorDefinitions="_WINDOWS"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

+				EnableFunctionLevelLinking="true"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				StackReserveSize="3000000"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				OutputFile="$(OutDir)\pythonw.exe"

+				StackReserveSize="2000000"

+				BaseAddress="0x1d000000"

+				ImportLibrary=""

 				TargetMachine="17"

 			/>

 			<Tool

@@ -614,9 +589,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -625,32 +597,18 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Resource Files"

 			>

 			<File

-				RelativePath="..\..\PC\WinMain.c"

+				RelativePath="..\..\PC\python_exe.rc"

 				>

 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			Name="Source Files"

 			>

 			<File

-				RelativePath="..\..\PC\pycon.ico"

-				>

-			</File>

-			<File

-				RelativePath="..\..\PC\python_exe.rc"

+				RelativePath="..\..\PC\WinMain.c"

 				>

 			</File>

 		</Filter>

diff --git a/PCbuild8/PGUpdate.vsprops b/PC/VS8.0/release.vsprops
index 0501126..c4f8567 100644
--- a/PCbuild8/PGUpdate.vsprops
+++ b/PC/VS8.0/release.vsprops
@@ -2,11 +2,10 @@
 <VisualStudioPropertySheet

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="PGUpdate"

-	InheritedPropertySheets=".\PGInstrument.vsprops"

+	Name="release"

 	>

 	<Tool

-		Name="VCLinkerTool"

-		LinkTimeCodeGeneration="4"

+		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="NDEBUG"

 	/>

 </VisualStudioPropertySheet>

diff --git a/PCbuild8/rmpyc.py b/PC/VS8.0/rmpyc.py
index 2192360..18e1705 100644
--- a/PCbuild8/rmpyc.py
+++ b/PC/VS8.0/rmpyc.py
@@ -1,5 +1,4 @@
 # Remove all the .pyc and .pyo files under ../Lib.
-import sys
 
 
 def deltree(root):
@@ -22,9 +21,5 @@ def deltree(root):
 
     return npyc, npyo
 
-path = "../Lib"
-if len(sys.argv) > 1:
-    path = sys.argv[1]
-
-npyc, npyo = deltree(path)
+npyc, npyo = deltree("../../Lib")
 print(npyc, ".pyc deleted,", npyo, ".pyo deleted")
diff --git a/PCbuild8/rt.bat b/PC/VS8.0/rt.bat
index 8927879..90fd794 100644
--- a/PCbuild8/rt.bat
+++ b/PC/VS8.0/rt.bat
@@ -2,8 +2,6 @@
 rem Run Tests.  Run the regression test suite.

 rem Usage:  rt [-d] [-O] [-q] regrtest_args

 rem -d   Run Debug build (python_d.exe).  Else release build.

-rem -pgo Run PGO build, e.g. for instrumentation

-rem -x64 Run the x64 version, otherwise win32

 rem -O   Run python.exe or python_d.exe (see -d) with -O.

 rem -q   "quick" -- normally the tests are run twice, the first time

 rem      after deleting all the .py[co] files reachable from Lib/.

@@ -26,22 +24,17 @@ rem     rt -u "network,largefile"
 

 setlocal

 

-set platf=win32

-set exe=python.exe

+set exe=python

 set qmode=

 set dashO=

-set conf=Release

-PATH %PATH%;..\..\tcltk\bin

+PATH %PATH%;..\..\..\tcltk\bin

 

 :CheckOpts

 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts

 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts

-if "%1"=="-d" (set exe=python_d.exe) & (set conf=Debug) & shift & goto CheckOpts

-if "%1"=="-x64" (set platf=x64) & shift & goto CheckOpts

-if "%1"=="-pgo" (set conf=PGO) & shift & goto CheckOpts

+if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts

 

-set exe=%platf%%conf%\%exe%

-set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9

+set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9

 if defined qmode goto Qmode

 

 echo Deleting .pyc/.pyo files ...

diff --git a/PCbuild8/select/select.vcproj b/PC/VS8.0/select.vcproj
index a20a18b..76a98ae 100644
--- a/PCbuild8/select/select.vcproj
+++ b/PC/VS8.0/select.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="select"

-	ProjectGUID="{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"

+	ProjectGUID="{18CAE28C-B454-46C1-87A0-493D91D97F03}"

 	RootNamespace="select"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -61,10 +54,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,16 +77,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -115,14 +104,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -135,10 +116,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,16 +139,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -189,11 +166,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -206,13 +178,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -233,16 +201,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -264,11 +229,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -281,13 +241,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -308,16 +264,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -338,11 +291,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -355,13 +303,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -382,16 +326,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -413,11 +354,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -430,12 +366,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -457,16 +390,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -487,11 +417,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -504,13 +429,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,16 +452,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -562,11 +480,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -579,12 +492,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				AdditionalDependencies="wsock32.lib"

+				IgnoreDefaultLibraryNames="libc"

+				BaseAddress="0x1D110000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -606,9 +516,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -618,26 +525,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\Modules\selectmodule.c"

 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PCbuild8/unicodedata/unicodedata.vcproj b/PC/VS8.0/unicodedata.vcproj
index 8e9bb5e..4cf7d23 100644
--- a/PCbuild8/unicodedata/unicodedata.vcproj
+++ b/PC/VS8.0/unicodedata.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="unicodedata"

-	ProjectGUID="{D04B2089-7DA9-4D92-B23F-07453BC46652}"

+	ProjectGUID="{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"

 	RootNamespace="unicodedata"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -61,9 +54,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -84,16 +75,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -114,14 +102,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -134,9 +114,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -157,16 +135,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -187,11 +162,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -204,12 +174,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -230,16 +195,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -261,11 +223,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -278,12 +235,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -304,16 +256,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -334,11 +283,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -351,12 +295,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -377,16 +316,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -408,11 +344,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -425,11 +356,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1D120000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -451,16 +378,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -481,11 +405,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -498,12 +417,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				BaseAddress="0x1D120000"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -524,16 +438,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -555,11 +466,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -572,11 +478,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

+				BaseAddress="0x1D120000"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -598,9 +500,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -609,26 +508,24 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\unicodedata.c"

+				RelativePath="..\..\Modules\unicodedata_db.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Modules\unicodename_db.h"

 				>

 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			Name="Source Files"

 			>

+			<File

+				RelativePath="..\..\Modules\unicodedata.c"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/PC/VS8.0/w9xpopen.vcproj b/PC/VS8.0/w9xpopen.vcproj
new file mode 100644
index 0000000..e14d206
--- /dev/null
+++ b/PC/VS8.0/w9xpopen.vcproj
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="w9xpopen"

+	ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"

+	RootNamespace="w9xpopen"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				SubSystem="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				SubSystem="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+				ImportLibrary=""

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGInstrument|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+				ImportLibrary=""

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+				ImportLibrary=""

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="PGUpdate|x64"

+			ConfigurationType="1"

+			InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="false"

+				SubSystem="1"

+				ImportLibrary=""

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\PC\w9xpopen.c"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/PCbuild8/winsound/winsound.vcproj b/PC/VS8.0/winsound.vcproj
index c46ba2a..d379357 100644
--- a/PCbuild8/winsound/winsound.vcproj
+++ b/PC/VS8.0/winsound.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="winsound"

-	ProjectGUID="{1015E3B4-FD3B-4402-AA6E-7806514156D6}"

+	ProjectGUID="{28B5D777-DDF2-4B6B-B34F-31D938813856}"

 	RootNamespace="winsound"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -21,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -41,14 +42,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -62,9 +55,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,16 +75,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			>

 			<Tool

@@ -115,14 +102,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -136,9 +115,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -159,16 +135,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -189,11 +162,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -207,12 +175,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -233,16 +195,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -264,11 +223,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -282,12 +236,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -308,16 +256,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -338,11 +283,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -356,12 +296,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -382,16 +316,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -413,11 +344,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -431,11 +357,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -457,16 +378,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -487,11 +405,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -505,12 +418,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,16 +438,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="PGUpdate|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -562,11 +466,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -580,11 +479,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -606,9 +500,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -626,18 +517,6 @@
 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/PC/VS8.0/x64.vsprops b/PC/VS8.0/x64.vsprops
new file mode 100644
index 0000000..5514692
--- /dev/null
+++ b/PC/VS8.0/x64.vsprops
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="amd64"

+	OutputDirectory="$(SolutionDir)\amd64\"

+	IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalOptions="/USECL:MS_OPTERON /GS-"

+		PreprocessorDefinitions="_WIN64;_M_X64"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		TargetMachine="17"

+	/>

+</VisualStudioPropertySheet>

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 64cadc3..54819e88 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -70,10 +70,10 @@
 	/>
 	<UserMacro
 		Name="tcltkLib"
-		Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+		Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
 	/>
 	<UserMacro
 		Name="tcltk64Lib"
-		Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
+		Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
 	/>
 </VisualStudioPropertySheet>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index fe264e3..00b7de0 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -1,5 +1,6 @@
 Building Python using VC++ 9.0
 ------------------------------
+
 This directory is used to build Python for Win32 platforms, e.g. Windows
 2000, XP and Vista.  It requires Microsoft Visual C++ 9.0
 (a.k.a. Visual Studio .NET 2008).
@@ -36,6 +37,36 @@ The 32bit builds end up in the solution folder PCbuild while the x64 builds
 land in the amd64 subfolder. The PGI and PGO builds for profile guided
 optimization end up in their own folders, too.
 
+Legacy support
+--------------
+
+You can find build directories for older versions of Visual Studio and 
+Visual C++ in the PC directory. The legacy build directories are no longer
+actively maintained and may not work out of the box.
+
+PC/VC6/
+    Visual C++ 6.0
+PC/VS7.1/
+    Visual Studio 2003 (7.1)
+PCbuild8/
+    Visual Studio 2005 (8.0)
+
+
+C RUNTIME
+---------
+
+Visual Studio 2008 uses version 9 of the C runtime (MSVCRT9).  The executables
+are linked to a CRT "side by side" assembly which must be present on the target
+machine.  This is avalible under the VC/Redist folder of your visual studio
+distribution. On XP and later operating systems that support
+side-by-side assemblies it is not enough to have the msvcrt80.dll present,
+it has to be there as a whole assembly, that is, a folder with the .dll
+and a .manifest.  Also, a check is made for the correct version.
+Therefore, one should distribute this assembly with the dlls, and keep
+it in the same directory.  For compatibility with older systems, one should
+also set the PATH to this directory so that the dll can be found.
+For more info, see the Readme in the VC/Redist folder.
+
 SUBPROJECTS
 -----------
 These subprojects should build out of the box.  Subprojects other than the
diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py
new file mode 100644
index 0000000..09496ae
--- /dev/null
+++ b/PCbuild/vs9to8.py
@@ -0,0 +1,30 @@
+from __future__ import with_statement
+import os
+
+def vs9to8(src, dest):
+    for name in os.listdir(src):
+        path, ext = os.path.splitext(name)
+        if ext.lower() not in ('.sln', '.vcproj', '.vsprops'):
+            continue
+
+        filename = os.path.normpath(os.path.join(src, name))
+        destname = os.path.normpath(os.path.join(dest, name))
+        print("%s -> %s" % (filename, destname))
+
+        with open(filename, 'rU') as fin:
+            lines = fin.read()
+            lines = lines.replace('Version="9,00"', 'Version="8.00"')
+            lines = lines.replace('Version="9.00"', 'Version="8.00"')
+            lines = lines.replace('Format Version 10.00', 'Format Version 9.00')
+            lines = lines.replace('Visual Studio 2008', 'Visual Studio 2005')
+
+            lines = lines.replace('wininst-9.0', 'wininst-8.0')
+            lines = lines.replace('..\\', '..\\..\\')
+            lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
+
+        with open(destname, 'wb') as fout:
+            lines = lines.replace("\n", "\r\n").encode()
+            fout.write(lines)
+
+if __name__ == "__main__":
+    vs9to8(src=".", dest="../PC/VS8.0")
diff --git a/PCbuild8/PGInstrument.vsprops b/PCbuild8/PGInstrument.vsprops
deleted file mode 100644
index 58518b7..0000000
--- a/PCbuild8/PGInstrument.vsprops
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="PGInstrument"

-	OutputDirectory="$(SolutionDir)$(PlatformName)PGO"

-	IntermediateDirectory="$(PlatformName)PGO"

-	>

-	<Tool

-		Name="VCLinkerTool"

-		LinkTimeCodeGeneration="2"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/_ctypes/_ctypes.vsprops b/PCbuild8/_ctypes/_ctypes.vsprops
deleted file mode 100644
index 28155bd..0000000
--- a/PCbuild8/_ctypes/_ctypes.vsprops
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="_ctypes"

-	>

-	<Tool

-		Name="VCCLCompilerTool"

-		AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"

-	/>

-	<Tool

-		Name="VCLinkerTool"

-		AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/_ctypes/masm64.rules b/PCbuild8/_ctypes/masm64.rules
deleted file mode 100644
index d25d86c..0000000
--- a/PCbuild8/_ctypes/masm64.rules
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<VisualStudioToolFile

-	Name="Microsoft Macro Assembler 64 bit"

-	Version="8.00"

-	>

-	<Rules>

-		<CustomBuildRule

-			Name="MASM64"

-			DisplayName="Microsoft Macro Assembler 64 bit"

-			CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"

-			Outputs="[$ObjectFileName]"

-			FileExtensions="*.asm"

-			ExecutionDescription="Assembling (x64) ..."

-			>

-			<Properties>

-				<BooleanProperty

-					Name="NoLogo"

-					DisplayName="Suppress Startup Banner"

-					Description="Suppress the display of the startup banner and information messages.     (/nologo)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/nologo"

-					DefaultValue="true"

-				/>

-				<StringProperty

-					Name="ObjectFileName"

-					DisplayName="Object File Name"

-					PropertyPageName="Object File"

-					Description="Specifies the name of the output object file.     (/Fo:[file])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Fo&quot;[value]&quot;"

-					DefaultValue="$(IntDir)\$(InputName).obj"

-				/>

-				<EnumProperty

-					Name="PreserveIdentifierCase"

-					DisplayName="Preserve Identifier Case"

-					Description="Specifies preservation of case of user identifiers.     (/Cp, /Cx)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					DefaultValue="0"

-					>

-					<Values>

-						<EnumValue

-							Value="0"

-							DisplayName="Default"

-						/>

-						<EnumValue

-							Value="1"

-							Switch="/Cp"

-							DisplayName="Preserves Identifier Case (/Cp)"

-						/>

-						<EnumValue

-							Value="3"

-							Switch="/Cx"

-							DisplayName="Preserves case in public and extern symbols. (/Cx)"

-						/>

-					</Values>

-				</EnumProperty>

-				<StringProperty

-					Name="PreprocessorDefinitions"

-					DisplayName="Preprocessor Definitions"

-					Description="Defines a text macro with the given name.     (/D[symbol])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/D&quot;[value]&quot;"

-					Delimited="true"

-					Inheritable="true"

-				/>

-				<BooleanProperty

-					Name="GeneratePreprocessedSourceListing"

-					DisplayName="Generate Preprocessed Source Listing"

-					PropertyPageName="Listing File"

-					Description="Generates a preprocessed source listing to the Output Window.     (/EP)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/EP"

-				/>

-				<StringProperty

-					Name="AssembledCodeListingFile"

-					DisplayName="Assembled Code Listing File"

-					PropertyPageName="Listing File"

-					Description="Generates an assembled code listing file.     (/Fl[file])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Fl&quot;[value]&quot;"

-				/>

-				<StringProperty

-					Name="SourceListingLineWidth"

-					DisplayName="Source Listing Line Width"

-					PropertyPageName="Listing File"

-					Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width.     (/Sl [width])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sl [value]"

-				/>

-				<StringProperty

-					Name="SourceListingPageLength"

-					DisplayName="Source Listing Page Length"

-					PropertyPageName="Listing File"

-					Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length.     (/Sp [length])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sp [value]"

-				/>

-				<StringProperty

-					Name="IncludePaths"

-					DisplayName="Include Paths"

-					Description="Sets path for include file. A maximum of 10 /I options is allowed.     (/I [path])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/I &quot;[value]&quot;"

-					Delimited="true"

-					Inheritable="true"

-				/>

-				<BooleanProperty

-					Name="ListAllAvailableInformation"

-					DisplayName="List All Available Information"

-					PropertyPageName="Listing File"

-					Description="Turns on listing of all available information.     (/Sa)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sa"

-				/>

-				<BooleanProperty

-					Name="AddFirstPassListing"

-					DisplayName="Add First Pass Listing"

-					PropertyPageName="Listing File"

-					Description="Adds first-pass listing to listing file.     (/Sf)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sf"

-				/>

-				<BooleanProperty

-					Name="EnableAssemblyGeneratedCodeListing"

-					DisplayName="Enable Assembly Generated Code Listing"

-					PropertyPageName="Listing File"

-					Description="Turns on listing of assembly-generated code.     (/Sg)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sg"

-				/>

-				<BooleanProperty

-					Name="DisableSymbolTable"

-					DisplayName="Disable Symbol Table"

-					PropertyPageName="Listing File"

-					Description="Turns off symbol table when producing a listing.     (/Sn)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sn"

-				/>

-				<StringProperty

-					Name="SourceListingSubTitle"

-					DisplayName="Source Listing Subtitle"

-					PropertyPageName="Listing File"

-					Description="Specifies subtitle text for source listing. Same as SUBTITLE text.     (/Ss [subtitle])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Ss [value]"

-				/>

-				<StringProperty

-					Name="SourceListingTitle"

-					DisplayName="Source Listing Title"

-					PropertyPageName="Listing File"

-					Description="Specifies title for source listing. Same as TITLE text.     (/St [title])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/St [value]"

-				/>

-				<BooleanProperty

-					Name="EnableFalseConditionalsInListing"

-					DisplayName="Enable False Conditionals In Listing"

-					PropertyPageName="Listing File"

-					Description="Turns on false conditionals in listing.     (/Sx)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Sx"

-				/>

-				<EnumProperty

-					Name="WarningLevel"

-					DisplayName="Warning Level"

-					Description="Sets the warning level, where level = 0, 1, 2, or 3.    (/W0, /W1, /W2, /W3)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					DefaultValue="3"

-					>

-					<Values>

-						<EnumValue

-							Value="0"

-							Switch="/W0"

-							DisplayName="Warning Level 0 (/W0)"

-						/>

-						<EnumValue

-							Value="1"

-							Switch="/W1"

-							DisplayName="Warning Level 1 (/W1)"

-						/>

-						<EnumValue

-							Value="2"

-							Switch="/W2"

-							DisplayName="Warning Level 2 (/W2)"

-						/>

-						<EnumValue

-							Value="3"

-							Switch="/W3"

-							DisplayName="Warning Level 3 (/W3)"

-						/>

-					</Values>

-				</EnumProperty>

-				<BooleanProperty

-					Name="TreatWarningsAsErrors"

-					DisplayName="Treat Warnings As Errors"

-					Description="Returns an error code if warnings are generated.     (/WX)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/WX"

-				/>

-				<BooleanProperty

-					Name="MakeAllSymbolsPublic"

-					DisplayName="Make All Symbols Public"

-					PropertyPageName="Object File"

-					Description="Makes all symbols public.     (/Zf)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Zf"

-				/>

-				<BooleanProperty

-					Name="GenerateDebugInformation"

-					DisplayName="Generate Debug Information"

-					Description="Generates Debug Information.     (/Zi)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Zi"

-					DefaultValue="true"

-				/>

-				<EnumProperty

-					Name="PackAlignmentBoundary"

-					DisplayName="Pack Alignment Boundary"

-					PropertyPageName="Advanced"

-					Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16.     (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					>

-					<Values>

-						<EnumValue

-							Value="0"

-							DisplayName="Default"

-						/>

-						<EnumValue

-							Value="1"

-							Switch="/Zp1"

-							DisplayName="One Byte Boundary (/Zp1)"

-						/>

-						<EnumValue

-							Value="2"

-							Switch="/Zp2"

-							DisplayName="Two Byte Boundary (/Zp2)"

-						/>

-						<EnumValue

-							Value="3"

-							Switch="/Zp4"

-							DisplayName="Four Byte Boundary (/Zp4)"

-						/>

-						<EnumValue

-							Value="4"

-							Switch="/Zp8"

-							DisplayName="Eight Byte Boundary (/Zp8)"

-						/>

-						<EnumValue

-							Value="5"

-							Switch="/Zp16"

-							DisplayName="Sixteen Byte Boundary (/Zp16)"

-						/>

-					</Values>

-				</EnumProperty>

-				<BooleanProperty

-					Name="PerformSyntaxCheckOnly"

-					DisplayName="Perform Syntax Check Only"

-					Description="Performs a syntax check only.     (/Zs)"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/Zs"

-				/>

-				<EnumProperty

-					Name="ErrorReporting"

-					DisplayName="Error Reporting"

-					PropertyPageName="Advanced"

-					Description="Reports internal assembler errors to Microsoft.     (/errorReport:[method])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					>

-					<Values>

-						<EnumValue

-							Value="0"

-							Switch="/errorReport:prompt"

-							DisplayName="Prompt to send report immediately (/errorReport:prompt)"

-						/>

-						<EnumValue

-							Value="1"

-							Switch="/errorReport:queue"

-							DisplayName="Prompt to send report at the next logon (/errorReport:queue)"

-						/>

-						<EnumValue

-							Value="2"

-							Switch="/errorReport:send"

-							DisplayName="Automatically send report (/errorReport:send)"

-						/>

-						<EnumValue

-							Value="3"

-							Switch="/errorReport:none"

-							DisplayName="Do not send report (/errorReport:none)"

-						/>

-					</Values>

-				</EnumProperty>

-				<StringProperty

-					Name="BrowseFile"

-					DisplayName="Generate Browse Information File"

-					PropertyPageName="Advanced"

-					Description="Specifies whether to generate browse information file and its optional name or location of the browse information file.     (/FR[name])"

-					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"

-					Switch="/FR&quot;[value]&quot;"

-					Delimited="true"

-					Inheritable="true"

-				/>

-			</Properties>

-		</CustomBuildRule>

-	</Rules>

-</VisualStudioToolFile>

diff --git a/PCbuild8/_elementtree/_elementtree.vcproj b/PCbuild8/_elementtree/_elementtree.vcproj
deleted file mode 100644
index d0fe7fe..0000000
--- a/PCbuild8/_elementtree/_elementtree.vcproj
+++ /dev/null
@@ -1,724 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="_elementtree"

-	ProjectGUID="{CB025148-F0A1-4B32-A669-19EE0534136D}"

-	RootNamespace="_elementtree"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGInstrument|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGInstrument|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGUpdate|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGUpdate|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\Modules\_elementtree.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGInstrument|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="PGUpdate|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="..\..\Modules\expat"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\Modules\expat\xmlparse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\expat\xmlrole.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\expat\xmltok.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\Modules\expat\expat.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\expat\xmlrole.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\expat\xmltok.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/PCbuild8/_tkinter/_tkinter.vcproj b/PCbuild8/_tkinter/_tkinter.vcproj
deleted file mode 100644
index f52e87b..0000000
--- a/PCbuild8/_tkinter/_tkinter.vcproj
+++ /dev/null
@@ -1,664 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="_tkinter"

-	ProjectGUID="{3A1515AF-3694-4222-91F2-9837BDF60F9A}"

-	RootNamespace="_tkinter"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd_d.vsprops"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGInstrument|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGInstrument|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGUpdate|Win32"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-		<Configuration

-			Name="PGUpdate|x64"

-			ConfigurationType="2"

-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="$(tcltkDir)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\Modules\_tkinter.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\Modules\tkappinit.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/PCbuild8/build.bat b/PCbuild8/build.bat
deleted file mode 100644
index ba21390..0000000
--- a/PCbuild8/build.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off

-rem A batch program to build or rebuild a particular configuration.

-rem just for convenience.

-

-setlocal

-set platf=Win32

-set conf=Release

-set build=/build

-

-:CheckOpts

-if "%1"=="-c" (set conf=%2)     & shift & shift & goto CheckOpts

-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts

-if "%1"=="-r" (set build=/rebuild)    & shift & goto CheckOpts

-

-set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"

-echo %cmd%

-%cmd%

-

-rem Copy whatever was built to the canonical 'PCBuild' directory.

-rem This helps extensions which use distutils etc.

-rem (Don't check if the build was successful - we expect a few failures

-rem due to missing libs)

-echo Copying built files to ..\PCBuild

-if not exist %platf%%conf%\. (echo %platf%%conf% does not exist - nothing copied & goto xit)

-if not exist ..\PCBuild\. (echo ..\PCBuild does not exist - nothing copied & goto xit)

-xcopy /q/y %platf%%conf%\* ..\PCBuild\.

-

-:xit

diff --git a/PCbuild8/installer.bmp b/PCbuild8/installer.bmp
deleted file mode 100644
index 1875e19..0000000
--- a/PCbuild8/installer.bmp
+++ /dev/null
diff --git a/PCbuild8/make_buildinfo/make_buildinfo.c b/PCbuild8/make_buildinfo/make_buildinfo.c
deleted file mode 100644
index 6f89716..0000000
--- a/PCbuild8/make_buildinfo/make_buildinfo.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <windows.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <stdio.h>

-

-/* This file creates the local getbuildinfo.c file, by

-   invoking subwcrev.exe (if found).  This replaces tokens

-   int the file with information about the build.

-   If this isn't a subversion checkout, or subwcrev isn't

-   found, it copies ..\\Modules\\getbuildinfo.c instead.

-

-   Currently, subwcrev.exe is found from the registry entries

-   of TortoiseSVN.

-

-   make_buildinfo.exe is called as a pre-build step for pythoncore.

-*/

-

-int make_buildinfo2()

-{

-	struct _stat st;

-	HKEY hTortoise;

-	char command[500];

-	DWORD type, size;

-	if (_stat("..\\.svn", &st) < 0)

-		return 0;

-	/* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */

-	if (_stat("no_subwcrev", &st) == 0)

-		return 0;

-	if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&

-	    RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)

-		/* Tortoise not installed */

-		return 0;

-	command[0] = '"';  /* quote the path to the executable */

-	size = sizeof(command) - 1;

-	if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||

-	    type != REG_SZ)

-		/* Registry corrupted */

-		return 0;

-	strcat_s(command, sizeof(command), "bin\\subwcrev.exe");

-	if (_stat(command+1, &st) < 0)

-		/* subwcrev.exe not part of the release */

-		return 0;

-	strcat_s(command, sizeof(command), "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo.c");

-	puts(command); fflush(stdout);

-	if (system(command) < 0)

-		return 0;

-	return 1;

-}

-

-int main(int argc, char*argv[])

-{

-	char command[500] = "";

-	int svn;

-	/* Get getbuildinfo.c from svn as getbuildinfo2.c */

-	svn = make_buildinfo2();

-	if (svn) {

-		puts("subcwrev succeeded, generated getbuildinfo.c");

-	} else {

-		puts("Couldn't run subwcrev.exe on getbuildinfo.c.  Copying it");

-		strcat_s(command, sizeof(command), "copy /Y ..\\Modules\\getbuildinfo.c getbuildinfo.c");

-		puts(command); fflush(stdout);

-		if (system(command) < 0)

-			return EXIT_FAILURE;

-	}

-	return 0;

-}
\ No newline at end of file
diff --git a/PCbuild8/make_buildinfo/make_buildinfo.vcproj b/PCbuild8/make_buildinfo/make_buildinfo.vcproj
deleted file mode 100644
index c3f3491..0000000
--- a/PCbuild8/make_buildinfo/make_buildinfo.vcproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="make_buildinfo"

-	ProjectGUID="{87AB87DB-B665-4621-A67B-878C15B93FF0}"

-	RootNamespace="make_buildinfo"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ProjectDir)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath=".\make_buildinfo.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/PCbuild8/make_versioninfo/make_versioninfo.vcproj b/PCbuild8/make_versioninfo/make_versioninfo.vcproj
deleted file mode 100644
index 6e51944..0000000
--- a/PCbuild8/make_versioninfo/make_versioninfo.vcproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="make_versioninfo"

-	ProjectGUID="{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"

-	RootNamespace="make_versioninfo"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\pyproject.vsprops"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Generating python_rc.h"

-				CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\PC\make_versioninfo.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
deleted file mode 100644
index a734e1a..0000000
--- a/PCbuild8/pcbuild.sln
+++ /dev/null
@@ -1,433 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
-	ProjectSection(ProjectDependencies) = postProject
-		{87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo\make_buildinfo.vcproj", "{87AB87DB-B665-4621-A67B-878C15B93FF0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes.vcproj", "{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi\_msi.vcproj", "{A25ADCC5-8DE1-4F88-B842-C287923280B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3\_sqlite3.vcproj", "{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl\_ssl.vcproj", "{ECF06871-0C44-4137-93EE-E75A2F10DBE7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python\python.vcproj", "{AE617428-B823-4B87-BC6D-DC7C12C746D3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw\pythonw.vcproj", "{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select\select.vcproj", "{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata\unicodedata.vcproj", "{D04B2089-7DA9-4D92-B23F-07453BC46652}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound\winsound.vcproj", "{1015E3B4-FD3B-4402-AA6E-7806514156D6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket\_socket.vcproj", "{AE31A248-5367-4EB2-A511-8722BC351CB4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb\_bsddb.vcproj", "{E644B843-F7CA-4888-AA6D-653C77592856}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi\_testcapi.vcproj", "{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter\_tkinter.vcproj", "{3A1515AF-3694-4222-91F2-9837BDF60F9A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2\bz2.vcproj", "{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat\pyexpat.vcproj", "{80EBF51A-6018-4589-9A53-5AAF2872E230}"
-	ProjectSection(ProjectDependencies) = postProject
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{310B6D98-CFE1-4215-97C1-E52989488A50}"
-	ProjectSection(SolutionItems) = preProject
-		readme.txt = readme.txt
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		PGInstrument|Win32 = PGInstrument|Win32
-		PGInstrument|x64 = PGInstrument|x64
-		PGUpdate|Win32 = PGUpdate|Win32
-		PGUpdate|x64 = PGUpdate|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|Win32.ActiveCfg = Debug|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|Win32.Build.0 = Debug|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|x64.ActiveCfg = Debug|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|x64.Build.0 = Debug|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|Win32.ActiveCfg = Release|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|Win32.Build.0 = Release|Win32
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.ActiveCfg = Release|x64
-		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.Build.0 = Release|x64
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.Build.0 = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|x64.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|x64.Build.0 = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|Win32.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|Win32.Build.0 = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|x64.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|Win32.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|Win32.Build.0 = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|x64.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.ActiveCfg = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.Build.0 = Debug|Win32
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|x64.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.Build.0 = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|x64.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|x64.Build.0 = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|Win32.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|Win32.Build.0 = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|x64.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|Win32.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|Win32.Build.0 = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|x64.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.ActiveCfg = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.Build.0 = Debug|Win32
-		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|x64.ActiveCfg = Debug|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.Build.0 = Debug|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|x64.ActiveCfg = Debug|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|x64.Build.0 = Debug|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|Win32.ActiveCfg = Release|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|Win32.Build.0 = Release|Win32
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.ActiveCfg = Release|x64
-		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.Build.0 = Release|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.Build.0 = Debug|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|x64.ActiveCfg = Debug|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|x64.Build.0 = Debug|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|Win32.ActiveCfg = Release|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|Win32.Build.0 = Release|Win32
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.ActiveCfg = Release|x64
-		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.Build.0 = Release|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.Build.0 = Debug|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|x64.ActiveCfg = Debug|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|x64.Build.0 = Debug|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|Win32.ActiveCfg = Release|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|Win32.Build.0 = Release|Win32
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.ActiveCfg = Release|x64
-		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.Build.0 = Release|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.Build.0 = Debug|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|x64.ActiveCfg = Debug|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|x64.Build.0 = Debug|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|Win32.ActiveCfg = Release|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|Win32.Build.0 = Release|Win32
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.ActiveCfg = Release|x64
-		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.Build.0 = Release|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.Build.0 = Debug|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|x64.ActiveCfg = Debug|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|x64.Build.0 = Debug|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|Win32.ActiveCfg = Release|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|Win32.Build.0 = Release|Win32
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.ActiveCfg = Release|x64
-		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.Build.0 = Release|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|Win32.Build.0 = Debug|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|x64.ActiveCfg = Debug|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|x64.Build.0 = Debug|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|Win32.ActiveCfg = Release|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|Win32.Build.0 = Release|Win32
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|x64.ActiveCfg = Release|x64
-		{ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|x64.Build.0 = Release|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.Build.0 = Debug|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|x64.ActiveCfg = Debug|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|x64.Build.0 = Debug|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|Win32.ActiveCfg = Release|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|Win32.Build.0 = Release|Win32
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.ActiveCfg = Release|x64
-		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.Build.0 = Release|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.ActiveCfg = Debug|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.Build.0 = Debug|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|x64.ActiveCfg = Debug|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|x64.Build.0 = Debug|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|Win32.ActiveCfg = Release|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|Win32.Build.0 = Release|Win32
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.ActiveCfg = Release|x64
-		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.Build.0 = Release|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.Build.0 = Debug|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|x64.ActiveCfg = Debug|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|x64.Build.0 = Debug|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|Win32.ActiveCfg = Release|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|Win32.Build.0 = Release|Win32
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.ActiveCfg = Release|x64
-		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.Build.0 = Release|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.Build.0 = Debug|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|x64.ActiveCfg = Debug|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|x64.Build.0 = Debug|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|Win32.ActiveCfg = Release|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|Win32.Build.0 = Release|Win32
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.ActiveCfg = Release|x64
-		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.Build.0 = Release|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.Build.0 = Debug|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|x64.ActiveCfg = Debug|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|x64.Build.0 = Debug|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|Win32.ActiveCfg = Release|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|Win32.Build.0 = Release|Win32
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.ActiveCfg = Release|x64
-		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.Build.0 = Release|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.Build.0 = Debug|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|x64.ActiveCfg = Debug|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|x64.Build.0 = Debug|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|Win32.ActiveCfg = Release|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|Win32.Build.0 = Release|Win32
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.ActiveCfg = Release|x64
-		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.Build.0 = Release|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.Build.0 = Debug|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|x64.ActiveCfg = Debug|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|x64.Build.0 = Debug|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.ActiveCfg = Release|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = Release|Win32
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.ActiveCfg = Release|x64
-		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.Build.0 = Release|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.Build.0 = Debug|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|x64.ActiveCfg = Debug|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|x64.Build.0 = Debug|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|Win32.ActiveCfg = Release|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|Win32.Build.0 = Release|Win32
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.ActiveCfg = Release|x64
-		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.Build.0 = Release|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.Build.0 = Debug|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|x64.ActiveCfg = Debug|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|x64.Build.0 = Debug|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|Win32.ActiveCfg = Release|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|Win32.Build.0 = Release|Win32
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.ActiveCfg = Release|x64
-		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.Build.0 = Release|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.Build.0 = Debug|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|x64.ActiveCfg = Debug|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|x64.Build.0 = Debug|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|Win32.ActiveCfg = Release|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|Win32.Build.0 = Release|Win32
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.ActiveCfg = Release|x64
-		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.Build.0 = Release|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.ActiveCfg = Debug|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.Build.0 = Debug|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|x64.ActiveCfg = Debug|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|x64.Build.0 = Debug|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|Win32.ActiveCfg = Release|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|Win32.Build.0 = Release|Win32
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.ActiveCfg = Release|x64
-		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/PCbuild8/pyd.vsprops b/PCbuild8/pyd.vsprops
deleted file mode 100644
index afbfb50..0000000
--- a/PCbuild8/pyd.vsprops
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pyd"

-	InheritedPropertySheets=".\pyproject.vsprops"

-	>

-	<Tool

-		Name="VCLinkerTool"

-		OutputFile="$(OutDir)\$(ProjectName).pyd"

-		ImportLibrary="$(IntDir)\$(TargetName).lib"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/pyd_d.vsprops b/PCbuild8/pyd_d.vsprops
deleted file mode 100644
index 4bb3a40..0000000
--- a/PCbuild8/pyd_d.vsprops
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pyd_d"

-	InheritedPropertySheets=".\pyproject.vsprops"

-	>

-	<Tool

-		Name="VCLinkerTool"

-		OutputFile="$(OutDir)\$(ProjectName)_d.pyd"

-		LinkIncremental="1"

-		ImportLibrary="$(IntDir)\$(TargetName).lib"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/pyproject.vsprops b/PCbuild8/pyproject.vsprops
deleted file mode 100644
index a509677..0000000
--- a/PCbuild8/pyproject.vsprops
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pyproject"

-	OutputDirectory="$(SolutionDir)$(PlatformName)$(ConfigurationName)"

-	IntermediateDirectory="$(PlatformName)$(ConfigurationName)"

-	>

-	<Tool

-		Name="VCCLCompilerTool"

-		AdditionalIncludeDirectories="..\..\Include; ..\..\PC"

-		PreprocessorDefinitions="_WIN32;_CRT_SECURE_NO_DEPRECATE"

-	/>

-	<Tool

-		Name="VCLinkerTool"

-		AdditionalLibraryDirectories="$(OutDir)"

-	/>

-	<Tool

-		Name="VCResourceCompilerTool"

-		AdditionalIncludeDirectories="..\..\PC;..\..\Include"

-	/>

-	<UserMacro

-		Name="PyDllName"

-		Value="python30"

-	/>

-	<UserMacro

-		Name="bsddbDir"

-		Value="..\..\..\db-4.4.20\build_win32"

-	/>

-	<UserMacro

-		Name="sqlite3Dir"

-		Value="..\..\..\sqlite-source-3.3.4"

-	/>

-	<UserMacro

-		Name="bz2Dir"

-		Value="..\..\..\bzip2-1.0.3"

-	/>

-	<UserMacro

-		Name="opensslDir"

-		Value="..\..\..\openssl-0.9.8a"

-	/>

-	<UserMacro

-		Name="tcltkDir"

-		Value="..\..\..\tcltk"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/pythoncore/getbuildinfo.vsprops b/PCbuild8/pythoncore/getbuildinfo.vsprops
deleted file mode 100644
index 2aff8d3..0000000
--- a/PCbuild8/pythoncore/getbuildinfo.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="getbuildinfo"

-	>

-	<Tool

-		Name="VCPreBuildEventTool"

-		Description="Running make_buildinfo.exe"

-		CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_buildinfo\make_buildinfo.exe"

-	/>

-</VisualStudioPropertySheet>

diff --git a/PCbuild8/readme.txt b/PCbuild8/readme.txt
deleted file mode 100644
index eb15dc8..0000000
--- a/PCbuild8/readme.txt
+++ /dev/null
@@ -1,317 +0,0 @@
-Building Python using VC++ 8.0
--------------------------------------
-This directory is used to build Python for Win32 platforms, e.g. Windows
-95, 98 and NT.  It requires Microsoft Visual C++ 8.0
-(a.k.a. Visual Studio 2005).  There are two Platforms defined, Win32
-and x64.
-(For other Windows platforms and compilers, see ../PC/readme.txt.)
-
-All you need to do is open the workspace "pcbuild.sln" in MSVC++, select
-the Debug or Release setting (using "Solution Configuration" from
-the "Standard" toolbar"), and build the solution.
-
-A .bat file, build.bat, is provided to simplify command line builds.
-
-Some of the subprojects rely on external libraries and won't build
-unless you have them installed.
-
-Binary files go into PCBuild8\$(PlatformName)($ConfigurationName),
-which will be something like Win32Debug, Win32Release, x64Release, etc.
-
-When using the Debug setting, the output files have a _d added to
-their name:  python26_d.dll, python_d.exe, parser_d.pyd, and so on.
-
-PROFILER GUIDED OPTIMIZATION
-----------------------------
-There are two special solution configurations for Profiler Guided
-Optimization.  Careful use of this has been shown to yield more than
-10% extra speed.
-1) Build the PGInstrument solution configuration.  This will yield
-binaries in the win32PGO or x64PGO folders.  (You may want do start
-by erasing any .pgc files there, present from earlier runs.)
-2) Instrument the binaries.  Do this by for example running the test
-suite:  win32PGO\python.exe ..\lib\test\regrtest.py.  This will excercise
-python thoroughly.
-3) Build the PGUpdate solution configuration (You may need to ask it
-to rebuild.)  This will incorporate the information gathered in step 2
-and produce new binaries in the same win32PGO or x64pPGO folders.
-4) (optional) You can continue to build the PGUpdate configuration as
-you work on python.  It will continue to use the data from step 2, even
-if you add or modify files as part of your work.  Thus, it makes sense to 
-run steps 1 and 2 maybe once a week, and then use step 3) for all regular
-work.
-
-A .bat file, build_pgo.bat is included to automate this process
-
-You can convince yourself of the benefits of the PGO by comparing the
-results of the python testsuite with the regular Release build.
-
-
-C RUNTIME
----------
-Visual Studio 2005 uses version 8 of the C runtime.  The executables are
-linked to a CRT "side by side" assembly which must be present on the target
-machine.  This is avalible under the VC/Redist folder of your visual studio
-distribution.  Note that ServicePack1 of Visual Studio 2005 has a different
-version than the original.  On XP and later operating systems that support
-side-by-side assemblies it is not enough to have the msvcrt80.dll present,
-it has to be there as a whole assembly, that is, a folder with the .dll
-and a .manifest.  Also, a check is made for the correct version.
-Therefore, one should distribute this assembly with the dlls, and keep
-it in the same directory.  For compatibility with older systems, one should
-also set the PATH to this directory so that the dll can be found.
-For more info, see the Readme in the VC/Redist folder.
-
-
-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
-_socket
-    socketmodule.c
-_testcapi
-    tests of the Python C API, run via Lib/test/test_capi.py, and
-    implemented by module Modules/_testcapimodule.c
-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
-winsound
-    play sounds (typically .wav files) under Windows
-    
-Note: Check the dependencies of subprojects when building a subproject.  You 
-need to manually build each of the dependencies, in order, first.  A good 
-example of this is the pythoncore subproject.  It is dependent on both the 
-make_versioninfo and the make_buildinfo subprojects.  You can check the build 
-order by right clicking on the project name, in the solution explorer, and 
-selecting the project build order item.
-
-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.12.
-
-    Get source
-    ----------
-    In the dist directory, run
-    svn export http://svn.python.org/projects/external/tcl8.4.12
-    svn export http://svn.python.org/projects/external/tk8.4.12
-    svn export http://svn.python.org/projects/external/tix-8.4.0
-
-    Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
-    ---------------
-    Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
-         -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
-    to get a shell window with the correct environment settings
-    cd dist\tcl8.4.12\win
-    nmake -f makefile.vc
-    nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
-
-    XXX Should we compile with OPTS=threads?
-
-    Optional:  run tests, via
-        nmake -f makefile.vc test
-
-        On WinXP Pro, wholly up to date as of 30-Aug-2004:
-        all.tcl:        Total   10678   Passed  9969    Skipped 709     Failed  0
-        Sourced 129 Test Files.
-
-    Build Tk
-    --------
-    cd dist\tk8.4.12\win
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
-
-    XXX Should we compile with OPTS=threads?
-
-    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?
-
-    Optional:  run tests, via
-        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test
-
-        On WinXP Pro, wholly up to date as of 30-Aug-2004:
-        all.tcl:        Total   8420    Passed  6826    Skipped 1581    Failed  13
-        Sourced 91 Test Files.
-        Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test
-
-   Built Tix
-   ---------
-   cd dist\tix-8.4.0\win
-   nmake -f python.mak
-   nmake -f python.mak install
-
-bz2
-    Python wrapper for the libbz2 compression library.  Homepage
-        http://sources.redhat.com/bzip2/
-    Download the source from the python.org copy into the dist
-    directory:
-
-    svn export http://svn.python.org/projects/external/bzip2-1.0.3
-
-    A custom pre-link step in the bz2 project settings should manage to
-    build bzip2-1.0.3\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.3\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.3\ 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
-
-    All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python
-    project links in.
-
-
-_bsddb
-    To use the version of bsddb that Python is built with by default, invoke
-    (in the dist directory)
-
-     svn export http://svn.python.org/projects/external/db-4.4.20
-
-
-    Then open a VS.NET 2003 shell, and invoke:
-
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
-
-    and do that a second time for a Debug build too:
-
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
-
-    Alternatively, if you want to start with the original sources,
-    go to Sleepycat's download page:
-        http://www.sleepycat.com/downloads/releasehistorybdb.html
-
-    and download version 4.4.20.
-
-    With or without strong cryptography? You can choose either with or
-    without strong cryptography, as per the instructions below.  By
-    default, Python is built and distributed WITHOUT strong crypto.
-
-    Unpack the sources; if you downloaded the non-crypto version, rename
-    the directory from db-4.4.20.NC to db-4.4.20.
-
-    Now apply any patches that apply to your version.
-
-    Open
-        dist\db-4.4.20\docs\index.html
-
-    and follow the "Windows->Building Berkeley DB with Visual C++ .NET"
-    instructions for building the Sleepycat
-    software.  Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
-    Build the "db_static" project, for "Release" mode.
-
-    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).
-
-    Building for Win64:
-    - open a VS.NET 2003 command prompt
-    - run the SDK setenv.cmd script, passing /RETAIL and the target
-      architecture (/SRV64 for Itanium, /X64 for AMD64)
-    - build BerkeleyDB with the solution configuration matching the
-      target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
-    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
-
-_sqlite3
-    Python wrapper for SQLite library.
-    
-    Get the source code through
-    
-    svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
-    
-    To use the extension module in a Python build tree, copy sqlite3.dll into
-    the PCbuild folder.
-
-_ssl
-    Python wrapper for the secure sockets library.
-
-    Get the source code through
-
-    svn export http://svn.python.org/projects/external/openssl-0.9.8a
-
-    Alternatively, get the latest version from http://www.openssl.org.
-    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.
-
-    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.
-
-
-Building for AMD64
-------------------
-
-Select x64 as the destination platform.
-
-
-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.
-Also, you can simply use Visual Studio to "Add new project to solution".
-Elect to create a win32 project, .dll, empty project.
-This will create a subdirectory with a .vcproj file in it.  Now, You can
-simply copy most of another .vcproj, like _test_capi/_test_capi.vcproj over
-(you can't just copy and rename it, since the target will have a unique GUID.)
-At some point we want to be able to provide a template for creating a
-project.
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index f64c219..69edef2 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,5 +1,6 @@
 @rem Used by the buildbot "compile" step.
 cmd /c Tools\buildbot\external.bat
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Debug PC\VS7.1\pcbuild.sln
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
+
diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index c30faee..c0537b4 100644
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -2,14 +2,14 @@
 
 cmd /c Tools\buildbot\external.bat
 @rem build release versions of things
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
    devenv ..\db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
 )
 
 @rem build Python
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Release PC\VS7.1\pcbuild.sln
+devenv.com /useenv /build Release PCbuild\pcbuild.sln
 
 @rem build the documentation
 bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 7101b53..15d7365 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,7 +1,7 @@
 @rem Used by the buildbot "clean" step.
-call "%VS71COMNTOOLS%vsvars32.bat"
-cd PC\VS7.1
+call "%VS90COMNTOOLS%vsvars32.bat"
+cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
-devenv.com /clean Release pcbuild.sln
-devenv.com /clean Debug pcbuild.sln
+vcbuild /clean pcbuild.sln "Release|Win32"
+vcbuild /clean pcbuild.sln "Debug|Win32"
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 463285f..9797aa2 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -2,7 +2,7 @@
 

 @rem Assume we start inside the Python source directory

 cd ..

-call "%VS71COMNTOOLS%vsvars32.bat"

+call "%VS90COMNTOOLS%vsvars32.bat"

 

 @rem bzip

 if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3

@@ -10,24 +10,29 @@ if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip
 @rem Sleepycat db

 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20

 if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (

-   devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static

+   vcbuild db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static

 )

 

 @rem OpenSSL

-if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a

+if not exist openssl-0.9.8g (

+  if exist openssl-0.9.8a rd /s/q openssl-0.9.8a

+  svn export http://svn.python.org/projects/external/openssl-0.9.8g

+)

 

 @rem tcltk

-if not exist tcl8.4.12 (

+if not exist tcl8.4.16 (

    if exist tcltk rd /s/q tcltk

-   svn export http://svn.python.org/projects/external/tcl8.4.12

-   svn export http://svn.python.org/projects/external/tk8.4.12

-   cd tcl8.4.12\win

-   nmake -f makefile.vc

-   nmake -f makefile.vc INSTALLDIR=..\..\tcltk install

+   if exist tcl8.4.12 rd /s/q tcl8.4.12

+   if exist tk8.4.12 rd /s/q tk8.4.12

+   svn export http://svn.python.org/projects/external/tcl8.4.16

+   svn export http://svn.python.org/projects/external/tk8.4.16

+   cd tcl8.4.16\win

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install

    cd ..\..

-   cd tk8.4.12\win

-   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12

-   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install

+   cd tk8.4.16\win

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install

    cd ..\..

 )

 

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index fd707da..5ba450f 100644
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -1,4 +1,4 @@
-/* This program looks for processes which have build\PC\VS7.1\python.exe
+/* This program looks for processes which have build\PCbuild\python.exe
    in their path and terminates them. */
 #include <windows.h>
 #include <psapi.h>
@@ -46,14 +46,14 @@ int main()
 		/* Check if we are running a buildbot version of Python.
 
 		   On Windows, this will always be a debug build from the
-		   PC\VS7.1 directory.  build\\PC\\VS7.1\\python_d.exe
+		   PCbuild directory.  build\\PCbuild\\python_d.exe
 		   
 		   On Cygwin, the pathname is similar to other Unixes.
 		   Use \\build\\python.exe to ensure we don't match
-		   PC\\VS7.1\\python.exe which could be a normal instance
+		   PCbuild\\python.exe which could be a normal instance
 		   of Python running on vanilla Windows.
 		*/
-		if ((strstr(path, "build\\pc\\vs7.1\\python_d.exe") != NULL) ||
+		if ((strstr(path, "pcbuild\\python_d.exe") != NULL) ||
 		    (strstr(path, "\\build\\python.exe") != NULL)) {
 			printf("Terminating %s (pid %d)\n", path, pids[i]);
 			if (!TerminateProcess(hProcess, 1)) {
diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 680ef98..51569d2 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PC\VS7.1
+cd PCbuild
 call rt.bat -d -q -uall -rw -n