X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f8f381c0f1380986acc18e30d4b95a2571fdd7c..c39058f631b3a53682f00807a60bfff6c5aa2b7c:/tests/test_vc7_printfbench.vcproj

diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj
index 2045d6e6ea..116bee4710 100644
--- a/tests/test_vc7_printfbench.vcproj
+++ b/tests/test_vc7_printfbench.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc_mswunivudll"
-			IntermediateDirectory="vc_mswunivudll\printfbench"
+			OutputDirectory="vc7_mswunivudll"
+			IntermediateDirectory="vc7_mswunivudll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -27,17 +27,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswunivudll\printfbench\"
-				ObjectFile="vc_mswunivudll\printfbench\"
-				ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswunivudll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswunivudll\printfbench\"
+				ObjectFile="vc7_mswunivudll\printfbench\"
+				ProgramDataBaseFileName="vc7_mswunivudll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -48,12 +48,12 @@
 				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="vc_mswunivudll\printfbench.exe"
+				OutputFile="vc7_mswunivudll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc7_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswunivudll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -68,7 +68,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -82,8 +82,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc_mswunivuddll"
-			IntermediateDirectory="vc_mswunivuddll\printfbench"
+			OutputDirectory="vc7_mswunivuddll"
+			IntermediateDirectory="vc7_mswunivuddll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -91,7 +91,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -101,10 +101,10 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswunivuddll\printfbench\"
-				ObjectFile="vc_mswunivuddll\printfbench\"
-				ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswunivuddll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswunivuddll\printfbench\"
+				ObjectFile="vc7_mswunivuddll\printfbench\"
+				ProgramDataBaseFileName="vc7_mswunivuddll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -115,12 +115,12 @@
 				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="vc_mswunivuddll\printfbench.exe"
+				OutputFile="vc7_mswunivuddll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc7_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswunivuddll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -135,7 +135,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -149,8 +149,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\printfbench"
+			OutputDirectory="vc7_mswudll"
+			IntermediateDirectory="vc7_mswudll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -158,17 +158,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswudll\printfbench\"
-				ObjectFile="vc_mswudll\printfbench\"
-				ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswudll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswudll\printfbench\"
+				ObjectFile="vc7_mswudll\printfbench\"
+				ProgramDataBaseFileName="vc7_mswudll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -179,12 +179,12 @@
 				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="vc_mswudll\printfbench.exe"
+				OutputFile="vc7_mswudll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc7_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswudll\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswudll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -199,7 +199,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
-			OutputDirectory="vc_mswuddll"
-			IntermediateDirectory="vc_mswuddll\printfbench"
+			OutputDirectory="vc7_mswuddll"
+			IntermediateDirectory="vc7_mswuddll\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -222,7 +222,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -232,10 +232,10 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswuddll\printfbench\"
-				ObjectFile="vc_mswuddll\printfbench\"
-				ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswuddll\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswuddll\printfbench\"
+				ObjectFile="vc7_mswuddll\printfbench\"
+				ProgramDataBaseFileName="vc7_mswuddll\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -246,12 +246,12 @@
 				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="vc_mswuddll\printfbench.exe"
+				OutputFile="vc7_mswuddll\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc7_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswuddll\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -266,7 +266,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -280,8 +280,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\printfbench"
+			OutputDirectory="vc7_mswunivu"
+			IntermediateDirectory="vc7_mswunivu\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -289,17 +289,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswunivu\printfbench\"
-				ObjectFile="vc_mswunivu\printfbench\"
-				ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswunivu\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswunivu\printfbench\"
+				ObjectFile="vc7_mswunivu\printfbench\"
+				ProgramDataBaseFileName="vc7_mswunivu\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -310,12 +310,12 @@
 				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="vc_mswunivu\printfbench.exe"
+				OutputFile="vc7_mswunivu\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc7_lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswunivu\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -330,7 +330,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -344,8 +344,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\printfbench"
+			OutputDirectory="vc7_mswunivud"
+			IntermediateDirectory="vc7_mswunivud\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -353,7 +353,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -363,10 +363,10 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswunivud\printfbench\"
-				ObjectFile="vc_mswunivud\printfbench\"
-				ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswunivud\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswunivud\printfbench\"
+				ObjectFile="vc7_mswunivud\printfbench\"
+				ProgramDataBaseFileName="vc7_mswunivud\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -377,12 +377,12 @@
 				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="vc_mswunivud\printfbench.exe"
+				OutputFile="vc7_mswunivud\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc7_lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswunivud\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -397,7 +397,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -411,8 +411,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\printfbench"
+			OutputDirectory="vc7_mswu"
+			IntermediateDirectory="vc7_mswu\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -420,17 +420,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswu\printfbench\"
-				ObjectFile="vc_mswu\printfbench\"
-				ProgramDataBaseFileName="vc_mswu\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswu\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswu\printfbench\"
+				ObjectFile="vc7_mswu\printfbench\"
+				ProgramDataBaseFileName="vc7_mswu\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -441,12 +441,12 @@
 				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="vc_mswu\printfbench.exe"
+				OutputFile="vc7_mswu\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc7_lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswu\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswu\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -461,7 +461,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -475,8 +475,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\printfbench"
+			OutputDirectory="vc7_mswud"
+			IntermediateDirectory="vc7_mswud\printfbench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -484,7 +484,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -494,10 +494,10 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"
-				AssemblerListingLocation="vc_mswud\printfbench\"
-				ObjectFile="vc_mswud\printfbench\"
-				ProgramDataBaseFileName="vc_mswud\printfbench.pdb"
+				PrecompiledHeaderFile="vc7_mswud\testprec_printfbench.pch"
+				AssemblerListingLocation="vc7_mswud\printfbench\"
+				ObjectFile="vc7_mswud\printfbench\"
+				ProgramDataBaseFileName="vc7_mswud\printfbench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -508,12 +508,12 @@
 				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="vc_mswud\printfbench.exe"
+				OutputFile="vc7_mswud\printfbench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc7_lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswud\printfbench.pdb"
+				ProgramDatabaseFile="vc7_mswud\printfbench.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -528,7 +528,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool