X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..0738b901b17340f09766524b8d9d79e9ed1268e7:/tests/test_vc9_test.vcproj diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj index 768814209f..a6a027e6b4 100644 --- a/tests/test_vc9_test.vcproj +++ b/tests/test_vc9_test.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <!-- - This makefile was generated by - Bakefile 0.2.5 (http://www.bakefile.org) + This project was generated by + Bakefile 0.2.8 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -22,9 +22,9 @@ </ToolFiles> <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" @@ -43,23 +43,26 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;." - 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" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" 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" DebugInformationFormat="3" @@ -69,9 +72,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -79,14 +82,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="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_dll" + AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivudll\test.pdb" + ProgramDatabaseFile="vc_mswud\test.pdb" SubSystem="1" TargetMachine="1" /> @@ -101,7 +104,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivudll\test_vc9_test.bsc" + OutputFile="vc_mswud\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -115,9 +118,9 @@ /> </Configuration> <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="vc_mswunivuddll" - IntermediateDirectory="vc_mswunivuddll\test" + Name="Release|Win32" + OutputDirectory="vc_mswu" + IntermediateDirectory="vc_mswu\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -136,25 +139,24 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;." - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Optimization="2" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;." + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch" - AssemblerListingLocation="vc_mswunivuddll\test\" - ObjectFile="vc_mswunivuddll\test\" - ProgramDataBaseFileName="vc_mswunivuddll\test.pdb" + PrecompiledHeaderFile="vc_mswu\testprec_test.pch" + ObjectFile="vc_mswu\test\" + ProgramDataBaseFileName="vc_mswu\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -164,9 +166,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -174,16 +176,18 @@ <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="vc_mswunivuddll\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_dll" + AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivuddll\test.pdb" + ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -196,7 +200,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivuddll\test_vc9_test.bsc" + OutputFile="vc_mswu\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -210,9 +214,9 @@ /> </Configuration> <Configuration - Name="DLL Release|Win32" - OutputDirectory="vc_mswudll" - IntermediateDirectory="vc_mswudll\test" + Name="Universal Debug|Win32" + OutputDirectory="vc_mswunivud" + IntermediateDirectory="vc_mswunivud\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -231,23 +235,26 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;." - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Optimization="0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;." + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswudll\testprec_test.pch" - AssemblerListingLocation="vc_mswudll\test\" - ObjectFile="vc_mswudll\test\" - ProgramDataBaseFileName="vc_mswudll\test.pdb" + PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch" + ObjectFile="vc_mswunivud\test\" + ProgramDataBaseFileName="vc_mswunivud\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -257,9 +264,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -267,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="vc_mswudll\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_mswunivud\test.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswudll\test.pdb" + ProgramDatabaseFile="vc_mswunivud\test.pdb" SubSystem="1" TargetMachine="1" /> @@ -289,7 +296,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswudll\test_vc9_test.bsc" + OutputFile="vc_mswunivud\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -303,9 +310,9 @@ /> </Configuration> <Configuration - Name="DLL Debug|Win32" - OutputDirectory="vc_mswuddll" - IntermediateDirectory="vc_mswuddll\test" + Name="Universal Release|Win32" + OutputDirectory="vc_mswunivu" + IntermediateDirectory="vc_mswunivu\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -324,25 +331,24 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;." - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Optimization="2" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;." + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch" - AssemblerListingLocation="vc_mswuddll\test\" - ObjectFile="vc_mswuddll\test\" - ProgramDataBaseFileName="vc_mswuddll\test.pdb" + PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch" + ObjectFile="vc_mswunivu\test\" + ProgramDataBaseFileName="vc_mswunivu\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -352,9 +358,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -362,16 +368,18 @@ <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="vc_mswuddll\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_mswunivu\test.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswuddll\test.pdb" + ProgramDatabaseFile="vc_mswunivu\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -384,7 +392,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswuddll\test_vc9_test.bsc" + OutputFile="vc_mswunivu\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -398,9 +406,9 @@ /> </Configuration> <Configuration - Name="Universal Release|Win32" - OutputDirectory="vc_mswunivu" - IntermediateDirectory="vc_mswunivu\test" + Name="DLL Debug|Win32" + OutputDirectory="vc_mswuddll" + IntermediateDirectory="vc_mswuddll\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -419,23 +427,26 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;." - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Optimization="0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;." + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch" - AssemblerListingLocation="vc_mswunivu\test\" - ObjectFile="vc_mswunivu\test\" - ProgramDataBaseFileName="vc_mswunivu\test.pdb" + PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch" + ObjectFile="vc_mswuddll\test\" + ProgramDataBaseFileName="vc_mswuddll\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -445,9 +456,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -455,14 +466,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="vc_mswunivu\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_mswuddll\test.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivu\test.pdb" + ProgramDatabaseFile="vc_mswuddll\test.pdb" SubSystem="1" TargetMachine="1" /> @@ -477,7 +488,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivu\test_vc9_test.bsc" + OutputFile="vc_mswuddll\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -491,9 +502,9 @@ /> </Configuration> <Configuration - Name="Universal Debug|Win32" - OutputDirectory="vc_mswunivud" - IntermediateDirectory="vc_mswunivud\test" + Name="DLL Release|Win32" + OutputDirectory="vc_mswudll" + IntermediateDirectory="vc_mswudll\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -512,25 +523,24 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;." - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Optimization="2" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;." + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch" - AssemblerListingLocation="vc_mswunivud\test\" - ObjectFile="vc_mswunivud\test\" - ProgramDataBaseFileName="vc_mswunivud\test.pdb" + PrecompiledHeaderFile="vc_mswudll\testprec_test.pch" + ObjectFile="vc_mswudll\test\" + ProgramDataBaseFileName="vc_mswudll\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -540,9 +550,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -550,16 +560,18 @@ <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="vc_mswunivud\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_lib" + AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivud\test.pdb" + ProgramDatabaseFile="vc_mswudll\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -572,7 +584,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivud\test_vc9_test.bsc" + OutputFile="vc_mswudll\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -586,9 +598,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="vc_mswu" - IntermediateDirectory="vc_mswu\test" + Name="DLL Universal Debug|Win32" + OutputDirectory="vc_mswunivuddll" + IntermediateDirectory="vc_mswunivuddll\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -607,23 +619,26 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;." - PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Optimization="0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;." + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswu\testprec_test.pch" - AssemblerListingLocation="vc_mswu\test\" - ObjectFile="vc_mswu\test\" - ProgramDataBaseFileName="vc_mswu\test.pdb" + PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch" + ObjectFile="vc_mswunivuddll\test\" + ProgramDataBaseFileName="vc_mswunivuddll\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -633,9 +648,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -643,14 +658,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="vc_mswu\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_mswunivuddll\test.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswu\test.pdb" + ProgramDatabaseFile="vc_mswunivuddll\test.pdb" SubSystem="1" TargetMachine="1" /> @@ -665,7 +680,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswu\test_vc9_test.bsc" + OutputFile="vc_mswunivuddll\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -679,9 +694,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="vc_mswud" - IntermediateDirectory="vc_mswud\test" + Name="DLL Universal Release|Win32" + OutputDirectory="vc_mswunivudll" + IntermediateDirectory="vc_mswunivudll\test" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -700,25 +715,24 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;." /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;." - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Optimization="2" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;." + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="testprec.h" - PrecompiledHeaderFile="vc_mswud\testprec_test.pch" - AssemblerListingLocation="vc_mswud\test\" - ObjectFile="vc_mswud\test\" - ProgramDataBaseFileName="vc_mswud\test.pdb" + PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch" + ObjectFile="vc_mswunivudll\test\" + ProgramDataBaseFileName="vc_mswunivudll\test.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -728,9 +742,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" Culture="1033" - AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;." + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;." /> <Tool Name="VCPreLinkEventTool" @@ -738,16 +752,18 @@ <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="vc_mswud\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_mswunivudll\test.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswud\test.pdb" + ProgramDatabaseFile="vc_mswunivudll\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -760,7 +776,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswud\test_vc9_test.bsc" + OutputFile="vc_mswunivudll\test_vc9_test.bsc" SuppressStartupBanner="true" /> <Tool @@ -783,6 +799,10 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > + <File + RelativePath=".\any\anytest.cpp" + > + </File> <File RelativePath=".\archive\archivetest.cpp" > @@ -827,7 +847,7 @@ RelativePath=".\dummy.cpp" > <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -835,7 +855,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -843,7 +863,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32" + Name="Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -851,7 +871,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32" + Name="Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -859,7 +879,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -867,7 +887,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -875,7 +895,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="DLL Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -883,7 +903,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -895,6 +915,18 @@ 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" > @@ -923,6 +955,10 @@ RelativePath=".\filesys\filesystest.cpp" > </File> + <File + RelativePath=".\file\filetest.cpp" + > + </File> <File RelativePath=".\fontmap\fontmaptest.cpp" > @@ -931,6 +967,10 @@ RelativePath=".\formatconverter\formatconvertertest.cpp" > </File> + <File + RelativePath=".\fswatcher\fswatchertest.cpp" + > + </File> <File RelativePath=".\hashes\hashes.cpp" > @@ -959,6 +999,10 @@ RelativePath=".\lists\lists.cpp" > </File> + <File + RelativePath=".\log\logtest.cpp" + > + </File> <File RelativePath=".\longlong\longlongtest.cpp" > @@ -999,6 +1043,10 @@ RelativePath=".\streams\sstream.cpp" > </File> + <File + RelativePath=".\streams\stdstream.cpp" + > + </File> <File RelativePath=".\strings\stdstrings.cpp" > @@ -1027,6 +1075,10 @@ RelativePath=".\streams\textstreamtest.cpp" > </File> + <File + RelativePath=".\events\timertest.cpp" + > + </File> <File RelativePath=".\thread\tls.cpp" > @@ -1047,6 +1099,10 @@ RelativePath=".\uris\uris.cpp" > </File> + <File + RelativePath=".\uris\url.cpp" + > + </File> <File RelativePath=".\strings\vararg.cpp" >