X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7ce668e1db4471bf59049571be288233b1322f3..17beda75ef9780ebef5044e41889a9b598dcf186:/tests/test_vc7_test.vcproj

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 63fdfa8701..5a0bd705a8 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,238 +17,139 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc_mswunivudll"
-			IntermediateDirectory="vc_mswunivudll\test"
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"
-				AssemblerListingLocation="vc_mswunivudll\test\"
-				ObjectFile="vc_mswunivudll\test\"
-				ProgramDataBaseFileName="vc_mswunivudll\test.pdb"
+				PrecompiledHeaderFile="vc_mswud\testprec_test.pch"
+				ObjectFile="vc_mswud\test\"
+				ProgramDataBaseFileName="vc_mswud\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivudll\test.exe"
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud_xml.lib  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\test.exe"
 				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswud\test.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivudll\test.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
-			<Tool
-				Name="VCAppVerifierTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc_mswunivuddll"
-			IntermediateDirectory="vc_mswunivuddll\test"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"
-				AssemblerListingLocation="vc_mswunivuddll\test\"
-				ObjectFile="vc_mswunivuddll\test\"
-				ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="vc_mswunivuddll\test.exe"
-				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivuddll\test.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\test"
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"
-				AssemblerListingLocation="vc_mswudll\test\"
-				ObjectFile="vc_mswudll\test\"
-				ProgramDataBaseFileName="vc_mswudll\test.pdb"
+				PrecompiledHeaderFile="vc_mswu\testprec_test.pch"
+				ObjectFile="vc_mswu\test\"
+				ProgramDataBaseFileName="vc_mswu\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswudll\test.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  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\test.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswu\test.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\test.pdb"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
@@ -256,389 +157,134 @@
 			IntermediateDirectory="vc_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"
-				AssemblerListingLocation="vc_mswuddll\test\"
 				ObjectFile="vc_mswuddll\test\"
 				ProgramDataBaseFileName="vc_mswuddll\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud_xml.lib  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\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswuddll\test.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
-			<Tool
-				Name="VCAppVerifierTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\test"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"
-				AssemblerListingLocation="vc_mswunivu\test\"
-				ObjectFile="vc_mswunivu\test\"
-				ProgramDataBaseFileName="vc_mswunivu\test.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="vc_mswunivu\test.exe"
-				LinkIncremental="2"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivu\test.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
-			<Tool
-				Name="VCAppVerifierTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\test"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"
-				AssemblerListingLocation="vc_mswunivud\test\"
-				ObjectFile="vc_mswunivud\test\"
-				ProgramDataBaseFileName="vc_mswunivud\test.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="vc_mswunivud\test.exe"
-				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivud\test.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\test"
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu\testprec_test.pch"
-				AssemblerListingLocation="vc_mswu\test\"
-				ObjectFile="vc_mswu\test\"
-				ProgramDataBaseFileName="vc_mswu\test.pdb"
+				PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"
+				ObjectFile="vc_mswudll\test\"
+				ProgramDataBaseFileName="vc_mswudll\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswu\test.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  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\test.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswudll\test.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu\test.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCFxCopTool"/>
-			<Tool
-				Name="VCAppVerifierTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\test"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud\testprec_test.pch"
-				AssemblerListingLocation="vc_mswud\test\"
-				ObjectFile="vc_mswud\test\"
-				ProgramDataBaseFileName="vc_mswud\test.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="vc_mswud\test.exe"
-				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud\test.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -647,44 +293,54 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\archive\archivetest.cpp"/>
+				RelativePath=".\any\anytest.cpp">
+			</File>
 			<File
-				RelativePath=".\arrays\arrays.cpp"/>
+				RelativePath=".\archive\archivetest.cpp">
+			</File>
 			<File
-				RelativePath=".\thread\atomic.cpp"/>
+				RelativePath=".\arrays\arrays.cpp">
+			</File>
 			<File
-				RelativePath=".\base64\base64.cpp"/>
+				RelativePath=".\thread\atomic.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\bstream.cpp"/>
+				RelativePath=".\base64\base64.cpp">
+			</File>
 			<File
-				RelativePath=".\cmdline\cmdlinetest.cpp"/>
+				RelativePath=".\streams\bstream.cpp">
+			</File>
 			<File
-				RelativePath=".\mbconv\convautotest.cpp"/>
+				RelativePath=".\cmdline\cmdlinetest.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\crt.cpp"/>
+				RelativePath=".\mbconv\convautotest.cpp">
+			</File>
+			<File
+				RelativePath=".\strings\crt.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\datastreamtest.cpp"/>
+				RelativePath=".\streams\datastreamtest.cpp">
+			</File>
 			<File
-				RelativePath=".\datetime\datetimetest.cpp"/>
+				RelativePath=".\datetime\datetimetest.cpp">
+			</File>
+			<File
+				RelativePath=".\file\dir.cpp">
+			</File>
 			<File
 				RelativePath=".\dummy.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
@@ -696,120 +352,225 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\weakref\evtconnection.cpp"/>
+				RelativePath=".\misc\dynamiclib.cpp">
+			</File>
+			<File
+				RelativePath=".\misc\environ.cpp">
+			</File>
+			<File
+				RelativePath=".\weakref\evtconnection.cpp">
+			</File>
+			<File
+				RelativePath=".\events\evthandler.cpp">
+			</File>
+			<File
+				RelativePath=".\events\evtsource.cpp">
+			</File>
+			<File
+				RelativePath=".\exec\exec.cpp">
+			</File>
+			<File
+				RelativePath=".\streams\ffilestream.cpp">
+			</File>
+			<File
+				RelativePath=".\streams\fileback.cpp">
+			</File>
+			<File
+				RelativePath=".\config\fileconf.cpp">
+			</File>
+			<File
+				RelativePath=".\file\filefn.cpp">
+			</File>
+			<File
+				RelativePath=".\filekind\filekind.cpp">
+			</File>
+			<File
+				RelativePath=".\filename\filenametest.cpp">
+			</File>
+			<File
+				RelativePath=".\streams\filestream.cpp">
+			</File>
+			<File
+				RelativePath=".\filesys\filesystest.cpp">
+			</File>
+			<File
+				RelativePath=".\file\filetest.cpp">
+			</File>
+			<File
+				RelativePath=".\fontmap\fontmaptest.cpp">
+			</File>
+			<File
+				RelativePath=".\formatconverter\formatconvertertest.cpp">
+			</File>
+			<File
+				RelativePath=".\fswatcher\fswatchertest.cpp">
+			</File>
+			<File
+				RelativePath=".\uris\ftp.cpp">
+			</File>
+			<File
+				RelativePath=".\hashes\hashes.cpp">
+			</File>
+			<File
+				RelativePath=".\interactive\input.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\ffilestream.cpp"/>
+				RelativePath=".\intl\intltest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\fileback.cpp"/>
+				RelativePath=".\strings\iostream.cpp">
+			</File>
 			<File
-				RelativePath=".\config\fileconf.cpp"/>
+				RelativePath=".\streams\iostreams.cpp">
+			</File>
 			<File
-				RelativePath=".\filekind\filekind.cpp"/>
+				RelativePath=".\net\ipc.cpp">
+			</File>
 			<File
-				RelativePath=".\filename\filenametest.cpp"/>
+				RelativePath=".\streams\largefile.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\filestream.cpp"/>
+				RelativePath=".\lists\lists.cpp">
+			</File>
 			<File
-				RelativePath=".\filesys\filesystest.cpp"/>
+				RelativePath=".\log\logtest.cpp">
+			</File>
 			<File
-				RelativePath=".\fontmap\fontmaptest.cpp"/>
+				RelativePath=".\longlong\longlongtest.cpp">
+			</File>
 			<File
-				RelativePath=".\formatconverter\formatconvertertest.cpp"/>
+				RelativePath=".\mbconv\mbconvtest.cpp">
+			</File>
 			<File
-				RelativePath=".\hashes\hashes.cpp"/>
+				RelativePath=".\streams\memstream.cpp">
+			</File>
 			<File
-				RelativePath=".\intl\intltest.cpp"/>
+				RelativePath=".\misc\metatest.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\iostream.cpp"/>
+				RelativePath=".\thread\misc.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\iostreams.cpp"/>
+				RelativePath=".\misc\misctests.cpp">
+			</File>
 			<File
-				RelativePath=".\net\ipc.cpp"/>
+				RelativePath=".\misc\module.cpp">
+			</File>
+			<File
+				RelativePath=".\strings\numformatter.cpp">
+			</File>
+			<File
+				RelativePath=".\interactive\output.cpp">
+			</File>
+			<File
+				RelativePath=".\misc\pathlist.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\largefile.cpp"/>
+				RelativePath=".\thread\queue.cpp">
+			</File>
+			<File
+				RelativePath=".\config\regconf.cpp">
+			</File>
+			<File
+				RelativePath=".\regex\regextest.cpp">
+			</File>
+			<File
+				RelativePath=".\scopeguard\scopeguardtest.cpp">
+			</File>
 			<File
-				RelativePath=".\lists\lists.cpp"/>
+				RelativePath=".\net\socket.cpp">
+			</File>
 			<File
-				RelativePath=".\longlong\longlongtest.cpp"/>
+				RelativePath=".\streams\socketstream.cpp">
+			</File>
 			<File
-				RelativePath=".\mbconv\mbconvtest.cpp"/>
+				RelativePath=".\streams\sstream.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\memstream.cpp"/>
+				RelativePath=".\streams\stdstream.cpp">
+			</File>
 			<File
-				RelativePath=".\thread\queue.cpp"/>
+				RelativePath=".\strings\stdstrings.cpp">
+			</File>
 			<File
-				RelativePath=".\regex\regextest.cpp"/>
+				RelativePath=".\events\stopwatch.cpp">
+			</File>
 			<File
-				RelativePath=".\scopeguard\scopeguardtest.cpp"/>
+				RelativePath=".\strings\strings.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\socketstream.cpp"/>
+				RelativePath=".\archive\tartest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\sstream.cpp"/>
+				RelativePath=".\streams\tempfile.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\stdstrings.cpp"/>
+				RelativePath=".\test.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\strings.cpp"/>
+				RelativePath=".\textfile\textfiletest.cpp">
+			</File>
 			<File
-				RelativePath=".\archive\tartest.cpp"/>
+				RelativePath=".\streams\textstreamtest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\tempfile.cpp"/>
+				RelativePath=".\events\timertest.cpp">
+			</File>
 			<File
-				RelativePath=".\test.cpp"/>
+				RelativePath=".\thread\tls.cpp">
+			</File>
 			<File
-				RelativePath=".\textfile\textfiletest.cpp"/>
+				RelativePath=".\strings\tokenizer.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\textstreamtest.cpp"/>
+				RelativePath=".\misc\typeinfotest.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\tokenizer.cpp"/>
+				RelativePath=".\strings\unichar.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\unichar.cpp"/>
+				RelativePath=".\strings\unicode.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\unicode.cpp"/>
+				RelativePath=".\uris\uris.cpp">
+			</File>
 			<File
-				RelativePath=".\uris\uris.cpp"/>
+				RelativePath=".\uris\url.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\vararg.cpp"/>
+				RelativePath=".\strings\vararg.cpp">
+			</File>
 			<File
-				RelativePath=".\vectors\vectors.cpp"/>
+				RelativePath=".\vectors\vectors.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\vsnprintf.cpp"/>
+				RelativePath=".\strings\vsnprintf.cpp">
+			</File>
 			<File
-				RelativePath=".\weakref\weakref.cpp"/>
+				RelativePath=".\weakref\weakref.cpp">
+			</File>
 			<File
-				RelativePath=".\regex\wxregextest.cpp"/>
+				RelativePath=".\regex\wxregextest.cpp">
+			</File>
 			<File
-				RelativePath=".\xlocale\xlocale.cpp"/>
+				RelativePath=".\xlocale\xlocale.cpp">
+			</File>
 			<File
-				RelativePath=".\xml\xmltest.cpp"/>
+				RelativePath=".\xml\xmltest.cpp">
+			</File>
 			<File
-				RelativePath=".\archive\ziptest.cpp"/>
+				RelativePath=".\archive\ziptest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\zlibstream.cpp"/>
+				RelativePath=".\streams\zlibstream.cpp">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>