add a wxFont test unit (currently GetFamily and the Get/SetEncoding() bits are disabl...

author Francesco Montorsi <f18m_cpp217828@yahoo.it>

Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)

committer Francesco Montorsi <f18m_cpp217828@yahoo.it>

Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)
author Francesco Montorsi <f18m_cpp217828@yahoo.it>
Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)
committer Francesco Montorsi <f18m_cpp217828@yahoo.it>
Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)
diff --git a/tests/Makefile.in b/tests/Makefile.in

index 179cdfb230ec46f8651b4d5bd06b2f1884efae65..ec21de96389869d5436537533d385236d092008f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,6 +14,7 @@ INSTALL = @INSTALL@
  EXEEXT = @EXEEXT@
  WINDRES = @WINDRES@
  SETFILE = @SETFILE@
+ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
@@ -132,6 +133,7 @@ TEST_GUI_OBJECTS =  \
         test_gui_textentrytest.o \
         test_gui_treectrltest.o \
         test_gui_propagation.o \
+       test_gui_fonttest.o \
         test_gui_rawbmp.o \
         test_gui_htmlwindow.o \
         test_gui_guifuncs.o \
@@ -169,7 +171,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_testprec_h_gch___depname)
  @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL test$(EXEEXT)
  @COND_GCC_PCH_1@__test_PCH_INC = -I./.pch/testprec_test
-@COND_ICC_PCH_1@__test_PCH_INC = -use_pch \
+@COND_ICC_PCH_1@__test_PCH_INC = $(ICC_PCH_USE_SWITCH) \
  @COND_ICC_PCH_1@       ./.pch/testprec_test/testprec.h.gch
  @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/testprec_test/testprec.h.gch
@@ -202,7 +204,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_testprec_h_gch___depname)
  @COND_TOOLKIT_COCOA@____test_gui_BUNDLE_TGT_REF_DEP = \
  @COND_TOOLKIT_COCOA@   $(__test_gui_app_Contents_PkgInfo___depname)
  @COND_GCC_PCH_1@__test_gui_PCH_INC = -I./.pch/testprec_test_gui
-@COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \
+@COND_ICC_PCH_1@__test_gui_PCH_INC = $(ICC_PCH_USE_SWITCH) \
  @COND_ICC_PCH_1@       ./.pch/testprec_test_gui/testprec.h.gch
  @COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/testprec_test_gui/testprec.h.gch
@@ -234,7 +236,8 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
  @COND_PLATFORM_MAC_1@__printfbench___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL printfbench$(EXEEXT)
  @COND_GCC_PCH_1@__printfbench_PCH_INC = -I./.pch/testprec_printfbench
-@COND_ICC_PCH_1@__printfbench_PCH_INC = -use_pch \
+@COND_ICC_PCH_1@__printfbench_PCH_INC = \
+@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
  @COND_ICC_PCH_1@       ./.pch/testprec_printfbench/testprec.h.gch
  @COND_USE_PCH_1@_____pch_testprec_printfbench_testprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/testprec_printfbench/testprec.h.gch
@@ -573,6 +576,9 @@ test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP)
  test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP)
         $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp
  
+test_gui_fonttest.o: $(srcdir)/font/fonttest.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/font/fonttest.cpp
+
  test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
         $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp
  
diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp

new file mode 100644 (file)

index 0000000..b9893e7
--- /dev/null
+++ b/tests/font/fonttest.cpp
@@ -0,0 +1,152 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/font/fonttest.cpp
+// Purpose:     wxFont unit test
+// Author:      Francesco Montorsi
+// Created:     16.3.09
+// RCS-ID:      $Id$
+// Copyright:   (c) 2009 Francesco Montorsi
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
+#if wxUSE_FONTMAP
+
+#include "wx/font.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class FontTestCase : public CppUnit::TestCase
+{
+public:
+    FontTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( FontTestCase );
+        CPPUNIT_TEST( GetSet );
+    CPPUNIT_TEST_SUITE_END();
+
+    void GetSet();
+
+    DECLARE_NO_COPY_CLASS(FontTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( FontTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FontTestCase, "FontTestCase" );
+
+
+void FontTestCase::GetSet()
+{
+    static const wxFont testfonts[] =
+    {
+        *wxNORMAL_FONT,
+        *wxSMALL_FONT,
+        *wxITALIC_FONT,
+        *wxSWISS_FONT,
+        wxFont(5, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(testfonts); n++ )
+    {
+        wxFont test(testfonts[n]);
+
+        // remember: getters can only be called when wxFont::IsOk() == true
+        CPPUNIT_ASSERT( test.IsOk() );
+
+
+        // test Get/SetFaceName()
+
+        const wxString& fn = test.GetFaceName();
+        CPPUNIT_ASSERT( !fn.empty() );
+
+        CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") );
+        CPPUNIT_ASSERT( !test.IsOk() );
+
+        CPPUNIT_ASSERT( test.SetFaceName(fn) );
+        CPPUNIT_ASSERT( test.IsOk() );
+
+
+        // test Get/SetFamily()
+
+        test.SetFamily( wxFONTFAMILY_MODERN );
+        //CPPUNIT_ASSERT_EQUAL( wxFONTFAMILY_MODERN, test.GetFamily() );
+
+        
+        // test Get/SetEncoding()
+
+        //test.SetEncoding( wxFONTENCODING_KOI8 );
+        //CPPUNIT_ASSERT_EQUAL( wxFONTENCODING_KOI8 , test.GetEncoding() );
+
+        
+        // test Get/SetNativeFontInfo
+        
+        const wxString& nid = test.GetNativeFontInfoDesc();
+        CPPUNIT_ASSERT( !nid.empty() );
+        
+        wxFont temp;
+        temp.SetNativeFontInfo(nid);
+        CPPUNIT_ASSERT( temp == test );
+        
+        
+        // test Get/SetNativeFontInfoUserDesc 
+        
+        const wxString& niud = test.GetNativeFontInfoUserDesc();
+        CPPUNIT_ASSERT( !niud.empty() );
+        
+        wxFont temp2;
+        temp2.SetNativeFontInfoUserDesc(niud);
+        CPPUNIT_ASSERT( temp2 == test );
+        
+        
+        // test Get/SetPointSize()
+        
+        test.SetPointSize(30);
+        CPPUNIT_ASSERT_EQUAL( 30, test.GetPointSize() );
+        
+        
+        // test Get/SetPixelSize()
+        
+        test.SetPixelSize(wxSize(0,30));
+        CPPUNIT_ASSERT( test.GetPixelSize().GetHeight() <= 30 );
+            // NOTE: the match found by SetPixelSize() may be not 100% precise; it
+            //       only grants that a font smaller than the required height will
+            //       be selected
+
+        
+        // test Get/SetStyle()
+        
+        test.SetStyle(wxFONTSTYLE_SLANT);
+        CPPUNIT_ASSERT_EQUAL( wxFONTSTYLE_SLANT, test.GetStyle() );
+        
+        
+        // test Get/SetUnderlined()
+        
+        test.SetUnderlined(true);
+        CPPUNIT_ASSERT_EQUAL( true, test.GetUnderlined() );
+        
+        
+        // test Get/SetWeight()
+        
+        test.SetWeight(wxFONTWEIGHT_BOLD);
+        CPPUNIT_ASSERT_EQUAL( wxFONTWEIGHT_BOLD, test.GetWeight() );
+    }
+}
+
+#endif // wxUSE_FONTMAP
diff --git a/tests/makefile.bcc b/tests/makefile.bcc

index 84cbf38be436a3d4f492255bfa42d2228c7d473f..71404d9c60da875bd5a402a9ad01055bcc8d41a0 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -118,6 +118,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textentrytest.obj \
         $(OBJS)\test_gui_treectrltest.obj \
         $(OBJS)\test_gui_propagation.obj \
+       $(OBJS)\test_gui_fonttest.obj \
         $(OBJS)\test_gui_rawbmp.obj \
         $(OBJS)\test_gui_htmlwindow.obj \
         $(OBJS)\test_gui_guifuncs.obj \
@@ -617,6 +618,9 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
  $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
         $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
  
+$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
+
  $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
         $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
  
diff --git a/tests/makefile.gcc b/tests/makefile.gcc

index 78543f77e07f7f9166f7004286d58b67f04eaaff..ccf07daafbd67c1764ca9f0171c70b1e93be1bf3 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -111,6 +111,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textentrytest.o \
         $(OBJS)\test_gui_treectrltest.o \
         $(OBJS)\test_gui_propagation.o \
+       $(OBJS)\test_gui_fonttest.o \
         $(OBJS)\test_gui_rawbmp.o \
         $(OBJS)\test_gui_htmlwindow.o \
         $(OBJS)\test_gui_guifuncs.o \
@@ -597,6 +598,9 @@ $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
  $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
         $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
  
+$(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
  $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
         $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
  
diff --git a/tests/makefile.vc b/tests/makefile.vc

index 4c764edc008e4dc6f0690241a63dfc950f0b204a..50cbae5b07c0ddf8932510abb6b76494ed8ab0ce 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -114,6 +114,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textentrytest.obj \
         $(OBJS)\test_gui_treectrltest.obj \
         $(OBJS)\test_gui_propagation.obj \
+       $(OBJS)\test_gui_fonttest.obj \
         $(OBJS)\test_gui_rawbmp.obj \
         $(OBJS)\test_gui_htmlwindow.obj \
         $(OBJS)\test_gui_guifuncs.obj \
@@ -702,6 +703,9 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
  $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
  
+$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
+
  $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
  
diff --git a/tests/makefile.wat b/tests/makefile.wat

index c2df59bd00d3f9f625d34a20c383876a5bfdba36..1667a4bd656319092fcffdeb27db809d8dca8ae4 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -18,7 +18,11 @@
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
  !  loaddll wlink    wlink
+! endif
  !  loaddll wlib     wlibd
  !endif
  
@@ -345,6 +349,7 @@ TEST_GUI_OBJECTS =  &
         $(OBJS)\test_gui_textentrytest.obj &
         $(OBJS)\test_gui_treectrltest.obj &
         $(OBJS)\test_gui_propagation.obj &
+       $(OBJS)\test_gui_fonttest.obj &
         $(OBJS)\test_gui_rawbmp.obj &
         $(OBJS)\test_gui_htmlwindow.obj &
         $(OBJS)\test_gui_guifuncs.obj &
@@ -654,6 +659,9 @@ $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp
  $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
  
+$(OBJS)\test_gui_fonttest.obj :  .AUTODEPEND .\font\fonttest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
  $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
  
diff --git a/tests/test.bkl b/tests/test.bkl

index e5de212e0a5739fcdea6dd63442fde8a6c392cad..3cb355ce2bc37260de70841da131040731ed0ef5 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -115,6 +115,7 @@
              controls/textentrytest.cpp
              controls/treectrltest.cpp
              events/propagation.cpp
+            font/fonttest.cpp
              image/rawbmp.cpp
              html/htmlwindow.cpp
              misc/guifuncs.cpp
diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp

index 28eb179fe374318fefaa364b649d1329256630bc..3596361d32d39950b4b646fb632e5aeb7baf1207 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -253,6 +253,10 @@ SOURCE=.\dummy.cpp
  # End Source File\r
  # Begin Source File\r
  \r
+SOURCE=.\font\fonttest.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=.\misc\garbage.cpp\r
  # End Source File\r
  # Begin Source File\r
diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj

index ca4442cb3154ba824b9a79e47e406c74cb81a9f8..e924b9de65f16d7a750a2145006b6da2f0545ee0 100644 (file)
--- a/tests/test_vc7_printfbench.vcproj
+++ b/tests/test_vc7_printfbench.vcproj
@@ -17,27 +17,29 @@
         </Platforms>\r
         <Configurations>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -47,17 +49,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -66,9 +70,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -81,30 +85,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,17 +114,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +135,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +150,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -178,17 +182,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +203,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -212,30 +218,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -245,17 +247,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,9 +268,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -279,27 +283,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -309,17 +315,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -328,9 +336,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -343,30 +351,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -376,17 +380,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -395,9 +401,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -410,27 +416,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -440,17 +448,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -459,9 +469,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -474,30 +484,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\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
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -507,17 +513,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -526,9 +534,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -552,49 +560,49 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj

index aa0bfc57a56f218190754f317ca944d49676347e..17c607c6d4a5cec316b1f87cfc71c67bdfe5c33c 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -17,27 +17,29 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -47,17 +49,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -66,9 +70,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -81,30 +85,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,17 +114,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +135,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +150,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -178,17 +182,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +203,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -212,30 +218,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -245,17 +247,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,9 +268,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -279,27 +283,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -309,17 +315,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -328,9 +336,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -343,30 +351,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -376,17 +380,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -395,9 +401,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -410,27 +416,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -440,17 +448,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswu\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -459,9 +469,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -474,30 +484,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -507,17 +513,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswud\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\test.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -526,9 +534,9 @@
                                 Name="VCPreLinkEventTool"/>\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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -582,49 +590,49 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj

index ea1232cfab01ee1a313fa1ac3762fdde6acf77e7..f07e10727e309b350c60b4b5cff60e500d28ce84 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -17,27 +17,29 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -47,17 +49,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -66,9 +70,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -81,30 +85,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,17 +114,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +135,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +150,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -178,17 +182,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +203,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -212,30 +218,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -245,17 +247,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,9 +268,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -279,27 +283,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -309,17 +315,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -328,9 +336,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -343,30 +351,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -376,17 +380,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -395,9 +401,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -410,27 +416,29 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -440,17 +448,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -459,9 +469,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -474,30 +484,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -507,17 +513,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -526,9 +534,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -561,54 +569,57 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\font\fonttest.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\misc\garbage.cpp">\r
                         </File>\r
@@ -666,7 +677,7 @@
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
-                               RelativePath=".\..\samples\sample.rc">\r
+                               RelativePath="..\samples\sample.rc">\r
                         </File>\r
                 </Filter>\r
         </Files>\r
diff --git a/tests/test_vc8_printfbench.vcproj b/tests/test_vc8_printfbench.vcproj

index c74a8c5852879159b332e9116d9c48a0c783747f..e180c7f2c16292fea6606a2e3a176e75b27c4550 100644 (file)
--- a/tests/test_vc8_printfbench.vcproj
+++ b/tests/test_vc8_printfbench.vcproj
@@ -22,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\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
@@ -44,21 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -69,9 +73,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
@@ -79,14 +83,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
@@ -101,7 +105,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswud\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -118,9 +122,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
@@ -140,24 +144,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -168,9 +170,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
@@ -178,14 +180,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
@@ -200,7 +202,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswu\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -217,9 +219,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
@@ -239,21 +241,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -264,9 +270,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
@@ -274,14 +280,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
@@ -296,7 +302,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -313,9 +319,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
@@ -335,24 +341,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -363,9 +367,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
@@ -373,14 +377,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
@@ -395,7 +399,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -412,9 +416,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
@@ -434,21 +438,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -459,9 +467,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
@@ -469,14 +477,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
@@ -491,7 +499,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -508,9 +516,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
@@ -530,24 +538,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -558,9 +564,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
@@ -568,14 +574,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
@@ -590,7 +596,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswudll\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -607,9 +613,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
@@ -629,21 +635,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -654,9 +664,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
@@ -664,14 +674,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
@@ -686,7 +696,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -703,9 +713,9 @@
                         />\r
                 </Configuration>\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
@@ -725,24 +735,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -753,9 +761,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
@@ -763,14 +771,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
@@ -785,7 +793,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc8_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -815,7 +823,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -823,7 +831,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -831,7 +839,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -839,7 +847,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -847,7 +855,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -855,7 +863,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -863,7 +871,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -871,7 +879,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj

index 109894c1fa3e5133bd40a764d0dc2667a847895f..767c9162ead14c249d3084c2bf59af67283831e6 100644 (file)
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -22,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,21 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -69,9 +73,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
@@ -79,14 +83,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -101,7 +105,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswud\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -118,9 +122,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -140,24 +144,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -168,9 +170,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
@@ -178,14 +180,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -200,7 +202,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswu\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -217,9 +219,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -239,21 +241,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -264,9 +270,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
@@ -274,14 +280,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -296,7 +302,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -313,9 +319,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -335,24 +341,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -363,9 +367,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
@@ -373,14 +377,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -395,7 +399,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -412,9 +416,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -434,21 +438,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -459,9 +467,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
@@ -469,14 +477,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -491,7 +499,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -508,9 +516,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -530,24 +538,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -558,9 +564,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
@@ -568,14 +574,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -590,7 +596,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswudll\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -607,9 +613,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -629,21 +635,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\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_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -654,9 +664,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
@@ -664,14 +674,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswu\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -686,7 +696,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -703,9 +713,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -725,24 +735,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -753,9 +761,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
@@ -763,14 +771,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswud\test.exe"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\test.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\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -785,7 +793,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc8_test.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -855,7 +863,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -863,7 +871,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -871,7 +879,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -879,7 +887,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -887,7 +895,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -895,7 +903,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -903,7 +911,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -911,7 +919,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj

index f5a15dd0f4a8b98fdee9980fc4ed33f8f3c059bf..7bbcdd57e5ced01c9d4a84a35bb0ebb1f3094be6 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -22,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,21 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -69,9 +73,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -79,14 +83,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -101,7 +105,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswud\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -118,9 +122,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -140,24 +144,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -168,9 +170,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -178,14 +180,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -200,7 +202,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswu\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -217,9 +219,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -239,21 +241,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -264,9 +270,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -274,14 +280,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -296,7 +302,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -313,9 +319,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -335,24 +341,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -363,9 +367,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -373,14 +377,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -395,7 +399,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -412,9 +416,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -434,21 +438,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -459,9 +467,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -469,14 +477,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -491,7 +499,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -508,9 +516,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -530,24 +538,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -558,9 +564,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -568,14 +574,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -590,7 +596,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswudll\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -607,9 +613,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -629,21 +635,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -654,9 +664,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -664,14 +674,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -686,7 +696,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -703,9 +713,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -725,24 +735,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -753,9 +761,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -763,14 +771,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -785,7 +793,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc8_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -827,7 +835,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -835,7 +843,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -843,7 +851,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -851,7 +859,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -859,7 +867,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -867,7 +875,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -875,7 +883,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -883,7 +891,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -891,6 +899,10 @@
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\font\fonttest.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\misc\garbage.cpp"\r
                                 >\r
@@ -966,7 +978,7 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
-                               RelativePath=".\..\samples\sample.rc"\r
+                               RelativePath="..\samples\sample.rc"\r
                                 >\r
                         </File>\r
                 </Filter>\r
diff --git a/tests/test_vc9.sln b/tests/test_vc9.sln

index 9e0828656618da7d77cafb1f575a6f3fc73fe598..d4163d361650664ad9ccd9398a876f5bae3178c4 100644 (file)
--- a/tests/test_vc9.sln
+++ b/tests/test_vc9.sln
@@ -8,64 +8,64 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printfbench", "test_vc9_pri
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
-               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
-               DLL Release|Win32 = DLL Release|Win32\r
-               DLL Debug|Win32 = DLL Debug|Win32\r
-               Universal Release|Win32 = Universal Release|Win32\r
-               Universal Debug|Win32 = Universal Debug|Win32\r
-               Release|Win32 = Release|Win32\r
                 Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+               Universal Debug|Win32 = Universal Debug|Win32\r
+               Universal Release|Win32 = Universal Release|Win32\r
+               DLL Debug|Win32 = DLL Debug|Win32\r
+               DLL Release|Win32 = DLL Release|Win32\r
+               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
+               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32\r
                 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.Build.0 = Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32\r
-               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32\r
-               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.Build.0 = Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj

index f076ccfca99abe0456ac6eb26748151d17f41b89..292019552d43e4ca6476352a81f203e1c2a12f69 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="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
@@ -44,22 +44,25 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_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
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -69,9 +72,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
@@ -79,14 +82,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
@@ -101,7 +104,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
@@ -115,9 +118,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
@@ -137,24 +140,23 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -164,9 +166,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
@@ -174,14 +176,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
@@ -196,7 +198,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
@@ -210,9 +212,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
@@ -232,22 +234,25 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_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
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -257,9 +262,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
@@ -267,14 +272,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
@@ -289,7 +294,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
@@ -303,9 +308,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
@@ -325,24 +330,23 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -352,9 +356,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
@@ -362,14 +366,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
@@ -384,7 +388,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
@@ -398,9 +402,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
@@ -420,22 +424,25 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_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
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -445,9 +452,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
@@ -455,14 +462,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
@@ -477,7 +484,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
@@ -491,9 +498,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
@@ -513,24 +520,23 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -540,9 +546,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
@@ -550,14 +556,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
@@ -572,7 +578,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
@@ -586,9 +592,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
@@ -608,22 +614,25 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_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
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -633,9 +642,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
@@ -643,14 +652,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
@@ -665,7 +674,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
@@ -679,9 +688,9 @@
                         />\r
                 </Configuration>\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
@@ -701,24 +710,23 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__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
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -728,9 +736,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
@@ -738,14 +746,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
@@ -760,7 +768,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
@@ -787,7 +795,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -795,7 +803,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -803,7 +811,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -811,7 +819,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -819,7 +827,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -827,7 +835,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -835,7 +843,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -843,7 +851,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj

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

index 31c7de222e4b57385b00b293ced962bbc512a850..fc37d8460b12388f226dfd1894b1b1a293cfd4e4 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -22,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,22 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -69,9 +72,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -79,14 +82,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -101,7 +104,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -115,9 +118,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -137,24 +140,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -164,9 +166,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -174,14 +176,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -196,7 +198,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -210,9 +212,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -232,22 +234,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -257,9 +262,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -267,14 +272,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -289,7 +294,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -303,9 +308,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -325,24 +330,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -352,9 +356,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -362,14 +366,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -384,7 +388,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -398,9 +402,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -420,22 +424,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -445,9 +452,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -455,14 +462,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -477,7 +484,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -491,9 +498,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -513,24 +520,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -540,9 +546,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -550,14 +556,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -572,7 +578,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -586,9 +592,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -608,22 +614,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -633,9 +642,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -643,14 +652,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -665,7 +674,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -679,9 +688,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -701,24 +710,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -728,9 +736,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -738,14 +746,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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\test_gui.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\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -760,7 +768,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -799,7 +807,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -807,7 +815,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -815,7 +823,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -823,7 +831,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -831,7 +839,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -839,7 +847,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -847,7 +855,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -855,7 +863,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -863,6 +871,10 @@
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\font\fonttest.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\misc\garbage.cpp"\r
                                 >\r
@@ -938,7 +950,7 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
-                               RelativePath=".\..\samples\sample.rc"\r
+                               RelativePath="..\samples\sample.rc"\r
                                 >\r
                         </File>\r
                 </Filter>\r
author	Francesco Montorsi <f18m_cpp217828@yahoo.it>
	Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)
committer	Francesco Montorsi <f18m_cpp217828@yahoo.it>
	Wed, 18 Mar 2009 15:32:28 +0000 (15:32 +0000)
tests/Makefile.in		patch \| blob \| blame \| history
tests/font/fonttest.cpp	[new file with mode: 0644]	patch \| blob
tests/makefile.bcc		patch \| blob \| blame \| history
tests/makefile.gcc		patch \| blob \| blame \| history
tests/makefile.vc		patch \| blob \| blame \| history
tests/makefile.wat		patch \| blob \| blame \| history
tests/test.bkl		patch \| blob \| blame \| history
tests/test_test_gui.dsp		patch \| blob \| blame \| history
tests/test_vc7_printfbench.vcproj		patch \| blob \| blame \| history
tests/test_vc7_test.vcproj		patch \| blob \| blame \| history
tests/test_vc7_test_gui.vcproj		patch \| blob \| blame \| history
tests/test_vc8_printfbench.vcproj		patch \| blob \| blame \| history
tests/test_vc8_test.vcproj		patch \| blob \| blame \| history
tests/test_vc8_test_gui.vcproj		patch \| blob \| blame \| history
tests/test_vc9.sln		patch \| blob \| blame \| history
tests/test_vc9_printfbench.vcproj		patch \| blob \| blame \| history
tests/test_vc9_test.vcproj		patch \| blob \| blame \| history
tests/test_vc9_test_gui.vcproj		patch \| blob \| blame \| history