moved the check for correct implementation of wxEvent::Clone() to a unit test from...

[wxWidgets.git] / tests / test_vc9_printfbench.vcproj

diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj
index 292019552d43e4ca6476352a81f203e1c2a12f69..f076ccfca99abe0456ac6eb26748151d17f41b89 100644 (file)
--- a/tests/test_vc9_printfbench.vcproj
+++ b/tests/test_vc9_printfbench.vcproj
@@ -22,9 +22,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,25 +44,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -72,9 +69,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -82,14 +79,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -104,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -118,9 +115,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\printfbench"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -140,23 +137,24 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -166,9 +164,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -176,14 +174,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswu\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -198,7 +196,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -212,9 +210,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\printfbench"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -234,25 +232,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -262,9 +257,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -272,14 +267,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivud\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -294,7 +289,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswudll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -308,9 +303,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\printfbench"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,23 +325,24 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -356,9 +352,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -366,14 +362,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivu\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -388,7 +384,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -402,9 +398,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\printfbench"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -424,25 +420,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -452,9 +445,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -462,14 +455,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -484,7 +477,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -498,9 +491,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\printfbench"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -520,23 +513,24 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -546,9 +540,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -556,14 +550,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -578,7 +572,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -592,9 +586,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -614,25 +608,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswu\printfbench\"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -642,9 +633,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -652,14 +643,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -674,7 +665,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswu\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -688,9 +679,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -710,23 +701,24 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswud\printfbench\"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -736,9 +728,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -746,14 +738,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -768,7 +760,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswud\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -795,7 +787,7 @@
                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -803,7 +795,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -811,7 +803,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -819,7 +811,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -827,7 +819,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -835,7 +827,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -843,7 +835,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -851,7 +843,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r