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

author Vadim Zeitlin <vadim@wxwidgets.org>

Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)
diff --git a/src/common/init.cpp b/src/common/init.cpp

index a183c256f21c3af6120e9a1e9aab1d909d2aa504..6e9f06fad8a1dcd7b421e93e14546abd43f621c2 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -252,44 +252,6 @@ static bool DoCommonPostInit()
          return false;
      }
  
-#if defined(__WXDEBUG__)
-    // check if event classes implement Clone() correctly
-    // NOTE: the check is done against _all_ event classes which are linked to
-    //       the executable currently running, which are not necessarily all
-    //       wxWidgets event classes.
-    const wxClassInfo *ci = wxClassInfo::GetFirst();
-    for (; ci; ci = ci->GetNext())
-    {
-        // is this class derived from wxEvent?
-        if (!ci->IsKindOf(CLASSINFO(wxEvent)) || wxString(ci->GetClassName()) == "wxEvent")
-            continue;
-
-        if (!ci->IsDynamic())
-        {
-            wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
-                         ci->GetClassName());
-            continue;
-        }
-
-        // yes; test if it implements Clone() correctly
-        wxEvent* test = wxDynamicCast(ci->CreateObject(),wxEvent);
-        if (test == NULL)
-        {
-            wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
-                         ci->GetClassName());
-            continue;
-        }
-
-        wxEvent* cloned = test->Clone();
-        if (!cloned || cloned->GetClassInfo() != ci)
-            wxLogWarning("The event class '%s' does not correctly implement Clone()!",
-                         ci->GetClassName());
-
-        delete cloned;
-        delete test;
-    }
-#endif
-
      return true;
  }
  
diff --git a/tests/Makefile.in b/tests/Makefile.in

index ec21de96389869d5436537533d385236d092008f..dc430291e10e504f1edc20044e750028cabfe46a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,7 +14,6 @@ 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 +131,7 @@ TEST_GUI_OBJECTS =  \
         test_gui_textctrltest.o \
         test_gui_textentrytest.o \
         test_gui_treectrltest.o \
+       test_gui_clone.o \
         test_gui_propagation.o \
         test_gui_fonttest.o \
         test_gui_rawbmp.o \
@@ -171,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 = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@__test_PCH_INC = -use_pch \
  @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
@@ -204,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 = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \
  @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
@@ -236,8 +236,7 @@ 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 = \
-@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@__printfbench_PCH_INC = -use_pch \
  @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 +572,9 @@ test_gui_textentrytest.o: $(srcdir)/controls/textentrytest.cpp $(TEST_GUI_ODEP)
  test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP)
         $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/treectrltest.cpp
  
+test_gui_clone.o: $(srcdir)/events/clone.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/clone.cpp
+
  test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP)
         $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp
  
diff --git a/tests/events/clone.cpp b/tests/events/clone.cpp

new file mode 100644 (file)

