diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 5d93d64d5c..ce2cb4fac9 100644
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -103,12 +103,12 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2005prj">
-        -o../msw/wx.sln
-    </add-flags>
     <add-flags files="wx.bkl" formats="msvs2003prj">
         -o../msw/wx_vc7.sln
     </add-flags>
+    <add-flags files="wx.bkl" formats="msvs2005prj">
+        -o../msw/wx_vc8.sln
+    </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
@@ -128,6 +128,12 @@
                formats="msvs2003prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
     </add-flags>
+    
+    <!-- Use different names for Visual C++ 2005 project files: -->
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+               formats="msvs2005prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
+    </add-flags>
 
     <!-- Makefile specific settings: -->
 
diff --git a/build/msw/wx.sln b/build/msw/wx.sln
deleted file mode 100644
index 632d7be007..0000000000
--- a/build/msw/wx.sln
+++ /dev/null
@@ -1,383 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_wxregex.vcproj", "{A838C38F-2556-5F13-B8C1-6B0938D9AA94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_wxzlib.vcproj", "{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_wxpng.vcproj", "{B8B86096-04E6-52A2-8C06-FA61EF340E55}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_wxjpeg.vcproj", "{BC765BF8-C09F-55D3-8676-57B2A8B6558F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_wxtiff.vcproj", "{B4D9642F-3122-561B-8ABE-70C0DEDC0817}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_wxexpat.vcproj", "{7241B23E-E94C-5F2A-9B5F-F13827AC9730}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_wxscintilla.vcproj", "{442230CE-5954-5824-A339-CBFB4F351E93}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_base.vcproj", "{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_net.vcproj", "{FA6EBF6E-9163-5231-B96D-2426847EF942}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_core.vcproj", "{79AF4D1E-09CA-5638-85AB-CF96E29750AC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_adv.vcproj", "{9F3781AE-672F-5189-897D-C3FA4EECE1E2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_media.vcproj", "{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_html.vcproj", "{303F9385-6314-5459-8A8C-22532F2D5D22}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_qa.vcproj", "{63058FE9-B512-547C-B614-1A181F69B0C4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_xml.vcproj", "{F1A5089D-3D48-57A6-9680-63750F72E116}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcproj", "{35B900CB-EEE7-52DA-96CF-5D723F116C0D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcproj", "{940EE321-70BB-5B17-B7D0-852D9E623A82}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_richtext.vcproj", "{54600362-028E-5941-9B79-1ABBE8958BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_stc.vcproj", "{BE7E090C-9390-5625-A023-537326B3D5D3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{442230CE-5954-5824-A339-CBFB4F351E93} = {442230CE-5954-5824-A339-CBFB4F351E93}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_gl.vcproj", "{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DLL Universal Release|Win32 = DLL Universal Release|Win32
-		DLL Universal Debug|Win32 = DLL Universal Debug|Win32
-		DLL Release|Win32 = DLL Release|Win32
-		DLL Debug|Win32 = DLL Debug|Win32
-		Universal Release|Win32 = Universal Release|Win32
-		Universal Debug|Win32 = Universal Debug|Win32
-		Release|Win32 = Release|Win32
-		Debug|Win32 = Debug|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Release|Win32.ActiveCfg = Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Release|Win32.Build.0 = Release|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A838C38F-2556-5F13-B8C1-6B0938D9AA94}.Debug|Win32.Build.0 = Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Release|Win32.ActiveCfg = Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Release|Win32.Build.0 = Release|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}.Debug|Win32.Build.0 = Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Release|Win32.ActiveCfg = Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Release|Win32.Build.0 = Release|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B8B86096-04E6-52A2-8C06-FA61EF340E55}.Debug|Win32.Build.0 = Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Release|Win32.ActiveCfg = Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Release|Win32.Build.0 = Release|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC765BF8-C09F-55D3-8676-57B2A8B6558F}.Debug|Win32.Build.0 = Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Release|Win32.ActiveCfg = Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Release|Win32.Build.0 = Release|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4D9642F-3122-561B-8ABE-70C0DEDC0817}.Debug|Win32.Build.0 = Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Release|Win32.ActiveCfg = Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Release|Win32.Build.0 = Release|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7241B23E-E94C-5F2A-9B5F-F13827AC9730}.Debug|Win32.Build.0 = Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Release|Win32.ActiveCfg = Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Release|Win32.Build.0 = Release|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442230CE-5954-5824-A339-CBFB4F351E93}.Debug|Win32.Build.0 = Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Release|Win32.ActiveCfg = Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Release|Win32.Build.0 = Release|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}.Debug|Win32.Build.0 = Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Release|Win32.ActiveCfg = Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Release|Win32.Build.0 = Release|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA6EBF6E-9163-5231-B96D-2426847EF942}.Debug|Win32.Build.0 = Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Release|Win32.ActiveCfg = Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Release|Win32.Build.0 = Release|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{79AF4D1E-09CA-5638-85AB-CF96E29750AC}.Debug|Win32.Build.0 = Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Release|Win32.ActiveCfg = Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Release|Win32.Build.0 = Release|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F3781AE-672F-5189-897D-C3FA4EECE1E2}.Debug|Win32.Build.0 = Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Release|Win32.ActiveCfg = Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Release|Win32.Build.0 = Release|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}.Debug|Win32.Build.0 = Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Release|Win32.ActiveCfg = Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Release|Win32.Build.0 = Release|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Debug|Win32.ActiveCfg = Debug|Win32
-		{303F9385-6314-5459-8A8C-22532F2D5D22}.Debug|Win32.Build.0 = Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Release|Win32.ActiveCfg = Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Release|Win32.Build.0 = Release|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{63058FE9-B512-547C-B614-1A181F69B0C4}.Debug|Win32.Build.0 = Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Release|Win32.ActiveCfg = Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Release|Win32.Build.0 = Release|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F1A5089D-3D48-57A6-9680-63750F72E116}.Debug|Win32.Build.0 = Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Release|Win32.ActiveCfg = Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Release|Win32.Build.0 = Release|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{35B900CB-EEE7-52DA-96CF-5D723F116C0D}.Debug|Win32.Build.0 = Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Release|Win32.ActiveCfg = Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Release|Win32.Build.0 = Release|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{940EE321-70BB-5B17-B7D0-852D9E623A82}.Debug|Win32.Build.0 = Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Release|Win32.Build.0 = Release|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{54600362-028E-5941-9B79-1ABBE8958BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Release|Win32.ActiveCfg = Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Release|Win32.Build.0 = Release|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE7E090C-9390-5625-A023-537326B3D5D3}.Debug|Win32.Build.0 = Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Release|Win32.ActiveCfg = Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Release|Win32.Build.0 = Release|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}.Debug|Win32.Build.0 = Debug|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-
diff --git a/build/msw/wx_vc8.sln b/build/msw/wx_vc8.sln
new file mode 100644
index 0000000000..0a49e46e94
--- /dev/null
+++ b/build/msw/wx_vc8.sln
@@ -0,0 +1,383 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc8_wxregex.vcproj", "{078F4E39-D258-54B5-B1B1-4905D10E06DC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc8_wxzlib.vcproj", "{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc8_wxpng.vcproj", "{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc8_wxjpeg.vcproj", "{4BDDC25D-2967-5450-8439-107D28E7B5D7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc8_wxtiff.vcproj", "{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc8_wxexpat.vcproj", "{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc8_wxscintilla.vcproj", "{CC1B3044-403C-53A2-8AA5-821F7A99A29F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc8_base.vcproj", "{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc8_net.vcproj", "{C752F044-0E49-5C21-818F-751B327B35AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc8_core.vcproj", "{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc8_adv.vcproj", "{2764E632-B514-5EEE-BD94-23BCF6FC2A92}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc8_media.vcproj", "{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc8_html.vcproj", "{32B18CFE-19C8-5F72-9759-CE03A314A875}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc8_qa.vcproj", "{6EA54780-4728-5F04-A501-3B3F4538874C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc8_xml.vcproj", "{CD477539-2983-5490-B8C4-DC72B2760FFF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc8_xrc.vcproj", "{5802720D-A6B1-5E95-AFF3-B80CFE03431B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc8_aui.vcproj", "{B361C000-79E7-5B8A-8F5F-BC0168C7002E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc8_richtext.vcproj", "{4928FA3B-C258-5E39-AE05-E4BD709955B3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc8_stc.vcproj", "{FA559111-7B08-54E7-BD3B-0B621C819C78}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F} = {CC1B3044-403C-53A2-8AA5-821F7A99A29F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc8_gl.vcproj", "{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		DLL Universal Release|Win32 = DLL Universal Release|Win32
+		DLL Universal Debug|Win32 = DLL Universal Debug|Win32
+		DLL Release|Win32 = DLL Release|Win32
+		DLL Debug|Win32 = DLL Debug|Win32
+		Universal Release|Win32 = Universal Release|Win32
+		Universal Debug|Win32 = Universal Debug|Win32
+		Release|Win32 = Release|Win32
+		Debug|Win32 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.ActiveCfg = Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.Build.0 = Release|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.Build.0 = Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.ActiveCfg = Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.Build.0 = Release|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.ActiveCfg = Debug|Win32
+		{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.Build.0 = Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.Build.0 = Release|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.Build.0 = Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.ActiveCfg = Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.Build.0 = Release|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.Build.0 = Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.ActiveCfg = Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.Build.0 = Release|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.Build.0 = Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.ActiveCfg = Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.Build.0 = Release|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.Build.0 = Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.ActiveCfg = Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.Build.0 = Release|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.Build.0 = Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.ActiveCfg = Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.Build.0 = Release|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.Build.0 = Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.ActiveCfg = Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.Build.0 = Release|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.Build.0 = Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.ActiveCfg = Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.Build.0 = Release|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.Build.0 = Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.ActiveCfg = Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.Build.0 = Release|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.Build.0 = Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.ActiveCfg = Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.Build.0 = Release|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.Build.0 = Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.ActiveCfg = Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.Build.0 = Release|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.ActiveCfg = Debug|Win32
+		{32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.Build.0 = Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.ActiveCfg = Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.Build.0 = Release|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.Build.0 = Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.ActiveCfg = Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.Build.0 = Release|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.Build.0 = Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.ActiveCfg = Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.Build.0 = Release|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.Build.0 = Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.ActiveCfg = Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.Build.0 = Release|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.Build.0 = Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.ActiveCfg = Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.Build.0 = Release|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.Build.0 = Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.ActiveCfg = Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.Build.0 = Release|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.Build.0 = Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.ActiveCfg = Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.Build.0 = Release|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
+
diff --git a/build/msw/wx_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
similarity index 95%
rename from build/msw/wx_adv.vcproj
rename to build/msw/wx_vc8_adv.vcproj
index 39e83d981a..a07a1e7e21 100644
--- a/build/msw/wx_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="adv"
-	ProjectGUID="{9F3781AE-672F-5189-897D-C3FA4EECE1E2}"
+	ProjectGUID="{2764E632-B514-5EEE-BD94-23BCF6FC2A92}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_adv.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_adv.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
similarity index 95%
rename from build/msw/wx_aui.vcproj
rename to build/msw/wx_vc8_aui.vcproj
index 0f900b608f..829575a96c 100644
--- a/build/msw/wx_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="aui"
-	ProjectGUID="{940EE321-70BB-5B17-B7D0-852D9E623A82}"
+	ProjectGUID="{B361C000-79E7-5B8A-8F5F-BC0168C7002E}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_aui.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_aui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_base.vcproj b/build/msw/wx_vc8_base.vcproj
similarity index 95%
rename from build/msw/wx_base.vcproj
rename to build/msw/wx_vc8_base.vcproj
index 3abc1a4ce0..2e8b411ada 100644
--- a/build/msw/wx_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="base"
-	ProjectGUID="{DCE3A9E8-BEC4-5370-A92C-7A632F0A3837}"
+	ProjectGUID="{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_base.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_base.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_base.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_base.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_core.vcproj b/build/msw/wx_vc8_core.vcproj
similarity index 95%
rename from build/msw/wx_core.vcproj
rename to build/msw/wx_vc8_core.vcproj
index ee5bbefdff..a83dfff6fb 100644
--- a/build/msw/wx_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="core"
-	ProjectGUID="{79AF4D1E-09CA-5638-85AB-CF96E29750AC}"
+	ProjectGUID="{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
similarity index 95%
rename from build/msw/wx_gl.vcproj
rename to build/msw/wx_vc8_gl.vcproj
index 1633089d40..be99037dd9 100644
--- a/build/msw/wx_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="gl"
-	ProjectGUID="{C1419AE5-EDDE-5969-AEA0-6B46BC48FAEE}"
+	ProjectGUID="{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_gl.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_html.vcproj b/build/msw/wx_vc8_html.vcproj
similarity index 95%
rename from build/msw/wx_html.vcproj
rename to build/msw/wx_vc8_html.vcproj
index d8f4494324..f042da8ce6 100644
--- a/build/msw/wx_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="html"
-	ProjectGUID="{303F9385-6314-5459-8A8C-22532F2D5D22}"
+	ProjectGUID="{32B18CFE-19C8-5F72-9759-CE03A314A875}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_html.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_html.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_html.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_html.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_html.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_html.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_html.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_html.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_media.vcproj b/build/msw/wx_vc8_media.vcproj
similarity index 95%
rename from build/msw/wx_media.vcproj
rename to build/msw/wx_vc8_media.vcproj
index 9a0ee52c7b..d02fa95b3f 100644
--- a/build/msw/wx_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="media"
-	ProjectGUID="{7C8F6994-B40F-54A7-ABBA-0EF4059A202E}"
+	ProjectGUID="{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_media.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_media.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_media.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_media.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_media.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_media.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_media.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_media.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_media.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_net.vcproj b/build/msw/wx_vc8_net.vcproj
similarity index 95%
rename from build/msw/wx_net.vcproj
rename to build/msw/wx_vc8_net.vcproj
index 9873caaad5..eef9d782dd 100644
--- a/build/msw/wx_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="net"
-	ProjectGUID="{FA6EBF6E-9163-5231-B96D-2426847EF942}"
+	ProjectGUID="{C752F044-0E49-5C21-818F-751B327B35AA}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_net.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_net.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_net.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_net.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_net.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_net.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_net.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_net.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_net.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
similarity index 95%
rename from build/msw/wx_qa.vcproj
rename to build/msw/wx_vc8_qa.vcproj
index 067fe80548..e19235695e 100644
--- a/build/msw/wx_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="qa"
-	ProjectGUID="{63058FE9-B512-547C-B614-1A181F69B0C4}"
+	ProjectGUID="{6EA54780-4728-5F04-A501-3B3F4538874C}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_qa.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_qa.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
similarity index 95%
rename from build/msw/wx_richtext.vcproj
rename to build/msw/wx_vc8_richtext.vcproj
index 9001ed5b02..a5e60c878c 100644
--- a/build/msw/wx_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="richtext"
-	ProjectGUID="{54600362-028E-5941-9B79-1ABBE8958BF8}"
+	ProjectGUID="{4928FA3B-C258-5E39-AE05-E4BD709955B3}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_richtext.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
similarity index 95%
rename from build/msw/wx_stc.vcproj
rename to build/msw/wx_vc8_stc.vcproj
index f40866da87..e0c42f3686 100644
--- a/build/msw/wx_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="stc"
-	ProjectGUID="{BE7E090C-9390-5625-A023-537326B3D5D3}"
+	ProjectGUID="{FA559111-7B08-54E7-BD3B-0B621C819C78}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_stc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_stc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj
similarity index 92%
rename from build/msw/wx_wxexpat.vcproj
rename to build/msw/wx_vc8_wxexpat.vcproj
index b2c0144e6e..c00b842aed 100644
--- a/build/msw/wx_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxexpat"
-	ProjectGUID="{7241B23E-E94C-5F2A-9B5F-F13827AC9730}"
+	ProjectGUID="{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj
similarity index 93%
rename from build/msw/wx_wxjpeg.vcproj
rename to build/msw/wx_vc8_wxjpeg.vcproj
index 936fff1d71..e819ea2c93 100644
--- a/build/msw/wx_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxjpeg"
-	ProjectGUID="{BC765BF8-C09F-55D3-8676-57B2A8B6558F}"
+	ProjectGUID="{4BDDC25D-2967-5450-8439-107D28E7B5D7}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxjpeg.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj
similarity index 92%
rename from build/msw/wx_wxpng.vcproj
rename to build/msw/wx_vc8_wxpng.vcproj
index da341f2260..50c4937a31 100644
--- a/build/msw/wx_wxpng.vcproj
+++ b/build/msw/wx_vc8_wxpng.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxpng"
-	ProjectGUID="{B8B86096-04E6-52A2-8C06-FA61EF340E55}"
+	ProjectGUID="{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxpng.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxpng.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj
similarity index 94%
rename from build/msw/wx_wxregex.vcproj
rename to build/msw/wx_vc8_wxregex.vcproj
index 60d80606b1..b257b20c9d 100644
--- a/build/msw/wx_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxregex"
-	ProjectGUID="{A838C38F-2556-5F13-B8C1-6B0938D9AA94}"
+	ProjectGUID="{078F4E39-D258-54B5-B1B1-4905D10E06DC}"
 	>
 	<Platforms>
 		<Platform
@@ -90,7 +90,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -169,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -248,7 +248,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -406,7 +406,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -485,7 +485,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -564,7 +564,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -643,7 +643,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
similarity index 93%
rename from build/msw/wx_wxscintilla.vcproj
rename to build/msw/wx_vc8_wxscintilla.vcproj
index 9ebe0f0e96..5a19fd6ee9 100644
--- a/build/msw/wx_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxscintilla"
-	ProjectGUID="{442230CE-5954-5824-A339-CBFB4F351E93}"
+	ProjectGUID="{CC1B3044-403C-53A2-8AA5-821F7A99A29F}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxscintilla.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
similarity index 93%
rename from build/msw/wx_wxtiff.vcproj
rename to build/msw/wx_vc8_wxtiff.vcproj
index 8b10d942c8..db76bf6c22 100644
--- a/build/msw/wx_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxtiff"
-	ProjectGUID="{B4D9642F-3122-561B-8ABE-70C0DEDC0817}"
+	ProjectGUID="{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxtiff.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxtiff.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj
similarity index 92%
rename from build/msw/wx_wxzlib.vcproj
rename to build/msw/wx_vc8_wxzlib.vcproj
index ab4a5e359c..f4d5b55310 100644
--- a/build/msw/wx_wxzlib.vcproj
+++ b/build/msw/wx_vc8_wxzlib.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wxzlib"
-	ProjectGUID="{BBD158B4-DD7E-5F19-A495-E4ABAFE10158}"
+	ProjectGUID="{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}"
 	>
 	<Platforms>
 		<Platform
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -245,7 +245,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +635,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_wxzlib.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxzlib.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
similarity index 95%
rename from build/msw/wx_xml.vcproj
rename to build/msw/wx_vc8_xml.vcproj
index bc2c1a4fc6..207f1de465 100644
--- a/build/msw/wx_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="xml"
-	ProjectGUID="{F1A5089D-3D48-57A6-9680-63750F72E116}"
+	ProjectGUID="{CD477539-2983-5490-B8C4-DC72B2760FFF}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xml.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xml.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/build/msw/wx_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
similarity index 95%
rename from build/msw/wx_xrc.vcproj
rename to build/msw/wx_vc8_xrc.vcproj
index 85037981ab..66e819e653 100644
--- a/build/msw/wx_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -10,7 +10,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="xrc"
-	ProjectGUID="{35B900CB-EEE7-52DA-96CF-5D723F116C0D}"
+	ProjectGUID="{5802720D-A6B1-5E95-AFF3-B80CFE03431B}"
 	>
 	<Platforms>
 		<Platform
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -284,7 +284,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -457,7 +457,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -539,7 +539,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -703,7 +703,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_xrc.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_xrc.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool