diff --git a/tests/test.vcxproj b/tests/test.vcxproj
index c49a85e77e..3866634f34 100644
--- a/tests/test.vcxproj
+++ b/tests/test.vcxproj
@@ -165,6 +165,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -205,6 +208,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
     <Midl>
@@ -245,6 +251,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
     <Midl>
@@ -285,6 +294,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -325,6 +337,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -365,6 +380,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
     <Midl>
@@ -405,6 +423,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
     <Midl>
@@ -445,6 +466,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="any\anytest.cpp" />
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index 7afb1d3269..32e455cf88 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -164,6 +164,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -204,6 +207,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
     <Midl>
@@ -244,6 +250,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
     <Midl>
@@ -284,6 +293,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -324,6 +336,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -364,6 +379,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
     <Midl>
@@ -404,6 +422,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
     <Midl>
@@ -444,6 +465,9 @@
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="asserthelper.cpp" />
diff --git a/tests/test_gui_vc10.sln b/tests/test_gui_vc10.sln
index 139d995449..b547bb0bfe 100644
--- a/tests/test_gui_vc10.sln
+++ b/tests/test_gui_vc10.sln
@@ -37,28 +37,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DLL Debug|Win32 = DLL Debug|Win32
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|Win32 = DLL Release|Win32
 		DLL Release|x64 = DLL Release|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -71,18 +59,10 @@ Global
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -95,18 +75,10 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,18 +91,10 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,18 +107,10 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -167,18 +123,10 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -191,18 +139,10 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -215,18 +155,10 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -239,18 +171,10 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -263,22 +187,10 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -291,26 +203,10 @@ Global
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,14 +219,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64
diff --git a/tests/test_gui_vc11.sln b/tests/test_gui_vc11.sln
index 1f92cda795..9b343f3b70 100644
--- a/tests/test_gui_vc11.sln
+++ b/tests/test_gui_vc11.sln
@@ -37,28 +37,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DLL Debug|Win32 = DLL Debug|Win32
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|Win32 = DLL Release|Win32
 		DLL Release|x64 = DLL Release|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -71,18 +59,10 @@ Global
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -95,18 +75,10 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,18 +91,10 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,18 +107,10 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -167,18 +123,10 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -191,18 +139,10 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -215,18 +155,10 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -239,18 +171,10 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -263,22 +187,10 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -291,26 +203,10 @@ Global
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,14 +219,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64
diff --git a/tests/test_gui_vc12.sln b/tests/test_gui_vc12.sln
index 6afcc8f3d8..cc9e841d61 100644
--- a/tests/test_gui_vc12.sln
+++ b/tests/test_gui_vc12.sln
@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DLL Debug|Win32 = DLL Debug|Win32
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|Win32 = DLL Release|Win32
 		DLL Release|x64 = DLL Release|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64
diff --git a/tests/test_gui_vc14.sln b/tests/test_gui_vc14.sln
index ff74fbcc99..700978687e 100644
--- a/tests/test_gui_vc14.sln
+++ b/tests/test_gui_vc14.sln
@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DLL Debug|Win32 = DLL Debug|Win32
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|Win32 = DLL Release|Win32
 		DLL Release|x64 = DLL Release|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64
diff --git a/tests/test_gui_vc15.sln b/tests/test_gui_vc15.sln
index b294ecc14c..a733fff840 100644
--- a/tests/test_gui_vc15.sln
+++ b/tests/test_gui_vc15.sln
@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DLL Debug|Win32 = DLL Debug|Win32
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|Win32 = DLL Release|Win32
 		DLL Release|x64 = DLL Release|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
 		{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
-		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64