index 0000000..450294f
--- /dev/null
+++ b/tests/events/clone.cpp
@@ -0,0 +1,80 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/events/clone.cpp
+// Purpose:     Test wxEvent::Clone() implementation by all event classes
+// Author:      Vadim Zeitlin, based on the code by Francesco Montorsi
+// Created:     2009-03-22
+// RCS-ID:      $Id$
+// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+#endif // WX_PRECOMP
+
+// --------------------------------------------------------------------------
+// test class
+// --------------------------------------------------------------------------
+
+class EventCloneTestCase : public CppUnit::TestCase
+{
+public:
+    EventCloneTestCase() {}
+
+private:
+    CPPUNIT_TEST_SUITE( EventCloneTestCase );
+        CPPUNIT_TEST( CheckAll );
+    CPPUNIT_TEST_SUITE_END();
+
+    void CheckAll();
+
+    DECLARE_NO_COPY_CLASS(EventCloneTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( EventCloneTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventCloneTestCase, "EventCloneTestCase" );
+
+void EventCloneTestCase::CheckAll()
+{
+    // check if event classes implement Clone() correctly
+    // NOTE: the check is done against _all_ event classes which are linked to
+    //       the executable currently running, which are not necessarily all
+    //       wxWidgets event classes.
+    const wxClassInfo *ci = wxClassInfo::GetFirst();
+    for (; ci; ci = ci->GetNext())
+    {
+        // is this class derived from wxEvent?
+        if ( !ci->IsKindOf(CLASSINFO(wxEvent)) ||
+                wxString(ci->GetClassName()) == "wxEvent" )
+            continue;
+
+        const std::string
+            msg = std::string("Event class \"") + ci->GetClassName() + "\"";
+
+        CPPUNIT_ASSERT_MESSAGE( msg, ci->IsDynamic() );
+
+        wxEvent * const test = wxDynamicCast(ci->CreateObject(),wxEvent);
+        CPPUNIT_ASSERT_MESSAGE( msg, test );
+
+        wxEvent * const cloned = test->Clone();
+        delete test;
+
+        CPPUNIT_ASSERT_MESSAGE( msg, cloned );
+        CPPUNIT_ASSERT_MESSAGE( msg, cloned->GetClassInfo() == ci );
+
+        delete cloned;
+    }
+}
+
diff --git a/tests/makefile.bcc b/tests/makefile.bcc

index 71404d9c60da875bd5a402a9ad01055bcc8d41a0..838c2bbd9b19322bdb4d0da3212f493857ce4dad 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -117,6 +117,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textctrltest.obj \
         $(OBJS)\test_gui_textentrytest.obj \
         $(OBJS)\test_gui_treectrltest.obj \
+       $(OBJS)\test_gui_clone.obj \
         $(OBJS)\test_gui_propagation.obj \
         $(OBJS)\test_gui_fonttest.obj \
         $(OBJS)\test_gui_rawbmp.obj \
@@ -615,6 +616,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
  $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
         $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
  
+$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
+
  $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
         $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
  
diff --git a/tests/makefile.gcc b/tests/makefile.gcc

index ccf07daafbd67c1764ca9f0171c70b1e93be1bf3..82e1597bf38deefed95590af070bb741307d18d7 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -110,6 +110,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textctrltest.o \
         $(OBJS)\test_gui_textentrytest.o \
         $(OBJS)\test_gui_treectrltest.o \
+       $(OBJS)\test_gui_clone.o \
         $(OBJS)\test_gui_propagation.o \
         $(OBJS)\test_gui_fonttest.o \
         $(OBJS)\test_gui_rawbmp.o \
@@ -595,6 +596,9 @@ $(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
  $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
         $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
  
+$(OBJS)\test_gui_clone.o: ./events/clone.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
  $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
         $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
  
diff --git a/tests/makefile.vc b/tests/makefile.vc

index 50cbae5b07c0ddf8932510abb6b76494ed8ab0ce..1e12ccadbacaa492161ee32319bb19d65a8121e4 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -113,6 +113,7 @@ TEST_GUI_OBJECTS =  \
         $(OBJS)\test_gui_textctrltest.obj \
         $(OBJS)\test_gui_textentrytest.obj \
         $(OBJS)\test_gui_treectrltest.obj \
+       $(OBJS)\test_gui_clone.obj \
         $(OBJS)\test_gui_propagation.obj \
         $(OBJS)\test_gui_fonttest.obj \
         $(OBJS)\test_gui_rawbmp.obj \
@@ -700,6 +701,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
  $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
  
+$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
+
  $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
  
diff --git a/tests/makefile.wat b/tests/makefile.wat

index 1667a4bd656319092fcffdeb27db809d8dca8ae4..2272436a31683823a363dc7ec718050c2869a5a6 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -18,11 +18,7 @@
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
-! if $(__VERSION__) >= 1280
-!  loaddll wlink    wlinkd
-! else
  !  loaddll wlink    wlink
-! endif
  !  loaddll wlib     wlibd
  !endif
  
@@ -348,6 +344,7 @@ TEST_GUI_OBJECTS =  &
         $(OBJS)\test_gui_textctrltest.obj &
         $(OBJS)\test_gui_textentrytest.obj &
         $(OBJS)\test_gui_treectrltest.obj &
+       $(OBJS)\test_gui_clone.obj &
         $(OBJS)\test_gui_propagation.obj &
         $(OBJS)\test_gui_fonttest.obj &
         $(OBJS)\test_gui_rawbmp.obj &
@@ -656,6 +653,9 @@ $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp
  $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
  
+$(OBJS)\test_gui_clone.obj :  .AUTODEPEND .\events\clone.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
  $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
  
diff --git a/tests/test.bkl b/tests/test.bkl

index 3cb355ce2bc37260de70841da131040731ed0ef5..f2a24aa3218a616b457b6c05296005aa25bc6697 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -114,6 +114,7 @@
              controls/textctrltest.cpp
              controls/textentrytest.cpp
              controls/treectrltest.cpp
+            events/clone.cpp
              events/propagation.cpp
              font/fonttest.cpp
              image/rawbmp.cpp
diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp

index 3596361d32d39950b4b646fb632e5aeb7baf1207..f6ff7d1a2a0a3b03987267497572c14236180150 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -239,6 +239,10 @@ SOURCE=.\window\clientsize.cpp
  # End Source File\r
  # Begin Source File\r
  \r
+SOURCE=.\events\clone.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=.\controls\comboboxtest.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 e924b9de65f16d7a750a2145006b6da2f0545ee0..ca4442cb3154ba824b9a79e47e406c74cb81a9f8 100644 (file)
--- a/tests/test_vc7_printfbench.vcproj
+++ b/tests/test_vc7_printfbench.vcproj
@@ -17,29 +17,27 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\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
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -49,19 +47,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -70,9 +66,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
@@ -85,26 +81,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,19 +114,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -135,9 +133,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
@@ -150,29 +148,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -182,19 +178,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -203,9 +197,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
@@ -218,26 +212,30 @@
                                 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="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -247,19 +245,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -268,9 +264,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
@@ -283,29 +279,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -315,19 +309,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -336,9 +328,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
@@ -351,26 +343,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -380,19 +376,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -401,9 +395,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
@@ -416,29 +410,27 @@
                                 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="WIN32;_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="__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
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswu\printfbench\"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -448,19 +440,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -469,9 +459,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
@@ -484,26 +474,30 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswud\printfbench\"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -513,19 +507,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -534,9 +526,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
@@ -560,49 +552,49 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal 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="Universal Debug|Win32">\r
+                                       Name="DLL 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="DLL Debug|Win32">\r
+                                       Name="Universal 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 Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|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 17c607c6d4a5cec316b1f87cfc71c67bdfe5c33c..aa0bfc57a56f218190754f317ca944d49676347e 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -17,29 +17,27 @@
         </Platforms>\r
         <Configurations>\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="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\test\"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -49,19 +47,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -70,9 +66,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
@@ -85,26 +81,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,19 +114,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -135,9 +133,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
@@ -150,29 +148,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswudll\test\"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -182,19 +178,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -203,9 +197,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
@@ -218,26 +212,30 @@
                                 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="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\test\"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -247,19 +245,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -268,9 +264,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
@@ -283,29 +279,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\test\"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -315,19 +309,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -336,9 +328,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
@@ -351,26 +343,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\test\"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -380,19 +376,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -401,9 +395,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
@@ -416,29 +410,27 @@
                                 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="WIN32;_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="__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
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswu\test\"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -448,19 +440,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -469,9 +459,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
@@ -484,26 +474,30 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\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="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswud\test\"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -513,19 +507,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -534,9 +526,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
@@ -590,49 +582,49 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal 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="Universal Debug|Win32">\r
+                                       Name="DLL 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="DLL Debug|Win32">\r
+                                       Name="Universal 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 Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|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 f07e10727e309b350c60b4b5cff60e500d28ce84..234fd2736f4bec5219c2c8829a9cb4416b7b15a5 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -17,29 +17,27 @@
         </Platforms>\r
         <Configurations>\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="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -49,19 +47,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -70,9 +66,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
@@ -85,26 +81,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\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
                                 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
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -114,19 +114,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -135,9 +133,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
@@ -150,29 +148,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -182,19 +178,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -203,9 +197,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
@@ -218,26 +212,30 @@
                                 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="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -247,19 +245,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -268,9 +264,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
@@ -283,29 +279,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -315,19 +309,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -336,9 +328,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
@@ -351,26 +343,30 @@
                                 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="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -380,19 +376,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -401,9 +395,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
@@ -416,29 +410,27 @@
                                 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="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -448,19 +440,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -469,9 +459,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
@@ -484,26 +474,30 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\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="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -513,19 +507,17 @@
                         <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
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -534,9 +526,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
@@ -560,6 +552,9 @@
                         <File\r
                                 RelativePath=".\window\clientsize.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\events\clone.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\controls\comboboxtest.cpp">\r
                         </File>\r
@@ -569,49 +564,49 @@
                         <File\r
                                 RelativePath=".\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal 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="Universal Debug|Win32">\r
+                                       Name="DLL 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="DLL Debug|Win32">\r
+                                       Name="Universal 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 Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
@@ -677,7 +672,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 e180c7f2c16292fea6606a2e3a176e75b27c4550..c74a8c5852879159b332e9116d9c48a0c783747f 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="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,25 +44,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -73,9 +69,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -83,14 +79,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -105,7 +101,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
@@ -122,9 +118,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
@@ -144,22 +140,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -170,9 +168,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
@@ -180,14 +178,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
@@ -202,7 +200,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
@@ -219,9 +217,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
@@ -241,25 +239,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -270,9 +264,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
@@ -280,14 +274,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
@@ -302,7 +296,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
@@ -319,9 +313,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
@@ -341,22 +335,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -367,9 +363,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
@@ -377,14 +373,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
@@ -399,7 +395,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
@@ -416,9 +412,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
@@ -438,25 +434,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -467,9 +459,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
@@ -477,14 +469,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
@@ -499,7 +491,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
@@ -516,9 +508,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
@@ -538,22 +530,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -564,9 +558,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
@@ -574,14 +568,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
@@ -596,7 +590,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
@@ -613,9 +607,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
@@ -635,25 +629,21 @@
                         />\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="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
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswu\printfbench\"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -664,9 +654,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
@@ -674,14 +664,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
@@ -696,7 +686,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
@@ -713,9 +703,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -735,22 +725,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswud\printfbench\"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -761,9 +753,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
@@ -771,14 +763,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
@@ -793,7 +785,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
@@ -823,7 +815,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -831,7 +823,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -839,7 +831,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -847,7 +839,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -855,7 +847,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -863,7 +855,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -871,7 +863,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -879,7 +871,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj

index 767c9162ead14c249d3084c2bf59af67283831e6..109894c1fa3e5133bd40a764d0dc2667a847895f 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="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
@@ -44,25 +44,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\test\"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -73,9 +69,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -83,14 +79,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
@@ -105,7 +101,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
@@ -122,9 +118,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
@@ -144,22 +140,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -170,9 +168,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
@@ -180,14 +178,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
@@ -202,7 +200,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
@@ -219,9 +217,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
@@ -241,25 +239,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswudll\test\"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -270,9 +264,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
@@ -280,14 +274,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
@@ -302,7 +296,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
@@ -319,9 +313,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
@@ -341,22 +335,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\test\"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -367,9 +363,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
@@ -377,14 +373,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
@@ -399,7 +395,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
@@ -416,9 +412,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
@@ -438,25 +434,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\test\"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -467,9 +459,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
@@ -477,14 +469,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
@@ -499,7 +491,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
@@ -516,9 +508,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
@@ -538,22 +530,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\test\"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -564,9 +558,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
@@ -574,14 +568,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
@@ -596,7 +590,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
@@ -613,9 +607,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
@@ -635,25 +629,21 @@
                         />\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="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
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswu\test\"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -664,9 +654,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
@@ -674,14 +664,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
@@ -696,7 +686,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
@@ -713,9 +703,9 @@
                         />\r
                 </Configuration>\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
@@ -735,22 +725,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               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
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswud\test\"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -761,9 +753,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
@@ -771,14 +763,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
@@ -793,7 +785,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
@@ -863,7 +855,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -871,7 +863,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -879,7 +871,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -887,7 +879,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -895,7 +887,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -903,7 +895,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -911,7 +903,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -919,7 +911,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|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 7bbcdd57e5ced01c9d4a84a35bb0ebb1f3094be6..c6ae43619fe75e881a8a1926161be37cf61de46f 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="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
@@ -44,25 +44,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -73,9 +69,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
@@ -83,14 +79,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
@@ -105,7 +101,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
@@ -122,9 +118,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
@@ -144,22 +140,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\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
                                 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
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -170,9 +168,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
@@ -180,14 +178,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
@@ -202,7 +200,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
@@ -219,9 +217,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
@@ -241,25 +239,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -270,9 +264,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
@@ -280,14 +274,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
@@ -302,7 +296,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
@@ -319,9 +313,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
@@ -341,22 +335,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -367,9 +363,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
@@ -377,14 +373,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
@@ -399,7 +395,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
@@ -416,9 +412,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
@@ -438,25 +434,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -467,9 +459,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
@@ -477,14 +469,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
@@ -499,7 +491,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
@@ -516,9 +508,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
@@ -538,22 +530,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -564,9 +558,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
@@ -574,14 +568,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
@@ -596,7 +590,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
@@ -613,9 +607,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
@@ -635,25 +629,21 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -664,9 +654,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
@@ -674,14 +664,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
@@ -696,7 +686,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
@@ -713,9 +703,9 @@
                         />\r
                 </Configuration>\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
@@ -735,22 +725,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -761,9 +753,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
@@ -771,14 +763,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
@@ -793,7 +785,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
@@ -823,6 +815,10 @@
                                 RelativePath=".\window\clientsize.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\events\clone.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\controls\comboboxtest.cpp"\r
                                 >\r
@@ -835,7 +831,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -843,7 +839,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -851,7 +847,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -859,7 +855,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -867,7 +863,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -875,7 +871,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -883,7 +879,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -891,7 +887,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -978,7 +974,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 d4163d361650664ad9ccd9398a876f5bae3178c4..9e0828656618da7d77cafb1f575a6f3fc73fe598 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
-               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
+               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
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.Build.0 = 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}.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
-               {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
+               {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
-               {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
+               {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
+               {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
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.Build.0 = Debug|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 292019552d43e4ca6476352a81f203e1c2a12f69..f076ccfca99abe0456ac6eb26748151d17f41b89 100644 (file)
--- a/tests/test_vc9_printfbench.vcproj
+++ b/tests/test_vc9_printfbench.vcproj
@@ -22,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,25 +44,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
+                               ObjectFile="vc_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -72,9 +69,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -82,14 +79,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -104,7 +101,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -118,9 +115,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\printfbench"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -140,23 +137,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -166,9 +164,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -176,14 +174,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswu\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -198,7 +196,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -212,9 +210,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\printfbench"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -234,25 +232,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
+                               ObjectFile="vc_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -262,9 +257,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -272,14 +267,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivud\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -294,7 +289,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswudll\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -308,9 +303,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\printfbench"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,23 +325,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
+                               ObjectFile="vc_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -356,9 +352,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -366,14 +362,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivu\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -388,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -402,9 +398,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\printfbench"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -424,25 +420,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
+                               ObjectFile="vc_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -452,9 +445,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -462,14 +455,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -484,7 +477,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -498,9 +491,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\printfbench"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -520,23 +513,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
+                               ObjectFile="vc_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -546,9 +540,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -556,14 +550,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -578,7 +572,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -592,9 +586,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -614,25 +608,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswu\printfbench\"\r
+                               ObjectFile="vc_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -642,9 +633,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -652,14 +643,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -674,7 +665,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswu\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -688,9 +679,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\printfbench"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -710,23 +701,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc_mswud\printfbench\"\r
+                               ObjectFile="vc_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -736,9 +728,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -746,14 +738,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\printfbench.exe"\r
+                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\printfbench.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
                                 SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
@@ -768,7 +760,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc_mswud\test_vc9_printfbench.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -795,7 +787,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -803,7 +795,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -811,7 +803,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -819,7 +811,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -827,7 +819,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -835,7 +827,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -843,7 +835,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -851,7 +843,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj

index f1d1ece18cbe488c9ae357cc9f90fdc6fab1f46a..012c2db301f93ac1910226dc545a9576f3d3f717 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="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
@@ -44,25 +44,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\test\"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -72,9 +69,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -82,14 +79,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_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
@@ -104,7 +101,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
@@ -118,9 +115,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
@@ -140,23 +137,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -166,9 +164,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -176,14 +174,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_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
@@ -198,7 +196,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
@@ -212,9 +210,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
@@ -234,25 +232,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswudll\test\"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -262,9 +257,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -272,14 +267,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_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
@@ -294,7 +289,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
@@ -308,9 +303,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
@@ -330,23 +325,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\test\"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -356,9 +352,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -366,14 +362,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_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
@@ -388,7 +384,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
@@ -402,9 +398,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
@@ -424,25 +420,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\test\"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -452,9 +445,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -462,14 +455,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_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
@@ -484,7 +477,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
@@ -498,9 +491,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
@@ -520,23 +513,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\test\"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -546,9 +540,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -556,14 +550,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_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
@@ -578,7 +572,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
@@ -592,9 +586,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
@@ -614,25 +608,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswu\test\"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -642,9 +633,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -652,14 +643,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_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
@@ -674,7 +665,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
@@ -688,9 +679,9 @@
                         />\r
                 </Configuration>\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
@@ -710,23 +701,24 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswud\test\"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -736,9 +728,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -746,14 +738,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_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
@@ -768,7 +760,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
@@ -835,7 +827,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -843,7 +835,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -851,7 +843,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -859,7 +851,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -867,7 +859,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -875,7 +867,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -883,7 +875,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -891,7 +883,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|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 fc37d8460b12388f226dfd1894b1b1a293cfd4e4..cc86f242f5e7fbed80b5527ea97d96cfd8d4c2fe 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="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
@@ -44,25 +44,22 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -72,9 +69,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
@@ -82,14 +79,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
@@ -104,7 +101,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
@@ -118,9 +115,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
@@ -140,23 +137,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -166,9 +164,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
@@ -176,14 +174,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
@@ -198,7 +196,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
@@ -212,9 +210,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
@@ -234,25 +232,22 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -262,9 +257,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;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
@@ -272,14 +267,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
@@ -294,7 +289,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
@@ -308,9 +303,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
@@ -330,23 +325,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -356,9 +352,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
@@ -366,14 +362,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
@@ -388,7 +384,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
@@ -402,9 +398,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
@@ -424,25 +420,22 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -452,9 +445,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;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
@@ -462,14 +455,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
@@ -484,7 +477,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
@@ -498,9 +491,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
@@ -520,23 +513,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -546,9 +540,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
@@ -556,14 +550,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
@@ -578,7 +572,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
@@ -592,9 +586,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
@@ -614,25 +608,22 @@
                         />\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="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="__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
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -642,9 +633,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;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
@@ -652,14 +643,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
@@ -674,7 +665,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
@@ -688,9 +679,9 @@
                         />\r
                 </Configuration>\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
@@ -710,23 +701,24 @@
                         />\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="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="_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
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\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
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -736,9 +728,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
@@ -746,14 +738,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
@@ -768,7 +760,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
@@ -795,6 +787,10 @@
                                 RelativePath=".\window\clientsize.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath=".\events\clone.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\controls\comboboxtest.cpp"\r
                                 >\r
@@ -807,7 +803,7 @@
                                 RelativePath=".\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -815,7 +811,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -823,7 +819,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -831,7 +827,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -839,7 +835,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -847,7 +843,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -855,7 +851,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -863,7 +859,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -950,7 +946,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	Vadim Zeitlin <vadim@wxwidgets.org>
	Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Sun, 22 Mar 2009 21:31:34 +0000 (21:31 +0000)
src/common/init.cpp		patch \| blob \| blame \| history
tests/Makefile.in		patch \| blob \| blame \| history
tests/events/clone.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