]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f8f381)
added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly
authorVáclav Slavík <vslavik@fastmail.fm>
Wed, 15 Oct 2008 15:55:25 +0000 (15:55 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Wed, 15 Oct 2008 15:55:25 +0000 (15:55 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

19 files changed:
tests/Makefile.in patch | blob | blame | history
tests/html/htmlwindow.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_printfbench.dsp patch | blob | blame | history
tests/test_test.dsp 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_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

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b4e9d9bf027dd6a1e05562e3fd17dd8de47aa164..a79c252aecff64c17fd52b4cb14ea1ad59b9fb3b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -32,6 +32,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -125,6 +126,7 @@ TEST_GUI_OBJECTS =  \
        test_gui_textctrltest.o \
        test_gui_textentrytest.o \
        test_gui_rawbmp.o \
+       test_gui_htmlwindow.o \
        test_gui_guifuncs.o \
        test_gui_selstoretest.o \
        test_gui_clientsize.o \
@@ -200,6 +202,9 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \
 @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
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -270,7 +275,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
 
 @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
 @COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
@@ -537,6 +542,9 @@ test_gui_textentrytest.o: $(srcdir)/controls/textentrytest.cpp $(TEST_GUI_ODEP)
 test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp
 
+test_gui_htmlwindow.o: $(srcdir)/html/htmlwindow.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmlwindow.cpp
+
 test_gui_guifuncs.o: $(srcdir)/misc/guifuncs.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/guifuncs.cpp
 
diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp
new file mode 100644 (file)
index 0000000..936954f
--- /dev/null
+++ b/tests/html/htmlwindow.cpp
@@ -0,0 +1,91 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/html/htmlwindow.cpp
+// Purpose:     wxHtmlWindow tests
+// Author:      Vaclav Slavik
+// Created:     2008-10-15
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vaclav Slavik <vslavik@fastmail.fm>
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include "wx/html/htmlwin.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class HtmlWindowTestCase : public CppUnit::TestCase
+{
+public:
+    HtmlWindowTestCase() { }
+
+    virtual void setUp();
+    virtual void tearDown();
+
+private:
+    CPPUNIT_TEST_SUITE( HtmlWindowTestCase );
+        CPPUNIT_TEST( SelectionToText );
+    CPPUNIT_TEST_SUITE_END();
+
+    void SelectionToText();
+
+    wxHtmlWindow *m_win;
+
+    DECLARE_NO_COPY_CLASS(HtmlWindowTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( HtmlWindowTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HtmlWindowTestCase, "HtmlWindowTestCase" );
+
+// ----------------------------------------------------------------------------
+// test initialization
+// ----------------------------------------------------------------------------
+
+void HtmlWindowTestCase::setUp()
+{
+    m_win = new wxHtmlWindow(wxTheApp->GetTopWindow(), wxID_ANY);
+}
+
+void HtmlWindowTestCase::tearDown()
+{
+    m_win->Destroy();
+    m_win = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// tests themselves
+// ----------------------------------------------------------------------------
+
+static const char *TEST_MARKUP =
+    "<html><body>"
+    "  Title<p>"
+    "  A longer line<br>"
+    "  and the last line."
+    "</body></html>";
+
+static const char *TEST_PLAIN_TEXT =
+    "Title\nA longer line\nand the last line.";
+
+void HtmlWindowTestCase::SelectionToText()
+{
+    m_win->SetPage(TEST_MARKUP);
+    m_win->SelectAll();
+
+    CPPUNIT_ASSERT_EQUAL( TEST_PLAIN_TEXT, m_win->SelectionToText() );
+}
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 0db0977053f2776cce5d29bb73ce67995fa47286..af035e6ec9aa8d916cef819ec243bc850701d427 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -113,6 +113,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.obj \
        $(OBJS)\test_gui_textentrytest.obj \
        $(OBJS)\test_gui_rawbmp.obj \
+       $(OBJS)\test_gui_htmlwindow.obj \
        $(OBJS)\test_gui_guifuncs.obj \
        $(OBJS)\test_gui_selstoretest.obj \
        $(OBJS)\test_gui_clientsize.obj \
@@ -208,6 +209,10 @@ __GFXCTX_DEFINE_p_3 = -dwxUSE_GRAPHICS_CONTEXT=1
 __DLLFLAG_p_3 = -dWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
@@ -350,7 +355,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(LDFLAGS) @&&|
-       c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res
+       c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
 
@@ -577,6 +582,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
+$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
+
 $(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index bbcdd1c5a420b9a89e2f0c14e692897c869abd72..578390a05cc55840ac0ab4a1ff53f83491eb9f35 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -106,6 +106,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.o \
        $(OBJS)\test_gui_textentrytest.o \
        $(OBJS)\test_gui_rawbmp.o \
+       $(OBJS)\test_gui_htmlwindow.o \
        $(OBJS)\test_gui_guifuncs.o \
        $(OBJS)\test_gui_selstoretest.o \
        $(OBJS)\test_gui_clientsize.o \
@@ -208,6 +209,10 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 endif
@@ -331,7 +336,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
-       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 endif
 
 data: 
@@ -555,6 +560,9 @@ $(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index dad6c2ee409b8a2e041a5c4f7c7a852db5cf1ab2..9b892b08b21aa4851aa09a74cf1ecf0e452c670e 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -109,6 +109,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.obj \
        $(OBJS)\test_gui_textentrytest.obj \
        $(OBJS)\test_gui_rawbmp.obj \
+       $(OBJS)\test_gui_htmlwindow.obj \
        $(OBJS)\test_gui_guifuncs.obj \
        $(OBJS)\test_gui_selstoretest.obj \
        $(OBJS)\test_gui_clientsize.obj \
@@ -260,6 +261,10 @@ __GFXCTX_DEFINE_p_3 = /d wxUSE_GRAPHICS_CONTEXT=1
 __DLLFLAG_p_3 = /d WXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
@@ -435,7 +440,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
-       $(TEST_GUI_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+       $(TEST_GUI_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
 !endif
 
@@ -662,6 +667,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
+$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
+
 $(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
 
diff --git a/tests/makefile.wat b/tests/makefile.wat
index 258fbc8e61d1a605146f4f2ed26ab68de3d8551e..8983bc35f8bd8972a86c9efa3845e6afe712858c 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -83,6 +83,11 @@ __test_gui___depname =
 !ifeq USE_GUI 1
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
@@ -318,6 +323,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_textctrltest.obj &
        $(OBJS)\test_gui_textentrytest.obj &
        $(OBJS)\test_gui_rawbmp.obj &
+       $(OBJS)\test_gui_htmlwindow.obj &
        $(OBJS)\test_gui_guifuncs.obj &
        $(OBJS)\test_gui_selstoretest.obj &
        $(OBJS)\test_gui_clientsize.obj &
@@ -372,7 +378,7 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        @%append $(OBJS)\test_gui.lbc option caseexact
        @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_2)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(LDFLAGS)
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\test_gui.lbc library %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\test_gui.lbc library %i
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res
        @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i
        wlink @$(OBJS)\test_gui.lbc
@@ -608,6 +614,9 @@ $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
+$(OBJS)\test_gui_htmlwindow.obj :  .AUTODEPEND .\html\htmlwindow.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_guifuncs.obj :  .AUTODEPEND .\misc\guifuncs.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
diff --git a/tests/test.bkl b/tests/test.bkl
index 8eea85127a16f0c2c5943b147540d68e614ba33f..9d639115fa0079a02c7d96170cb938cb157e064a 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -110,11 +110,13 @@
             controls/textctrltest.cpp
             controls/textentrytest.cpp
             image/rawbmp.cpp
+            html/htmlwindow.cpp
             misc/guifuncs.cpp
             misc/selstoretest.cpp
             window/clientsize.cpp
             window/setsize.cpp
         </sources>
+        <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </exe>
diff --git a/tests/test_printfbench.dsp b/tests/test_printfbench.dsp
index e823c8c8c3dd66c6e70617a64ce9a41a2dd60155..6dd1ea33a0a8ff9d0ab27342bd956843fa91d3d7 100644 (file)
--- a/tests/test_printfbench.dsp
+++ b/tests/test_printfbench.dsp
@@ -38,185 +38,185 @@ RSC=rc.exe
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswunivudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivudll\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\printfbench"\r
+# PROP Output_Dir "vc6_mswunivudll"\r
+# PROP Intermediate_Dir "vc6_mswunivudll\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivudll\printfbench.exe" /debug /pdb:"vc_mswunivudll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivudll\printfbench.exe" /debug /pdb:"vc_mswunivudll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivudll\printfbench.exe" /debug /pdb:"vc6_mswunivudll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivudll\printfbench.exe" /debug /pdb:"vc6_mswunivudll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswunivuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivuddll\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\printfbench"\r
+# PROP Output_Dir "vc6_mswunivuddll"\r
+# PROP Intermediate_Dir "vc6_mswunivuddll\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivuddll\printfbench.exe" /debug /pdb:"vc_mswunivuddll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivuddll\printfbench.exe" /debug /pdb:"vc_mswunivuddll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivuddll\printfbench.exe" /debug /pdb:"vc6_mswunivuddll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivuddll\printfbench.exe" /debug /pdb:"vc6_mswunivuddll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswudll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswudll\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswudll"\r
-# PROP Intermediate_Dir "vc_mswudll\printfbench"\r
+# PROP Output_Dir "vc6_mswudll"\r
+# PROP Intermediate_Dir "vc6_mswudll\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswudll\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswudll\printfbench.exe" /debug /pdb:"vc_mswudll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswudll\printfbench.exe" /debug /pdb:"vc_mswudll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswudll\printfbench.exe" /debug /pdb:"vc6_mswudll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswudll\printfbench.exe" /debug /pdb:"vc6_mswudll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswuddll\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswuddll"\r
-# PROP Intermediate_Dir "vc_mswuddll\printfbench"\r
+# PROP Output_Dir "vc6_mswuddll"\r
+# PROP Intermediate_Dir "vc6_mswuddll\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswuddll\printfbench.exe" /debug /pdb:"vc_mswuddll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswuddll\printfbench.exe" /debug /pdb:"vc_mswuddll\printfbench.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswuddll\printfbench.exe" /debug /pdb:"vc6_mswuddll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswuddll\printfbench.exe" /debug /pdb:"vc6_mswuddll\printfbench.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswunivu"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivu\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\printfbench"\r
+# PROP Output_Dir "vc6_mswunivu"\r
+# PROP Intermediate_Dir "vc6_mswunivu\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivu\printfbench.exe" /debug /pdb:"vc_mswunivu\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivu\printfbench.exe" /debug /pdb:"vc_mswunivu\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivu\printfbench.exe" /debug /pdb:"vc6_mswunivu\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivu\printfbench.exe" /debug /pdb:"vc6_mswunivu\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswunivud"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivud\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\printfbench"\r
+# PROP Output_Dir "vc6_mswunivud"\r
+# PROP Intermediate_Dir "vc6_mswunivud\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivud\printfbench.exe" /debug /pdb:"vc_mswunivud\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivud\printfbench.exe" /debug /pdb:"vc_mswunivud\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivud\printfbench.exe" /debug /pdb:"vc6_mswunivud\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivud\printfbench.exe" /debug /pdb:"vc6_mswunivud\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswu"\r
-# PROP BASE Intermediate_Dir "vc_mswu\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswu"\r
+# PROP BASE Intermediate_Dir "vc6_mswu\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswu"\r
-# PROP Intermediate_Dir "vc_mswu\printfbench"\r
+# PROP Output_Dir "vc6_mswu"\r
+# PROP Intermediate_Dir "vc6_mswu\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswu\printfbench.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswu\testprec_printfbench.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswu\printfbench.exe" /debug /pdb:"vc_mswu\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswu\printfbench.exe" /debug /pdb:"vc_mswu\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswu\printfbench.exe" /debug /pdb:"vc6_mswu\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswu\printfbench.exe" /debug /pdb:"vc6_mswu\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "printfbench - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswud"\r
-# PROP BASE Intermediate_Dir "vc_mswud\printfbench"\r
+# PROP BASE Output_Dir "vc6_mswud"\r
+# PROP BASE Intermediate_Dir "vc6_mswud\printfbench"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswud"\r
-# PROP Intermediate_Dir "vc_mswud\printfbench"\r
+# PROP Output_Dir "vc6_mswud"\r
+# PROP Intermediate_Dir "vc6_mswud\printfbench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\printfbench.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswud\testprec_printfbench.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswud\printfbench.exe" /debug /pdb:"vc_mswud\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswud\printfbench.exe" /debug /pdb:"vc_mswud\printfbench.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswud\printfbench.exe" /debug /pdb:"vc6_mswud\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswud\printfbench.exe" /debug /pdb:"vc6_mswud\printfbench.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ENDIF\r
 \r
diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index be63a023b1452a0f16697339d8ea218fcfcd0986..2bfb0577c2c6f9d6de424c204d34d3f476809b79 100644 (file)
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -38,185 +38,185 @@ RSC=rc.exe
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\test"\r
+# PROP BASE Output_Dir "vc6_mswunivudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivudll\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\test"\r
+# PROP Output_Dir "vc6_mswunivudll"\r
+# PROP Intermediate_Dir "vc6_mswunivudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /debug /pdb:"vc_mswunivudll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /debug /pdb:"vc_mswunivudll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivudll\test.exe" /debug /pdb:"vc6_mswunivudll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivudll\test.exe" /debug /pdb:"vc6_mswunivudll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\test"\r
+# PROP BASE Output_Dir "vc6_mswunivuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivuddll\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\test"\r
+# PROP Output_Dir "vc6_mswunivuddll"\r
+# PROP Intermediate_Dir "vc6_mswunivuddll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /pdb:"vc_mswunivuddll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /pdb:"vc_mswunivuddll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivuddll\test.exe" /debug /pdb:"vc6_mswunivuddll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivuddll\test.exe" /debug /pdb:"vc6_mswunivuddll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswudll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\test"\r
+# PROP BASE Output_Dir "vc6_mswudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswudll\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswudll"\r
-# PROP Intermediate_Dir "vc_mswudll\test"\r
+# PROP Output_Dir "vc6_mswudll"\r
+# PROP Intermediate_Dir "vc6_mswudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswudll\test.exe" /debug /pdb:"vc_mswudll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswudll\test.exe" /debug /pdb:"vc_mswudll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswudll\test.exe" /debug /pdb:"vc6_mswudll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswudll\test.exe" /debug /pdb:"vc6_mswudll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\test"\r
+# PROP BASE Output_Dir "vc6_mswuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswuddll\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswuddll"\r
-# PROP Intermediate_Dir "vc_mswuddll\test"\r
+# PROP Output_Dir "vc6_mswuddll"\r
+# PROP Intermediate_Dir "vc6_mswuddll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /pdb:"vc_mswuddll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /pdb:"vc_mswuddll\test.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswuddll\test.exe" /debug /pdb:"vc6_mswuddll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswuddll\test.exe" /debug /pdb:"vc6_mswuddll\test.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\test"\r
+# PROP BASE Output_Dir "vc6_mswunivu"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivu\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\test"\r
+# PROP Output_Dir "vc6_mswunivu"\r
+# PROP Intermediate_Dir "vc6_mswunivu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /debug /pdb:"vc_mswunivu\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /debug /pdb:"vc_mswunivu\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivu\test.exe" /debug /pdb:"vc6_mswunivu\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivu\test.exe" /debug /pdb:"vc6_mswunivu\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\test"\r
+# PROP BASE Output_Dir "vc6_mswunivud"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivud\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\test"\r
+# PROP Output_Dir "vc6_mswunivud"\r
+# PROP Intermediate_Dir "vc6_mswunivud\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /pdb:"vc_mswunivud\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /pdb:"vc_mswunivud\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivud\test.exe" /debug /pdb:"vc6_mswunivud\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswunivud\test.exe" /debug /pdb:"vc6_mswunivud\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswu"\r
-# PROP BASE Intermediate_Dir "vc_mswu\test"\r
+# PROP BASE Output_Dir "vc6_mswu"\r
+# PROP BASE Intermediate_Dir "vc6_mswu\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswu"\r
-# PROP Intermediate_Dir "vc_mswu\test"\r
+# PROP Output_Dir "vc6_mswu"\r
+# PROP Intermediate_Dir "vc6_mswu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswu\test.exe" /debug /pdb:"vc_mswu\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswu\test.exe" /debug /pdb:"vc_mswu\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswu\test.exe" /debug /pdb:"vc6_mswu\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswu\test.exe" /debug /pdb:"vc6_mswu\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswud"\r
-# PROP BASE Intermediate_Dir "vc_mswud\test"\r
+# PROP BASE Output_Dir "vc6_mswud"\r
+# PROP BASE Intermediate_Dir "vc6_mswud\test"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswud"\r
-# PROP Intermediate_Dir "vc_mswud\test"\r
+# PROP Output_Dir "vc6_mswud"\r
+# PROP Intermediate_Dir "vc6_mswud\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\test.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc6_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /pdb:"vc_mswud\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 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 /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /pdb:"vc_mswud\test.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 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 /nologo /machine:i386 /out:"vc6_mswud\test.exe" /debug /pdb:"vc6_mswud\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 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 /nologo /machine:i386 /out:"vc6_mswud\test.exe" /debug /pdb:"vc6_mswud\test.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ENDIF\r
 \r
diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index 396016da2d98d93237e2422d130ee0c71260734f..20d322175bb003d6cd666ce748a205d5dc8bfbdf 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -38,185 +38,185 @@ RSC=rc.exe
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswunivudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivudll\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\test_gui"\r
+# PROP Output_Dir "vc6_mswunivudll"\r
+# PROP Intermediate_Dir "vc6_mswunivudll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxmswuniv29u_html.lib wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc6_mswunivudll\test_gui.exe" /debug /pdb:"vc6_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 wxmswuniv29u_html.lib wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc6_mswunivudll\test_gui.exe" /debug /pdb:"vc6_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswunivuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivuddll\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\test_gui"\r
+# PROP Output_Dir "vc6_mswunivuddll"\r
+# PROP Intermediate_Dir "vc6_mswunivuddll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswunivud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxmswuniv29ud_html.lib wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc6_mswunivuddll\test_gui.exe" /debug /pdb:"vc6_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 wxmswuniv29ud_html.lib wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc6_mswunivuddll\test_gui.exe" /debug /pdb:"vc6_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswudll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswudll"\r
+# PROP BASE Intermediate_Dir "vc6_mswudll\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswudll"\r
-# PROP Intermediate_Dir "vc_mswudll\test_gui"\r
+# PROP Output_Dir "vc6_mswudll"\r
+# PROP Intermediate_Dir "vc6_mswudll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_core.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 /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxmsw29u_core.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 /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxmsw29u_html.lib wxmsw29u_core.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 /nologo /machine:i386 /out:"vc6_mswudll\test_gui.exe" /debug /pdb:"vc6_mswudll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 wxmsw29u_html.lib wxmsw29u_core.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 /nologo /machine:i386 /out:"vc6_mswudll\test_gui.exe" /debug /pdb:"vc6_mswudll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswuddll"\r
+# PROP BASE Intermediate_Dir "vc6_mswuddll\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswuddll"\r
-# PROP Intermediate_Dir "vc_mswuddll\test_gui"\r
+# PROP Output_Dir "vc6_mswuddll"\r
+# PROP Intermediate_Dir "vc6_mswuddll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_dll\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxmsw29ud_html.lib wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc6_mswuddll\test_gui.exe" /debug /pdb:"vc6_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
+# ADD LINK32 wxmsw29ud_html.lib wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc6_mswuddll\test_gui.exe" /debug /pdb:"vc6_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc6_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswunivu"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivu\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\test_gui"\r
+# PROP Output_Dir "vc6_mswunivu"\r
+# PROP Intermediate_Dir "vc6_mswunivu\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxmswuniv29u_html.lib wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc6_mswunivu\test_gui.exe" /debug /pdb:"vc6_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 wxmswuniv29u_html.lib wxmswuniv29u_core.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 /nologo /machine:i386 /out:"vc6_mswunivu\test_gui.exe" /debug /pdb:"vc6_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswunivud"\r
+# PROP BASE Intermediate_Dir "vc6_mswunivud\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\test_gui"\r
+# PROP Output_Dir "vc6_mswunivud"\r
+# PROP Intermediate_Dir "vc6_mswunivud\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswunivud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswunivud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxmswuniv29ud_html.lib wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc6_mswunivud\test_gui.exe" /debug /pdb:"vc6_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 wxmswuniv29ud_html.lib wxmswuniv29ud_core.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 /nologo /machine:i386 /out:"vc6_mswunivud\test_gui.exe" /debug /pdb:"vc6_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswu"\r
-# PROP BASE Intermediate_Dir "vc_mswu\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswu"\r
+# PROP BASE Intermediate_Dir "vc6_mswu\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswu"\r
-# PROP Intermediate_Dir "vc_mswu\test_gui"\r
+# PROP Output_Dir "vc6_mswu"\r
+# PROP Intermediate_Dir "vc6_mswu\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc6_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_core.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 /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxmsw29u_core.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 /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxmsw29u_html.lib wxmsw29u_core.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 /nologo /machine:i386 /out:"vc6_mswu\test_gui.exe" /debug /pdb:"vc6_mswu\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 wxmsw29u_html.lib wxmsw29u_core.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 /nologo /machine:i386 /out:"vc6_mswu\test_gui.exe" /debug /pdb:"vc6_mswu\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswud"\r
-# PROP BASE Intermediate_Dir "vc_mswud\test_gui"\r
+# PROP BASE Output_Dir "vc6_mswud"\r
+# PROP BASE Intermediate_Dir "vc6_mswud\test_gui"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswud"\r
-# PROP Intermediate_Dir "vc_mswud\test_gui"\r
+# PROP Output_Dir "vc6_mswud"\r
+# PROP Intermediate_Dir "vc6_mswud\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\test_gui.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc6_lib\mswud" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc6_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\lib\vc6_lib\mswud" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxmsw29ud_html.lib wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc6_mswud\test_gui.exe" /debug /pdb:"vc6_mswud\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
+# ADD LINK32 wxmsw29ud_html.lib wxmsw29ud_core.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 /nologo /machine:i386 /out:"vc6_mswud\test_gui.exe" /debug /pdb:"vc6_mswud\test_gui.pdb" /libpath:".\..\lib\vc6_lib" /subsystem:console\r
 \r
 !ENDIF\r
 \r
@@ -257,6 +257,10 @@ SOURCE=.\misc\guifuncs.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\html\htmlwindow.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\geometry\point.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 2045d6e6ea2c31647f135d3dba8f92ed708cf920..116bee4710faf6c7b71fed0a417b90e5a64e4a79 100644 (file)
--- a/tests/test_vc7_printfbench.vcproj
+++ b/tests/test_vc7_printfbench.vcproj
@@ -18,8 +18,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       OutputDirectory="vc7_mswunivudll"\r
+                       IntermediateDirectory="vc7_mswunivudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -27,17 +27,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswunivudll\printfbench\"\r
+                               ObjectFile="vc7_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswunivudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -48,12 +48,12 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\printfbench.exe"\r
+                               OutputFile="vc7_mswunivudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -68,7 +68,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
+                       OutputDirectory="vc7_mswunivuddll"\r
+                       IntermediateDirectory="vc7_mswunivuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -91,7 +91,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -101,10 +101,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc7_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswunivuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -115,12 +115,12 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
+                               OutputFile="vc7_mswunivuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -135,7 +135,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -149,8 +149,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\printfbench"\r
+                       OutputDirectory="vc7_mswudll"\r
+                       IntermediateDirectory="vc7_mswudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -158,17 +158,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswudll\printfbench\"\r
+                               ObjectFile="vc7_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -179,12 +179,12 @@
                                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"\r
-                               OutputFile="vc_mswudll\printfbench.exe"\r
+                               OutputFile="vc7_mswudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -199,7 +199,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -213,8 +213,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\printfbench"\r
+                       OutputDirectory="vc7_mswuddll"\r
+                       IntermediateDirectory="vc7_mswuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -222,7 +222,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -232,10 +232,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswuddll\printfbench\"\r
+                               ObjectFile="vc7_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -246,12 +246,12 @@
                                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"\r
-                               OutputFile="vc_mswuddll\printfbench.exe"\r
+                               OutputFile="vc7_mswuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -280,8 +280,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\printfbench"\r
+                       OutputDirectory="vc7_mswunivu"\r
+                       IntermediateDirectory="vc7_mswunivu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -289,17 +289,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswunivu\printfbench\"\r
+                               ObjectFile="vc7_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswunivu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -310,12 +310,12 @@
                                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"\r
-                               OutputFile="vc_mswunivu\printfbench.exe"\r
+                               OutputFile="vc7_mswunivu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -330,7 +330,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -344,8 +344,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\printfbench"\r
+                       OutputDirectory="vc7_mswunivud"\r
+                       IntermediateDirectory="vc7_mswunivud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -353,7 +353,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -363,10 +363,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswunivud\printfbench\"\r
+                               ObjectFile="vc7_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswunivud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -377,12 +377,12 @@
                                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"\r
-                               OutputFile="vc_mswunivud\printfbench.exe"\r
+                               OutputFile="vc7_mswunivud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -397,7 +397,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -411,8 +411,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\printfbench"\r
+                       OutputDirectory="vc7_mswu"\r
+                       IntermediateDirectory="vc7_mswu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -420,17 +420,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswu\printfbench\"\r
+                               ObjectFile="vc7_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -441,12 +441,12 @@
                                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"\r
-                               OutputFile="vc_mswu\printfbench.exe"\r
+                               OutputFile="vc7_mswu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -475,8 +475,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       OutputDirectory="vc7_mswud"\r
+                       IntermediateDirectory="vc7_mswud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -484,7 +484,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -494,10 +494,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc7_mswud\printfbench\"\r
+                               ObjectFile="vc7_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc7_mswud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -508,12 +508,12 @@
                                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"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               OutputFile="vc7_mswud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc7_mswud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -528,7 +528,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 136604537a0cbb269e970754feed76d148b16ef8..b483937bfe12648f77ca26a257937a464f590a23 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -18,8 +18,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       OutputDirectory="vc7_mswunivudll"\r
+                       IntermediateDirectory="vc7_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -27,17 +27,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswunivudll\test\"\r
+                               ObjectFile="vc7_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc7_mswunivudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -48,12 +48,12 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
+                               OutputFile="vc7_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -68,7 +68,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       OutputDirectory="vc7_mswunivuddll"\r
+                       IntermediateDirectory="vc7_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -91,7 +91,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -101,10 +101,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswunivuddll\test\"\r
+                               ObjectFile="vc7_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc7_mswunivuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -115,12 +115,12 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
+                               OutputFile="vc7_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -135,7 +135,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -149,8 +149,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       OutputDirectory="vc7_mswudll"\r
+                       IntermediateDirectory="vc7_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -158,17 +158,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswudll\test\"\r
+                               ObjectFile="vc7_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc7_mswudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -179,12 +179,12 @@
                                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"\r
-                               OutputFile="vc_mswudll\test.exe"\r
+                               OutputFile="vc7_mswudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -199,7 +199,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -213,8 +213,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       OutputDirectory="vc7_mswuddll"\r
+                       IntermediateDirectory="vc7_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -222,7 +222,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -232,10 +232,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswuddll\test\"\r
+                               ObjectFile="vc7_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc7_mswuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -246,12 +246,12 @@
                                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"\r
-                               OutputFile="vc_mswuddll\test.exe"\r
+                               OutputFile="vc7_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -280,8 +280,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       OutputDirectory="vc7_mswunivu"\r
+                       IntermediateDirectory="vc7_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -289,17 +289,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswunivu\test\"\r
+                               ObjectFile="vc7_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc7_mswunivu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -310,12 +310,12 @@
                                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"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
+                               OutputFile="vc7_mswunivu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -330,7 +330,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -344,8 +344,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
+                       OutputDirectory="vc7_mswunivud"\r
+                       IntermediateDirectory="vc7_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -353,7 +353,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -363,10 +363,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswunivud\test\"\r
+                               ObjectFile="vc7_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc7_mswunivud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -377,12 +377,12 @@
                                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"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
+                               OutputFile="vc7_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -397,7 +397,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -411,8 +411,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\r
+                       OutputDirectory="vc7_mswu"\r
+                       IntermediateDirectory="vc7_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -420,17 +420,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswu\test\"\r
+                               ObjectFile="vc7_mswu\test\"\r
+                               ProgramDataBaseFileName="vc7_mswu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -441,12 +441,12 @@
                                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"\r
-                               OutputFile="vc_mswu\test.exe"\r
+                               OutputFile="vc7_mswu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -475,8 +475,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\r
+                       OutputDirectory="vc7_mswud"\r
+                       IntermediateDirectory="vc7_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -484,7 +484,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -494,10 +494,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc7_mswud\test\"\r
+                               ObjectFile="vc7_mswud\test\"\r
+                               ProgramDataBaseFileName="vc7_mswud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -508,12 +508,12 @@
                                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"\r
-                               OutputFile="vc_mswud\test.exe"\r
+                               OutputFile="vc7_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc7_mswud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -528,7 +528,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 06eaee9d92fd2aa2a6468ce7d3de38da97a41f42..1dfae1d62071a593b976b97b6d45324d445ab85a 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -18,8 +18,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       OutputDirectory="vc7_mswunivudll"\r
+                       IntermediateDirectory="vc7_mswunivudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -27,17 +27,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswunivudll\test_gui\"\r
+                               ObjectFile="vc7_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -47,13 +47,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc7_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -68,7 +68,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       OutputDirectory="vc7_mswunivuddll"\r
+                       IntermediateDirectory="vc7_mswunivuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -91,7 +91,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -101,10 +101,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswunivuddll\test_gui\"\r
+                               ObjectFile="vc7_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -114,13 +114,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc7_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -135,7 +135,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -149,8 +149,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       OutputDirectory="vc7_mswudll"\r
+                       IntermediateDirectory="vc7_mswudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -158,17 +158,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswudll\test_gui\"\r
+                               ObjectFile="vc7_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -178,13 +178,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc7_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -199,7 +199,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -213,8 +213,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       OutputDirectory="vc7_mswuddll"\r
+                       IntermediateDirectory="vc7_mswuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -222,7 +222,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -232,10 +232,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswuddll\test_gui\"\r
+                               ObjectFile="vc7_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -245,13 +245,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc7_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -280,8 +280,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       OutputDirectory="vc7_mswunivu"\r
+                       IntermediateDirectory="vc7_mswunivu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -289,17 +289,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswunivu\test_gui\"\r
+                               ObjectFile="vc7_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -309,13 +309,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivu\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc7_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -330,7 +330,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -344,8 +344,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       OutputDirectory="vc7_mswunivud"\r
+                       IntermediateDirectory="vc7_mswunivud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -353,7 +353,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -363,10 +363,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswunivud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswunivud\test_gui\"\r
+                               ObjectFile="vc7_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -376,13 +376,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivud\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc7_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswunivud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -397,7 +397,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -411,8 +411,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       OutputDirectory="vc7_mswu"\r
+                       IntermediateDirectory="vc7_mswu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -420,17 +420,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswu\test_gui\"\r
+                               ObjectFile="vc7_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -440,13 +440,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswu\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc7_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -475,8 +475,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       OutputDirectory="vc7_mswud"\r
+                       IntermediateDirectory="vc7_mswud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
@@ -484,7 +484,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
@@ -494,10 +494,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc7_mswud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc7_mswud\test_gui\"\r
+                               ObjectFile="vc7_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc7_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -507,13 +507,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswud\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc7_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc7_mswud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -528,7 +528,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;.;.\..\samples"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -612,6 +612,9 @@
                        <File\r
                                RelativePath=".\misc\guifuncs.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlwindow.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp">\r
                        </File>\r
diff --git a/tests/test_vc8_printfbench.vcproj b/tests/test_vc8_printfbench.vcproj
index cf1572e365e0111da663932bb62c505591565872..186f4672ef4a0f53d566bba49ed3d60fb5d26a00 100644 (file)
--- a/tests/test_vc8_printfbench.vcproj
+++ b/tests/test_vc8_printfbench.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       OutputDirectory="vc8_mswunivudll"\r
+                       IntermediateDirectory="vc8_mswunivudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -48,17 +48,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswunivudll\printfbench\"\r
+                               ObjectFile="vc8_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswunivudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -80,13 +80,13 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\printfbench.exe"\r
+                               OutputFile="vc8_mswunivudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswunivudll\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -119,8 +119,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
+                       OutputDirectory="vc8_mswunivuddll"\r
+                       IntermediateDirectory="vc8_mswunivuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -144,7 +144,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -154,10 +154,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc8_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswunivuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -170,7 +170,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -179,13 +179,13 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
+                               OutputFile="vc8_mswunivuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -200,7 +200,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswunivuddll\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -218,8 +218,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\printfbench"\r
+                       OutputDirectory="vc8_mswudll"\r
+                       IntermediateDirectory="vc8_mswudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -243,17 +243,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswudll\printfbench\"\r
+                               ObjectFile="vc8_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -275,13 +275,13 @@
                                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"\r
-                               OutputFile="vc_mswudll\printfbench.exe"\r
+                               OutputFile="vc8_mswudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -296,7 +296,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswudll\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -314,8 +314,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\printfbench"\r
+                       OutputDirectory="vc8_mswuddll"\r
+                       IntermediateDirectory="vc8_mswuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -339,7 +339,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -349,10 +349,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswuddll\printfbench\"\r
+                               ObjectFile="vc8_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -365,7 +365,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -374,13 +374,13 @@
                                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"\r
-                               OutputFile="vc_mswuddll\printfbench.exe"\r
+                               OutputFile="vc8_mswuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -395,7 +395,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswuddll\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -413,8 +413,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\printfbench"\r
+                       OutputDirectory="vc8_mswunivu"\r
+                       IntermediateDirectory="vc8_mswunivu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -438,17 +438,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswunivu\printfbench\"\r
+                               ObjectFile="vc8_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswunivu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -470,13 +470,13 @@
                                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"\r
-                               OutputFile="vc_mswunivu\printfbench.exe"\r
+                               OutputFile="vc8_mswunivu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -491,7 +491,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswunivu\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -509,8 +509,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\printfbench"\r
+                       OutputDirectory="vc8_mswunivud"\r
+                       IntermediateDirectory="vc8_mswunivud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -534,7 +534,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -544,10 +544,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswunivud\printfbench\"\r
+                               ObjectFile="vc8_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswunivud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -560,7 +560,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -569,13 +569,13 @@
                                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"\r
-                               OutputFile="vc_mswunivud\printfbench.exe"\r
+                               OutputFile="vc8_mswunivud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -590,7 +590,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswunivud\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -608,8 +608,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\printfbench"\r
+                       OutputDirectory="vc8_mswu"\r
+                       IntermediateDirectory="vc8_mswu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -633,17 +633,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswu\printfbench\"\r
+                               ObjectFile="vc8_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -656,7 +656,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -665,13 +665,13 @@
                                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"\r
-                               OutputFile="vc_mswu\printfbench.exe"\r
+                               OutputFile="vc8_mswu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -686,7 +686,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswu\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -704,8 +704,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       OutputDirectory="vc8_mswud"\r
+                       IntermediateDirectory="vc8_mswud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -729,7 +729,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -739,10 +739,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc8_mswud\printfbench\"\r
+                               ObjectFile="vc8_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc8_mswud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -755,7 +755,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -764,13 +764,13 @@
                                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"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               OutputFile="vc8_mswud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc8_mswud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -785,7 +785,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_printfbench.bsc"\r
+                               OutputFile="vc8_mswud\test_vc8_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 23676eefab2be94105a47055cc0b3cd17b6cce14..20d6e9d5c461b64baf2edbeac84ddf3168df31b8 100644 (file)
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       OutputDirectory="vc8_mswunivudll"\r
+                       IntermediateDirectory="vc8_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -48,17 +48,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswunivudll\test\"\r
+                               ObjectFile="vc8_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc8_mswunivudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -80,13 +80,13 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
+                               OutputFile="vc8_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswunivudll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -119,8 +119,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       OutputDirectory="vc8_mswunivuddll"\r
+                       IntermediateDirectory="vc8_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -144,7 +144,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -154,10 +154,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswunivuddll\test\"\r
+                               ObjectFile="vc8_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc8_mswunivuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -170,7 +170,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -179,13 +179,13 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
+                               OutputFile="vc8_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -200,7 +200,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswunivuddll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -218,8 +218,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       OutputDirectory="vc8_mswudll"\r
+                       IntermediateDirectory="vc8_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -243,17 +243,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswudll\test\"\r
+                               ObjectFile="vc8_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc8_mswudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -275,13 +275,13 @@
                                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"\r
-                               OutputFile="vc_mswudll\test.exe"\r
+                               OutputFile="vc8_mswudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -296,7 +296,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswudll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -314,8 +314,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       OutputDirectory="vc8_mswuddll"\r
+                       IntermediateDirectory="vc8_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -339,7 +339,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -349,10 +349,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswuddll\test\"\r
+                               ObjectFile="vc8_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc8_mswuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -365,7 +365,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -374,13 +374,13 @@
                                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"\r
-                               OutputFile="vc_mswuddll\test.exe"\r
+                               OutputFile="vc8_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -395,7 +395,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswuddll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -413,8 +413,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       OutputDirectory="vc8_mswunivu"\r
+                       IntermediateDirectory="vc8_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -438,17 +438,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswunivu\test\"\r
+                               ObjectFile="vc8_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc8_mswunivu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -470,13 +470,13 @@
                                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"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
+                               OutputFile="vc8_mswunivu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -491,7 +491,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswunivu\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -509,8 +509,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
+                       OutputDirectory="vc8_mswunivud"\r
+                       IntermediateDirectory="vc8_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -534,7 +534,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -544,10 +544,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswunivud\test\"\r
+                               ObjectFile="vc8_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc8_mswunivud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -560,7 +560,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -569,13 +569,13 @@
                                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"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
+                               OutputFile="vc8_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -590,7 +590,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswunivud\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -608,8 +608,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\r
+                       OutputDirectory="vc8_mswu"\r
+                       IntermediateDirectory="vc8_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -633,17 +633,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswu\test\"\r
+                               ObjectFile="vc8_mswu\test\"\r
+                               ProgramDataBaseFileName="vc8_mswu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -656,7 +656,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -665,13 +665,13 @@
                                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"\r
-                               OutputFile="vc_mswu\test.exe"\r
+                               OutputFile="vc8_mswu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -686,7 +686,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswu\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -704,8 +704,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\r
+                       OutputDirectory="vc8_mswud"\r
+                       IntermediateDirectory="vc8_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -729,7 +729,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -739,10 +739,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc8_mswud\test\"\r
+                               ObjectFile="vc8_mswud\test\"\r
+                               ProgramDataBaseFileName="vc8_mswud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -755,7 +755,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -764,13 +764,13 @@
                                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"\r
-                               OutputFile="vc_mswud\test.exe"\r
+                               OutputFile="vc8_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc8_mswud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -785,7 +785,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_test.bsc"\r
+                               OutputFile="vc8_mswud\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index b7ec0f7683505305eb1ea7e03216ef24cb8204ac..b90fcdd210c11b1ea0e0fa3eb3fcf1bcb0f84ff4 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       OutputDirectory="vc8_mswunivudll"\r
+                       IntermediateDirectory="vc8_mswunivudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -48,17 +48,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswunivudll\test_gui\"\r
+                               ObjectFile="vc8_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -79,14 +79,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc8_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswunivudll\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -119,8 +119,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       OutputDirectory="vc8_mswunivuddll"\r
+                       IntermediateDirectory="vc8_mswunivuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -144,7 +144,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -154,10 +154,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswunivuddll\test_gui\"\r
+                               ObjectFile="vc8_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -170,7 +170,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -178,14 +178,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc8_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -200,7 +200,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswunivuddll\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -218,8 +218,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       OutputDirectory="vc8_mswudll"\r
+                       IntermediateDirectory="vc8_mswudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -243,17 +243,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswudll\test_gui\"\r
+                               ObjectFile="vc8_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -274,14 +274,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc8_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -296,7 +296,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswudll\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -314,8 +314,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       OutputDirectory="vc8_mswuddll"\r
+                       IntermediateDirectory="vc8_mswuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -339,7 +339,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -349,10 +349,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswuddll\test_gui\"\r
+                               ObjectFile="vc8_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -365,7 +365,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_dll\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -373,14 +373,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc8_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -395,7 +395,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswuddll\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -413,8 +413,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       OutputDirectory="vc8_mswunivu"\r
+                       IntermediateDirectory="vc8_mswunivu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -438,17 +438,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswunivu\test_gui\"\r
+                               ObjectFile="vc8_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -469,14 +469,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivu\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc8_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -491,7 +491,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswunivu\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -509,8 +509,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       OutputDirectory="vc8_mswunivud"\r
+                       IntermediateDirectory="vc8_mswunivud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -534,7 +534,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -544,10 +544,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswunivud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswunivud\test_gui\"\r
+                               ObjectFile="vc8_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -560,7 +560,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -568,14 +568,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivud\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc8_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswunivud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -590,7 +590,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswunivud\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -608,8 +608,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       OutputDirectory="vc8_mswu"\r
+                       IntermediateDirectory="vc8_mswu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -633,17 +633,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswu\test_gui\"\r
+                               ObjectFile="vc8_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -656,7 +656,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -664,14 +664,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswu\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc8_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -686,7 +686,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswu\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -704,8 +704,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       OutputDirectory="vc8_mswud"\r
+                       IntermediateDirectory="vc8_mswud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -729,7 +729,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
@@ -739,10 +739,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc8_mswud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc8_mswud\test_gui\"\r
+                               ObjectFile="vc8_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc8_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -755,7 +755,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc8_lib\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -763,14 +763,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswud\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc8_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc8_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc8_mswud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -785,7 +785,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc8_mswud\test_vc8_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -895,6 +895,10 @@
                                RelativePath=".\misc\guifuncs.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlwindow.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                                >\r
diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj
index 545fbca4f5234bf70de48756352ee28ee33ef15c..18405dd9439459f34d6418c854835008d50642aa 100644 (file)
--- a/tests/test_vc9_printfbench.vcproj
+++ b/tests/test_vc9_printfbench.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\printfbench"\r
+                       OutputDirectory="vc9_mswunivudll"\r
+                       IntermediateDirectory="vc9_mswunivudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -49,17 +49,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\printfbench\"\r
-                               ObjectFile="vc_mswunivudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswunivudll\printfbench\"\r
+                               ObjectFile="vc9_mswunivudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswunivudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -80,13 +80,13 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\printfbench.exe"\r
+                               OutputFile="vc9_mswunivudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswunivudll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -116,8 +116,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\printfbench"\r
+                       OutputDirectory="vc9_mswunivuddll"\r
+                       IntermediateDirectory="vc9_mswunivuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -142,7 +142,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -151,10 +151,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\printfbench\"\r
-                               ObjectFile="vc_mswunivuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswunivuddll\printfbench\"\r
+                               ObjectFile="vc9_mswunivuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswunivuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -166,7 +166,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -175,13 +175,13 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\printfbench.exe"\r
+                               OutputFile="vc9_mswunivuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -196,7 +196,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswunivuddll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -211,8 +211,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\printfbench"\r
+                       OutputDirectory="vc9_mswudll"\r
+                       IntermediateDirectory="vc9_mswudll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -237,17 +237,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswudll\printfbench\"\r
-                               ObjectFile="vc_mswudll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswudll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswudll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswudll\printfbench\"\r
+                               ObjectFile="vc9_mswudll\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswudll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -259,7 +259,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -268,13 +268,13 @@
                                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"\r
-                               OutputFile="vc_mswudll\printfbench.exe"\r
+                               OutputFile="vc9_mswudll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswudll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -289,7 +289,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswudll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -304,8 +304,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\printfbench"\r
+                       OutputDirectory="vc9_mswuddll"\r
+                       IntermediateDirectory="vc9_mswuddll\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,7 +330,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -339,10 +339,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\printfbench\"\r
-                               ObjectFile="vc_mswuddll\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswuddll\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswuddll\printfbench\"\r
+                               ObjectFile="vc9_mswuddll\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswuddll\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -354,7 +354,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -363,13 +363,13 @@
                                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"\r
-                               OutputFile="vc_mswuddll\printfbench.exe"\r
+                               OutputFile="vc9_mswuddll\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswuddll\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -384,7 +384,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswuddll\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -399,8 +399,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\printfbench"\r
+                       OutputDirectory="vc9_mswunivu"\r
+                       IntermediateDirectory="vc9_mswunivu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -425,17 +425,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\printfbench\"\r
-                               ObjectFile="vc_mswunivu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswunivu\printfbench\"\r
+                               ObjectFile="vc9_mswunivu\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswunivu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -447,7 +447,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -456,13 +456,13 @@
                                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"\r
-                               OutputFile="vc_mswunivu\printfbench.exe"\r
+                               OutputFile="vc9_mswunivu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -477,7 +477,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswunivu\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -492,8 +492,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\printfbench"\r
+                       OutputDirectory="vc9_mswunivud"\r
+                       IntermediateDirectory="vc9_mswunivud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -518,7 +518,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -527,10 +527,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\printfbench\"\r
-                               ObjectFile="vc_mswunivud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswunivud\printfbench\"\r
+                               ObjectFile="vc9_mswunivud\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswunivud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -542,7 +542,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -551,13 +551,13 @@
                                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"\r
-                               OutputFile="vc_mswunivud\printfbench.exe"\r
+                               OutputFile="vc9_mswunivud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -572,7 +572,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswunivud\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -587,8 +587,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\printfbench"\r
+                       OutputDirectory="vc9_mswu"\r
+                       IntermediateDirectory="vc9_mswu\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -613,17 +613,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswu\printfbench\"\r
-                               ObjectFile="vc_mswu\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswu\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswu\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswu\printfbench\"\r
+                               ObjectFile="vc9_mswu\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswu\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -635,7 +635,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -644,13 +644,13 @@
                                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"\r
-                               OutputFile="vc_mswu\printfbench.exe"\r
+                               OutputFile="vc9_mswu\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswu\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -665,7 +665,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswu\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -680,8 +680,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\printfbench"\r
+                       OutputDirectory="vc9_mswud"\r
+                       IntermediateDirectory="vc9_mswud\printfbench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -706,7 +706,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -715,10 +715,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_printfbench.pch"\r
-                               AssemblerListingLocation="vc_mswud\printfbench\"\r
-                               ObjectFile="vc_mswud\printfbench\"\r
-                               ProgramDataBaseFileName="vc_mswud\printfbench.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswud\testprec_printfbench.pch"\r
+                               AssemblerListingLocation="vc9_mswud\printfbench\"\r
+                               ObjectFile="vc9_mswud\printfbench\"\r
+                               ProgramDataBaseFileName="vc9_mswud\printfbench.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -730,7 +730,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -739,13 +739,13 @@
                                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"\r
-                               OutputFile="vc_mswud\printfbench.exe"\r
+                               OutputFile="vc9_mswud\printfbench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\printfbench.pdb"\r
+                               ProgramDatabaseFile="vc9_mswud\printfbench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -760,7 +760,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_printfbench.bsc"\r
+                               OutputFile="vc9_mswud\test_vc9_printfbench.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index df77ba663848f19858dc41511538da502e1d91aa..59d33f5606cc8b37577d6198ad487e57619ae108 100644 (file)
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       OutputDirectory="vc9_mswunivudll"\r
+                       IntermediateDirectory="vc9_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -49,17 +49,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswunivudll\test\"\r
+                               ObjectFile="vc9_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc9_mswunivudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -80,13 +80,13 @@
                                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"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
+                               OutputFile="vc9_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswunivudll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -116,8 +116,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       OutputDirectory="vc9_mswunivuddll"\r
+                       IntermediateDirectory="vc9_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -142,7 +142,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -151,10 +151,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswunivuddll\test\"\r
+                               ObjectFile="vc9_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc9_mswunivuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -166,7 +166,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -175,13 +175,13 @@
                                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"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
+                               OutputFile="vc9_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -196,7 +196,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswunivuddll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -211,8 +211,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       OutputDirectory="vc9_mswudll"\r
+                       IntermediateDirectory="vc9_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -237,17 +237,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswudll\test\"\r
+                               ObjectFile="vc9_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc9_mswudll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -259,7 +259,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -268,13 +268,13 @@
                                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"\r
-                               OutputFile="vc_mswudll\test.exe"\r
+                               OutputFile="vc9_mswudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -289,7 +289,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswudll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -304,8 +304,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       OutputDirectory="vc9_mswuddll"\r
+                       IntermediateDirectory="vc9_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,7 +330,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -339,10 +339,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswuddll\test\"\r
+                               ObjectFile="vc9_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc9_mswuddll\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -354,7 +354,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -363,13 +363,13 @@
                                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"\r
-                               OutputFile="vc_mswuddll\test.exe"\r
+                               OutputFile="vc9_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -384,7 +384,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswuddll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -399,8 +399,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       OutputDirectory="vc9_mswunivu"\r
+                       IntermediateDirectory="vc9_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -425,17 +425,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswunivu\test\"\r
+                               ObjectFile="vc9_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc9_mswunivu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -447,7 +447,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -456,13 +456,13 @@
                                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"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
+                               OutputFile="vc9_mswunivu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -477,7 +477,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswunivu\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -492,8 +492,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
+                       OutputDirectory="vc9_mswunivud"\r
+                       IntermediateDirectory="vc9_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -518,7 +518,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -527,10 +527,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswunivud\test\"\r
+                               ObjectFile="vc9_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc9_mswunivud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -542,7 +542,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -551,13 +551,13 @@
                                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"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
+                               OutputFile="vc9_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -572,7 +572,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswunivud\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -587,8 +587,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\r
+                       OutputDirectory="vc9_mswu"\r
+                       IntermediateDirectory="vc9_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -613,17 +613,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswu\test\"\r
+                               ObjectFile="vc9_mswu\test\"\r
+                               ProgramDataBaseFileName="vc9_mswu\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -635,7 +635,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -644,13 +644,13 @@
                                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"\r
-                               OutputFile="vc_mswu\test.exe"\r
+                               OutputFile="vc9_mswu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -665,7 +665,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswu\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -680,8 +680,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\r
+                       OutputDirectory="vc9_mswud"\r
+                       IntermediateDirectory="vc9_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -706,7 +706,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -715,10 +715,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc9_mswud\test\"\r
+                               ObjectFile="vc9_mswud\test\"\r
+                               ProgramDataBaseFileName="vc9_mswud\test.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -730,7 +730,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -739,13 +739,13 @@
                                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"\r
-                               OutputFile="vc_mswud\test.exe"\r
+                               OutputFile="vc9_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc9_mswud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -760,7 +760,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_test.bsc"\r
+                               OutputFile="vc9_mswud\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index cedf71f3c2712ac965e0f726a5546ae36ae8f966..915a162e03707eb1d907a1b23697d0177dedb0a5 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       OutputDirectory="vc9_mswunivudll"\r
+                       IntermediateDirectory="vc9_mswunivudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -49,17 +49,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswunivudll\test_gui\"\r
+                               ObjectFile="vc9_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -79,14 +79,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc9_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswunivudll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -116,8 +116,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       OutputDirectory="vc9_mswunivuddll"\r
+                       IntermediateDirectory="vc9_mswunivuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -142,7 +142,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -151,10 +151,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswunivuddll\test_gui\"\r
+                               ObjectFile="vc9_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -166,7 +166,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -174,14 +174,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc9_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -196,7 +196,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswunivuddll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -211,8 +211,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       OutputDirectory="vc9_mswudll"\r
+                       IntermediateDirectory="vc9_mswudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -237,17 +237,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswudll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswudll\test_gui\"\r
+                               ObjectFile="vc9_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -259,7 +259,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -267,14 +267,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswudll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc9_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -289,7 +289,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswudll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -304,8 +304,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       OutputDirectory="vc9_mswuddll"\r
+                       IntermediateDirectory="vc9_mswuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,7 +330,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -339,10 +339,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswuddll\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswuddll\test_gui\"\r
+                               ObjectFile="vc9_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -354,7 +354,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -362,14 +362,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswuddll\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc9_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswuddll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -384,7 +384,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswuddll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -399,8 +399,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       OutputDirectory="vc9_mswunivu"\r
+                       IntermediateDirectory="vc9_mswunivu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -425,17 +425,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswunivu\test_gui\"\r
+                               ObjectFile="vc9_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -447,7 +447,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -455,14 +455,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_core.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"\r
-                               OutputFile="vc_mswunivu\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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"\r
+                               OutputFile="vc9_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -477,7 +477,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswunivu\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -492,8 +492,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       OutputDirectory="vc9_mswunivud"\r
+                       IntermediateDirectory="vc9_mswunivud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -518,7 +518,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -527,10 +527,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswunivud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswunivud\test_gui\"\r
+                               ObjectFile="vc9_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -542,7 +542,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -550,14 +550,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r
-                               OutputFile="vc_mswunivud\test_gui.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.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"\r
+                               OutputFile="vc9_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswunivud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -572,7 +572,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswunivud\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -587,8 +587,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       OutputDirectory="vc9_mswu"\r
+                       IntermediateDirectory="vc9_mswu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -613,17 +613,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswu\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswu\test_gui\"\r
+                               ObjectFile="vc9_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -635,7 +635,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -643,14 +643,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_core.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"\r
-                               OutputFile="vc_mswu\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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"\r
+                               OutputFile="vc9_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -665,7 +665,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswu\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -680,8 +680,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       OutputDirectory="vc9_mswud"\r
+                       IntermediateDirectory="vc9_mswud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -706,7 +706,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;.;.\..\samples"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -715,10 +715,10 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc9_mswud\testprec_test_gui.pch"\r
+                               AssemblerListingLocation="vc9_mswud\test_gui\"\r
+                               ObjectFile="vc9_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc9_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -730,7 +730,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -738,14 +738,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_core.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"\r
-                               OutputFile="vc_mswud\test_gui.exe"\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.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"\r
+                               OutputFile="vc9_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc9_mswud\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -760,7 +760,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
+                               OutputFile="vc9_mswud\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -867,6 +867,10 @@
                                RelativePath=".\misc\guifuncs.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlwindow.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                                >\r
wxWidgets (Impactor)