X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c39058f631b3a53682f00807a60bfff6c5aa2b7c..76e2b5703a0b8ae2f7210526defd2a07e3b81e0d:/tests/test_vc8_test.vcproj

diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 20d6e9d5c4..109894c1fa 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.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="vc8_mswunivudll"
-			IntermediateDirectory="vc8_mswunivudll\test"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -48,17 +48,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc8_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="vc8_mswunivudll\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswunivudll\test\"
-				ObjectFile="vc8_mswunivudll\test\"
-				ProgramDataBaseFileName="vc8_mswunivudll\test.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"
+				AssemblerListingLocation="vc_mswunivudll\test\"
+				ObjectFile="vc_mswunivudll\test\"
+				ProgramDataBaseFileName="vc_mswunivudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -71,7 +71,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -79,14 +79,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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="vc8_mswunivudll\test.exe"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswunivudll\test.pdb"
+				ProgramDatabaseFile="vc_mswunivudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -101,7 +101,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswunivudll\test_vc8_test.bsc"
+				OutputFile="vc_mswunivudll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc8_mswunivuddll"
-			IntermediateDirectory="vc8_mswunivuddll\test"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -152,12 +152,12 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc8_mswunivuddll\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswunivuddll\test\"
-				ObjectFile="vc8_mswunivuddll\test\"
-				ProgramDataBaseFileName="vc8_mswunivuddll\test.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"
+				AssemblerListingLocation="vc_mswunivuddll\test\"
+				ObjectFile="vc_mswunivuddll\test\"
+				ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -170,7 +170,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -178,14 +178,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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="vc8_mswunivuddll\test.exe"
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswunivuddll\test.pdb"
+				ProgramDatabaseFile="vc_mswunivuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -200,7 +200,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswunivuddll\test_vc8_test.bsc"
+				OutputFile="vc_mswunivuddll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -218,8 +218,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|Win32"
-			OutputDirectory="vc8_mswudll"
-			IntermediateDirectory="vc8_mswudll\test"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -243,17 +243,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc8_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="vc8_mswudll\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswudll\test\"
-				ObjectFile="vc8_mswudll\test\"
-				ProgramDataBaseFileName="vc8_mswudll\test.pdb"
+				PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"
+				AssemblerListingLocation="vc_mswudll\test\"
+				ObjectFile="vc_mswudll\test\"
+				ProgramDataBaseFileName="vc_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -266,7 +266,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -274,14 +274,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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="vc8_mswudll\test.exe"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswudll\test.pdb"
+				ProgramDatabaseFile="vc_mswudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -296,7 +296,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswudll\test_vc8_test.bsc"
+				OutputFile="vc_mswudll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -314,8 +314,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
-			OutputDirectory="vc8_mswuddll"
-			IntermediateDirectory="vc8_mswuddll\test"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -339,7 +339,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -347,12 +347,12 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc8_mswuddll\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswuddll\test\"
-				ObjectFile="vc8_mswuddll\test\"
-				ProgramDataBaseFileName="vc8_mswuddll\test.pdb"
+				PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"
+				AssemblerListingLocation="vc_mswuddll\test\"
+				ObjectFile="vc_mswuddll\test\"
+				ProgramDataBaseFileName="vc_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -365,7 +365,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -373,14 +373,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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="vc8_mswuddll\test.exe"
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswuddll\test.pdb"
+				ProgramDatabaseFile="vc_mswuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -395,7 +395,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswuddll\test_vc8_test.bsc"
+				OutputFile="vc_mswuddll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -413,8 +413,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
-			OutputDirectory="vc8_mswunivu"
-			IntermediateDirectory="vc8_mswunivu\test"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -438,17 +438,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc8_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="vc8_mswunivu\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswunivu\test\"
-				ObjectFile="vc8_mswunivu\test\"
-				ProgramDataBaseFileName="vc8_mswunivu\test.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"
+				AssemblerListingLocation="vc_mswunivu\test\"
+				ObjectFile="vc_mswunivu\test\"
+				ProgramDataBaseFileName="vc_mswunivu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -461,7 +461,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -469,14 +469,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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="vc8_mswunivu\test.exe"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswunivu\test.pdb"
+				ProgramDatabaseFile="vc_mswunivu\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswunivu\test_vc8_test.bsc"
+				OutputFile="vc_mswunivu\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
-			OutputDirectory="vc8_mswunivud"
-			IntermediateDirectory="vc8_mswunivud\test"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -542,12 +542,12 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc8_mswunivud\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswunivud\test\"
-				ObjectFile="vc8_mswunivud\test\"
-				ProgramDataBaseFileName="vc8_mswunivud\test.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"
+				AssemblerListingLocation="vc_mswunivud\test\"
+				ObjectFile="vc_mswunivud\test\"
+				ProgramDataBaseFileName="vc_mswunivud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -560,7 +560,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -568,14 +568,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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="vc8_mswunivud\test.exe"
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswunivud\test.pdb"
+				ProgramDatabaseFile="vc_mswunivud\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -590,7 +590,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswunivud\test_vc8_test.bsc"
+				OutputFile="vc_mswunivud\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -608,8 +608,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc8_mswu"
-			IntermediateDirectory="vc8_mswu\test"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -633,17 +633,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc8_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="vc8_mswu\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswu\test\"
-				ObjectFile="vc8_mswu\test\"
-				ProgramDataBaseFileName="vc8_mswu\test.pdb"
+				PrecompiledHeaderFile="vc_mswu\testprec_test.pch"
+				AssemblerListingLocation="vc_mswu\test\"
+				ObjectFile="vc_mswu\test\"
+				ProgramDataBaseFileName="vc_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -656,7 +656,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -664,14 +664,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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="vc8_mswu\test.exe"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswu\test.pdb"
+				ProgramDatabaseFile="vc_mswu\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -686,7 +686,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswu\test_vc8_test.bsc"
+				OutputFile="vc_mswu\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -704,8 +704,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc8_mswud"
-			IntermediateDirectory="vc8_mswud\test"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -729,7 +729,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -737,12 +737,12 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc8_mswud\testprec_test.pch"
-				AssemblerListingLocation="vc8_mswud\test\"
-				ObjectFile="vc8_mswud\test\"
-				ProgramDataBaseFileName="vc8_mswud\test.pdb"
+				PrecompiledHeaderFile="vc_mswud\testprec_test.pch"
+				AssemblerListingLocation="vc_mswud\test\"
+				ObjectFile="vc_mswud\test\"
+				ProgramDataBaseFileName="vc_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -755,7 +755,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -763,14 +763,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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="vc8_mswud\test.exe"
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc8_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc8_mswud\test.pdb"
+				ProgramDatabaseFile="vc_mswud\test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc8_mswud\test_vc8_test.bsc"
+				OutputFile="vc_mswud\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -923,6 +923,10 @@
 				RelativePath=".\weakref\evtconnection.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\events\evthandler.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\streams\ffilestream.cpp"
 				>
@@ -1055,6 +1059,10 @@
 				RelativePath=".\streams\textstreamtest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\events\timertest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\thread\tls.cpp"
 				>