Use arch suffix consistently in all directories names

For some reason, we used "vc_x64_lib" as the output directory for the libraries, but "vc_mswu_x64" as the output directory for the samples. Place the arch suffix, i.e. "_x64" part, always after the compiler prefix (possibly including version), for consistency with both the library output directories and with MSBuild project files, as build/msw/wx_setup.props uses $(wxCompilerPrefix)$(wxArchSuffix)_... as wxIntRootDir value.
2021-08-26 23:12:40 +02:00
parent 91ae4e2f8a
commit 5216d97f08
417 changed files with 7779 additions and 7779 deletions
--- a/tests/benchmarks/bench_vc8_bench.vcproj
+++ b/tests/benchmarks/bench_vc8_bench.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench.pdb"
+				ObjectFile="vc_x64_mswud\bench\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench.exe"
+				OutputFile="vc_x64_mswud\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench.pdb"
+				ObjectFile="vc_x64_mswu\bench\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench.exe"
+				OutputFile="vc_x64_mswu\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswuddll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench.exe"
+				OutputFile="vc_x64_mswuddll\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswudll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench.exe"
+				OutputFile="vc_x64_mswudll\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/bench_vc8_bench_graphics.vcproj
+++ b/tests/benchmarks/bench_vc8_bench_graphics.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswud\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswud\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswu\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswu\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswuddll\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswudll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswudll\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/bench_vc8_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc8_bench_gui.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswud\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswud\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswu\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswu\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswuddll\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswudll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswudll\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/bench_vc9_bench.vcproj
+++ b/tests/benchmarks/bench_vc9_bench.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench.pdb"
+				ObjectFile="vc_x64_mswud\bench\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench.exe"
+				OutputFile="vc_x64_mswud\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench.pdb"
+				ObjectFile="vc_x64_mswu\bench\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench.exe"
+				OutputFile="vc_x64_mswu\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswuddll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench.exe"
+				OutputFile="vc_x64_mswuddll\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswudll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench.exe"
+				OutputFile="vc_x64_mswudll\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/bench_vc9_bench_graphics.vcproj
+++ b/tests/benchmarks/bench_vc9_bench_graphics.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswud\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswud\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswu\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswu\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswuddll\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswudll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswudll\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/bench_vc9_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc9_bench_gui.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswud\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswud\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswu\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswu\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswuddll\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswudll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswudll\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test.pch"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test.pch"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test.pch"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test.pch"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test.pch"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test.pch"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test.pch"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test.pch"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc8_test_allheaders.vcproj
+++ b/tests/test_vc8_test_allheaders.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswud_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswud\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswud\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswu_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswu\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswu\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswuddll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswuddll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswuddll\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswudll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswudll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswudll\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc8_test_drawing.vcproj
+++ b/tests/test_vc8_test_drawing.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswud_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswud\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswud\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswu_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswu\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswu\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswuddll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswuddll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswuddll\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswudll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswudll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswudll\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc8_test_drawingplugin.vcproj
+++ b/tests/test_vc8_test_drawingplugin.vcproj
@@ -205,8 +205,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -240,8 +240,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswuddll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswuddll\test_drawingplugin.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawingplugin.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -283,7 +283,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -295,8 +295,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -327,8 +327,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswudll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswudll\test_drawingplugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawingplugin.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -372,7 +372,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswud_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswud\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_gui.exe"
+				OutputFile="vc_x64_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswu_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_gui.exe"
+				OutputFile="vc_x64_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswuddll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswuddll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswudll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test.pch"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test.pch"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test.pch"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test.pch"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test.pch"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test.pch"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.lib    wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test.pch"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test.pch"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.lib    wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc9_test_allheaders.vcproj
+++ b/tests/test_vc9_test_allheaders.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswud_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswud\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswud\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswu_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswu\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswu\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswuddll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswuddll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswuddll\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswudll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswudll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswudll\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc9_test_drawing.vcproj
+++ b/tests/test_vc9_test_drawing.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswud_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswud\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswud\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswu_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswu\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswu\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswuddll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswuddll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswuddll\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswudll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswudll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswudll\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc9_test_drawingplugin.vcproj
+++ b/tests/test_vc9_test_drawingplugin.vcproj
@@ -204,8 +204,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -239,8 +239,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswuddll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -261,13 +261,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswuddll\test_drawingplugin.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawingplugin.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -281,7 +281,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -293,8 +293,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -326,8 +326,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswudll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -348,13 +348,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswudll\test_drawingplugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawingplugin.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -370,7 +370,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswud_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswud\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_gui.exe"
+				OutputFile="vc_x64_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswu_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_gui.exe"
+				OutputFile="vc_x64_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswuddll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswuddll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswudll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool