X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c39058f631b3a53682f00807a60bfff6c5aa2b7c..8e63b7b8ea9cb46870ab4d26e29c3d4c3b3b99a8:/tests/test_vc9_printfbench.vcproj

diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj
index 18405dd943..f076ccfca9 100644
--- a/tests/test_vc9_printfbench.vcproj
+++ b/tests/test_vc9_printfbench.vcproj
@@ -2,7 +2,7 @@
 <!--
 
   This makefile was generated by
-  Bakefile 0.2.4 (http://www.bakefile.org)
+  Bakefile 0.2.5 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -23,8 +23,8 @@
 	<Configurations>
 		<Configuration
 			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc9_mswunivudll"
-			IntermediateDirectory="vc9_mswunivudll\printfbench"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -49,17 +49,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswunivudll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswunivudll\printfbench\"
-				ObjectFile="vc9_mswunivudll\printfbench\"
-				ProgramDataBaseFileName="vc9_mswunivudll\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswunivudll\printfbench\"
+				ObjectFile="vc_mswunivudll\printfbench\"
+				ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -71,7 +71,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -79,14 +79,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswunivudll\printfbench.exe"
+				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivudll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswunivudll\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -101,7 +101,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswunivudll\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -116,8 +116,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc9_mswunivuddll"
-			IntermediateDirectory="vc9_mswunivuddll\printfbench"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -142,19 +142,19 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswunivuddll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswunivuddll\printfbench\"
-				ObjectFile="vc9_mswunivuddll\printfbench\"
-				ProgramDataBaseFileName="vc9_mswunivuddll\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswunivuddll\printfbench\"
+				ObjectFile="vc_mswunivuddll\printfbench\"
+				ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -166,7 +166,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -174,14 +174,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswunivuddll\printfbench.exe"
+				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivuddll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswunivuddll\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -196,7 +196,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswunivuddll\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -211,8 +211,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|Win32"
-			OutputDirectory="vc9_mswudll"
-			IntermediateDirectory="vc9_mswudll\printfbench"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -237,17 +237,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswudll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswudll\printfbench\"
-				ObjectFile="vc9_mswudll\printfbench\"
-				ProgramDataBaseFileName="vc9_mswudll\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswudll\printfbench\"
+				ObjectFile="vc_mswudll\printfbench\"
+				ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -259,7 +259,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -267,14 +267,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswudll\printfbench.exe"
+				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswudll\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswudll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -289,7 +289,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswudll\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswudll\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -304,8 +304,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
-			OutputDirectory="vc9_mswuddll"
-			IntermediateDirectory="vc9_mswuddll\printfbench"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -330,19 +330,19 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswuddll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswuddll\printfbench\"
-				ObjectFile="vc9_mswuddll\printfbench\"
-				ProgramDataBaseFileName="vc9_mswuddll\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswuddll\printfbench\"
+				ObjectFile="vc_mswuddll\printfbench\"
+				ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -354,7 +354,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -362,14 +362,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswuddll\printfbench.exe"
+				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswuddll\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -384,7 +384,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswuddll\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -399,8 +399,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
-			OutputDirectory="vc9_mswunivu"
-			IntermediateDirectory="vc9_mswunivu\printfbench"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -425,17 +425,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswunivu\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswunivu\printfbench\"
-				ObjectFile="vc9_mswunivu\printfbench\"
-				ProgramDataBaseFileName="vc9_mswunivu\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswunivu\printfbench\"
+				ObjectFile="vc_mswunivu\printfbench\"
+				ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -447,7 +447,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -455,14 +455,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswunivu\printfbench.exe"
+				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivu\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswunivu\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -477,7 +477,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswunivu\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -492,8 +492,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
-			OutputDirectory="vc9_mswunivud"
-			IntermediateDirectory="vc9_mswunivud\printfbench"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -518,19 +518,19 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswunivud\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswunivud\printfbench\"
-				ObjectFile="vc9_mswunivud\printfbench\"
-				ProgramDataBaseFileName="vc9_mswunivud\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswunivud\printfbench\"
+				ObjectFile="vc_mswunivud\printfbench\"
+				ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -542,7 +542,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -550,14 +550,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswunivud\printfbench.exe"
+				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivud\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswunivud\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -572,7 +572,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswunivud\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -587,8 +587,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc9_mswu"
-			IntermediateDirectory="vc9_mswu\printfbench"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -613,17 +613,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswu\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswu\printfbench\"
-				ObjectFile="vc9_mswu\printfbench\"
-				ProgramDataBaseFileName="vc9_mswu\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswu\printfbench\"
+				ObjectFile="vc_mswu\printfbench\"
+				ProgramDataBaseFileName="vc_mswu\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -635,7 +635,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -643,14 +643,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswu\printfbench.exe"
+				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswu\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswu\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -665,7 +665,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswu\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswu\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -680,8 +680,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc9_mswud"
-			IntermediateDirectory="vc9_mswud\printfbench"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -706,19 +706,19 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc9_mswud\testprec_printfbench.pch"
-				AssemblerListingLocation="vc9_mswud\printfbench\"
-				ObjectFile="vc9_mswud\printfbench\"
-				ProgramDataBaseFileName="vc9_mswud\printfbench.pdb"
+				PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"
+				AssemblerListingLocation="vc_mswud\printfbench\"
+				ObjectFile="vc_mswud\printfbench\"
+				ProgramDataBaseFileName="vc_mswud\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -730,7 +730,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -738,14 +738,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
-				OutputFile="vc9_mswud\printfbench.exe"
+				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc9_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc9_mswud\printfbench.pdb"
+				ProgramDatabaseFile="vc_mswud\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -760,7 +760,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc9_mswud\test_vc9_printfbench.bsc"
+				OutputFile="vc_mswud\test_vc9_printfbench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool