X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3c11581dc3a4c7c6ab5006b73c1ece32b9ca158..9cc4ab8522ec1978be193ae11b71e5623d78a14d:/tests/test_vc7_test.vcproj

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 10744bf8cb..6dafda7a87 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)
+  Bakefile 0.2.5 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -22,32 +22,16 @@
 			IntermediateDirectory="vc_mswunivudll\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"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"
@@ -55,44 +39,46 @@
 				ObjectFile="vc_mswunivudll\test\"
 				ProgramDataBaseFileName="vc_mswunivudll\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<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   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=""
+				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="vc_mswunivudll\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswunivudll\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
@@ -100,32 +86,19 @@
 			IntermediateDirectory="vc_mswunivuddll\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\mswunivud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_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_mswunivuddll\testprec_test.pch"
@@ -133,44 +106,46 @@
 				ObjectFile="vc_mswunivuddll\test\"
 				ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29ud_net.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"
 				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="vc_mswunivuddll\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswunivuddll\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>
 			<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"
@@ -178,32 +153,16 @@
 			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_dll\mswu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"
@@ -211,44 +170,46 @@
 				ObjectFile="vc_mswudll\test\"
 				ProgramDataBaseFileName="vc_mswudll\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29u_net.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"
 				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="vc_mswudll\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswudll\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<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="VCAppVerifierTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
@@ -256,32 +217,19 @@
 			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"
+				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"
@@ -289,44 +237,46 @@
 				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   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.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="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"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
@@ -334,32 +284,16 @@
 			IntermediateDirectory="vc_mswunivu\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\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"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"
@@ -367,44 +301,46 @@
 				ObjectFile="vc_mswunivu\test\"
 				ProgramDataBaseFileName="vc_mswunivu\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29u_net.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"
 				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="vc_mswunivu\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswunivu\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
@@ -412,32 +348,19 @@
 			IntermediateDirectory="vc_mswunivud\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_lib\mswunivud;.\..\include;."
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_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_mswunivud\testprec_test.pch"
@@ -445,44 +368,46 @@
 				ObjectFile="vc_mswunivud\test\"
 				ProgramDataBaseFileName="vc_mswunivud\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29ud_net.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"
 				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="vc_mswunivud\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswunivud\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -490,32 +415,16 @@
 			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_lib\mswu;.\..\include;."
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswu\testprec_test.pch"
@@ -523,44 +432,46 @@
 				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_lib\mswu;.\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29u_net.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"
 				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="vc_mswu\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswu\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -568,32 +479,19 @@
 			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="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"
+				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_mswud\testprec_test.pch"
@@ -601,44 +499,46 @@
 				ObjectFile="vc_mswud\test\"
 				ProgramDataBaseFileName="vc_mswud\test.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase29ud_net.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"
 				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="vc_mswud\test.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswud\test.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\test_vc7_test.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -647,26 +547,38 @@
 	<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">
+			</File>
 			<File
-				RelativePath=".\archive\archivetest.cpp"/>
+				RelativePath=".\arrays\arrays.cpp">
+			</File>
 			<File
-				RelativePath=".\arrays\arrays.cpp"/>
+				RelativePath=".\thread\atomic.cpp">
+			</File>
 			<File
-				RelativePath=".\thread\atomic.cpp"/>
+				RelativePath=".\base64\base64.cpp">
+			</File>
 			<File
-				RelativePath=".\base64\base64.cpp"/>
+				RelativePath=".\streams\bstream.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\bstream.cpp"/>
+				RelativePath=".\cmdline\cmdlinetest.cpp">
+			</File>
 			<File
-				RelativePath=".\mbconv\convautotest.cpp"/>
+				RelativePath=".\mbconv\convautotest.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\crt.cpp"/>
+				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=".\dummy.cpp">
 				<FileConfiguration
@@ -719,85 +631,152 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\weakref\evtconnection.cpp"/>
+				RelativePath=".\weakref\evtconnection.cpp">
+			</File>
+			<File
+				RelativePath=".\streams\ffilestream.cpp">
+			</File>
+			<File
+				RelativePath=".\streams\fileback.cpp">
+			</File>
+			<File
+				RelativePath=".\config\fileconf.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=".\fontmap\fontmaptest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\ffilestream.cpp"/>
+				RelativePath=".\formatconverter\formatconvertertest.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\fileback.cpp"/>
+				RelativePath=".\hashes\hashes.cpp">
+			</File>
 			<File
-				RelativePath=".\config\fileconf.cpp"/>
+				RelativePath=".\intl\intltest.cpp">
+			</File>
 			<File
-				RelativePath=".\filekind\filekind.cpp"/>
+				RelativePath=".\strings\iostream.cpp">
+			</File>
 			<File
-				RelativePath=".\filename\filenametest.cpp"/>
+				RelativePath=".\streams\iostreams.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\filestream.cpp"/>
+				RelativePath=".\net\ipc.cpp">
+			</File>
 			<File
-				RelativePath=".\filesys\filesystest.cpp"/>
+				RelativePath=".\streams\largefile.cpp">
+			</File>
 			<File
-				RelativePath=".\fontmap\fontmaptest.cpp"/>
+				RelativePath=".\lists\lists.cpp">
+			</File>
 			<File
-				RelativePath=".\formatconverter\formatconvertertest.cpp"/>
+				RelativePath=".\longlong\longlongtest.cpp">
+			</File>
 			<File
-				RelativePath=".\hashes\hashes.cpp"/>
+				RelativePath=".\mbconv\mbconvtest.cpp">
+			</File>
 			<File
-				RelativePath=".\intl\intltest.cpp"/>
+				RelativePath=".\streams\memstream.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\iostream.cpp"/>
+				RelativePath=".\misc\misctests.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\largefile.cpp"/>
+				RelativePath=".\thread\queue.cpp">
+			</File>
+			<File
+				RelativePath=".\regex\regextest.cpp">
+			</File>
 			<File
-				RelativePath=".\lists\lists.cpp"/>
+				RelativePath=".\scopeguard\scopeguardtest.cpp">
+			</File>
 			<File
-				RelativePath=".\longlong\longlongtest.cpp"/>
+				RelativePath=".\net\socket.cpp">
+			</File>
 			<File
-				RelativePath=".\mbconv\mbconvtest.cpp"/>
+				RelativePath=".\streams\socketstream.cpp">
+			</File>
 			<File
-				RelativePath=".\streams\memstream.cpp"/>
+				RelativePath=".\streams\sstream.cpp">
+			</File>
 			<File
-				RelativePath=".\thread\queue.cpp"/>
+				RelativePath=".\strings\stdstrings.cpp">
+			</File>
 			<File
-				RelativePath=".\regex\regextest.cpp"/>
+				RelativePath=".\strings\strings.cpp">
+			</File>
 			<File
-				RelativePath=".\scopeguard\scopeguardtest.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=".\strings\unichar.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\tokenizer.cpp"/>
+				RelativePath=".\strings\unicode.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\unichar.cpp"/>
+				RelativePath=".\uris\uris.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\unicode.cpp"/>
+				RelativePath=".\strings\vararg.cpp">
+			</File>
 			<File
-				RelativePath=".\uris\uris.cpp"/>
+				RelativePath=".\vectors\vectors.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\vararg.cpp"/>
+				RelativePath=".\strings\vsnprintf.cpp">
+			</File>
 			<File
-				RelativePath=".\vectors\vectors.cpp"/>
+				RelativePath=".\weakref\weakref.cpp">
+			</File>
 			<File
-				RelativePath=".\strings\vsnprintf.cpp"/>
+				RelativePath=".\regex\wxregextest.cpp">
+			</File>
 			<File
-				RelativePath=".\weakref\weakref.cpp"/>
+				RelativePath=".\xlocale\xlocale.cpp">
+			</File>
 			<File
-				RelativePath=".\regex\wxregextest.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>