Update to Bakefile 0.2.8.

[wxWidgets.git] / build / msw / makefile.vc

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 5560dd63f6d7c88a2311905cd36ee2de671de570..1cefca865271eb7ad9eafa10375c5c5a69dfe028 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -19,8 +19,9 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \

-       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
-       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \

        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \


@@ -28,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 29
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 29

-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1

 COMPILER_PREFIX = vc
 OBJS = \
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
 COMPILER_PREFIX = vc
 OBJS = \
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)


@@ -36,19 +37,19 @@ LIBDIRNAME = \
        ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
        ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include \
-       /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(CPPFLAGS) $(CFLAGS)
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)

 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj

-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \

        /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS)

 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        $(OBJS)\wxzlib_compress.obj \
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        $(OBJS)\wxzlib_compress.obj \


@@ -62,9 +63,10 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infback.obj \
        $(OBJS)\wxzlib_inftrees.obj \
        $(OBJS)\wxzlib_inffast.obj
        $(OBJS)\wxzlib_infback.obj \
        $(OBJS)\wxzlib_inftrees.obj \
        $(OBJS)\wxzlib_inffast.obj

-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \

        /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \
+       $(CFLAGS)

 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        $(OBJS)\wxpng_pngerror.obj \
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        $(OBJS)\wxpng_pngerror.obj \


@@ -83,9 +85,10 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj

-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \

        /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \
+       $(CFLAGS)

 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \


@@ -133,10 +136,10 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj

-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \

        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
-       /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \
+       /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)

 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        $(OBJS)\wxtiff_tif_aux.obj \
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        $(OBJS)\wxtiff_tif_aux.obj \


@@ -174,17 +177,17 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj

-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(LIBDIRNAME) \
-       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)

 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj

-WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \
+WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \

        /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
        /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
        $(CXXFLAGS)
        /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
        /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
        $(CXXFLAGS)


@@ -281,7 +284,7 @@ WXSCINTILLA_OBJECTS =  \
        $(OBJS)\wxscintilla_ViewStyle.obj \
        $(OBJS)\wxscintilla_WindowAccessor.obj \
        $(OBJS)\wxscintilla_XPM.obj
        $(OBJS)\wxscintilla_ViewStyle.obj \
        $(OBJS)\wxscintilla_WindowAccessor.obj \
        $(OBJS)\wxscintilla_XPM.obj

-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -293,7 +296,7 @@ MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
        /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
        $(CFLAGS)
        /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
        $(CFLAGS)

-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -308,6 +311,7 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \

+       $(OBJS)\monodll_any.obj \

        $(OBJS)\monodll_appbase.obj \
        $(OBJS)\monodll_arcall.obj \
        $(OBJS)\monodll_arcfind.obj \
        $(OBJS)\monodll_appbase.obj \
        $(OBJS)\monodll_arcall.obj \
        $(OBJS)\monodll_arcfind.obj \


@@ -387,6 +391,8 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_xtistrm.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_xtistrm.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \

+       $(OBJS)\monodll_fswatchercmn.obj \
+       $(OBJS)\monodll_fswatcherg.obj \

        $(OBJS)\monodll_basemsw.obj \
        $(OBJS)\monodll_crashrpt.obj \
        $(OBJS)\monodll_debughlp.obj \
        $(OBJS)\monodll_basemsw.obj \
        $(OBJS)\monodll_crashrpt.obj \
        $(OBJS)\monodll_debughlp.obj \


@@ -404,6 +410,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \

+       $(OBJS)\monodll_fswatcher.obj \

        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \


@@ -426,9 +433,10 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \
        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \

-       $(OBJS)\monodll_xtixml.obj \
+       $(OBJS)\monodll_xtixml.obj
+MONODLL_RESOURCES =  \

        $(OBJS)\monodll_version.res
        $(OBJS)\monodll_version.res

-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -439,7 +447,7 @@ MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
        /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
        /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
        /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
        /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)

-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -453,6 +461,7 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \

+       $(OBJS)\monolib_any.obj \

        $(OBJS)\monolib_appbase.obj \
        $(OBJS)\monolib_arcall.obj \
        $(OBJS)\monolib_arcfind.obj \
        $(OBJS)\monolib_appbase.obj \
        $(OBJS)\monolib_arcall.obj \
        $(OBJS)\monolib_arcfind.obj \


@@ -532,6 +541,8 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_xtistrm.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_xtistrm.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \

+       $(OBJS)\monolib_fswatchercmn.obj \
+       $(OBJS)\monolib_fswatcherg.obj \

        $(OBJS)\monolib_basemsw.obj \
        $(OBJS)\monolib_crashrpt.obj \
        $(OBJS)\monolib_debughlp.obj \
        $(OBJS)\monolib_basemsw.obj \
        $(OBJS)\monolib_crashrpt.obj \
        $(OBJS)\monolib_debughlp.obj \


@@ -549,6 +560,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \

+       $(OBJS)\monolib_fswatcher.obj \

        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \


@@ -572,7 +584,7 @@ MONOLIB_OBJECTS =  \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_xtixml.obj
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_xtixml.obj

-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -582,7 +594,7 @@ BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
        /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
        /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
        /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
        /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)

-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -595,7 +607,7 @@ BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \

-       $(OBJS)\basedll_version.res \
+       $(OBJS)\basedll_any.obj \

        $(OBJS)\basedll_appbase.obj \
        $(OBJS)\basedll_arcall.obj \
        $(OBJS)\basedll_arcfind.obj \
        $(OBJS)\basedll_appbase.obj \
        $(OBJS)\basedll_arcall.obj \
        $(OBJS)\basedll_arcfind.obj \


@@ -675,6 +687,8 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_xtistrm.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_xtistrm.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \

+       $(OBJS)\basedll_fswatchercmn.obj \
+       $(OBJS)\basedll_fswatcherg.obj \

        $(OBJS)\basedll_basemsw.obj \
        $(OBJS)\basedll_crashrpt.obj \
        $(OBJS)\basedll_debughlp.obj \
        $(OBJS)\basedll_basemsw.obj \
        $(OBJS)\basedll_crashrpt.obj \
        $(OBJS)\basedll_debughlp.obj \


@@ -692,6 +706,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_timer.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
        $(OBJS)\basedll_timer.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \

+       $(OBJS)\basedll_fswatcher.obj \

        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \


@@ -700,7 +715,9 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj

-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_RESOURCES =  \
+       $(OBJS)\basedll_version.res
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -710,7 +727,7 @@ BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
        /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
        /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
        /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
        /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
        /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)

-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -723,6 +740,7 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \

+       $(OBJS)\baselib_any.obj \

        $(OBJS)\baselib_appbase.obj \
        $(OBJS)\baselib_arcall.obj \
        $(OBJS)\baselib_arcfind.obj \
        $(OBJS)\baselib_appbase.obj \
        $(OBJS)\baselib_arcall.obj \
        $(OBJS)\baselib_arcfind.obj \


@@ -802,6 +820,8 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_xtistrm.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_xtistrm.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \

+       $(OBJS)\baselib_fswatchercmn.obj \
+       $(OBJS)\baselib_fswatcherg.obj \

        $(OBJS)\baselib_basemsw.obj \
        $(OBJS)\baselib_crashrpt.obj \
        $(OBJS)\baselib_debughlp.obj \
        $(OBJS)\baselib_basemsw.obj \
        $(OBJS)\baselib_crashrpt.obj \
        $(OBJS)\baselib_debughlp.obj \


@@ -819,6 +839,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_timer.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
        $(OBJS)\baselib_timer.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \

+       $(OBJS)\baselib_fswatcher.obj \

        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \


@@ -827,7 +848,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj

-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -840,7 +861,6 @@ NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \

-       $(OBJS)\netdll_version.res \

        $(OBJS)\netdll_fs_inet.obj \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_fs_inet.obj \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \


@@ -853,7 +873,9 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_sockmsw.obj \
        $(OBJS)\netdll_urlmsw.obj
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_sockmsw.obj \
        $(OBJS)\netdll_urlmsw.obj

-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \
+NETDLL_RESOURCES =  \
+       $(OBJS)\netdll_version.res
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -878,7 +900,7 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_sockmsw.obj \
        $(OBJS)\netlib_urlmsw.obj
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_sockmsw.obj \
        $(OBJS)\netlib_urlmsw.obj

-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -891,7 +913,6 @@ COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \

-       $(OBJS)\coredll_version.res \

        $(OBJS)\coredll_event.obj \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \
        $(OBJS)\coredll_event.obj \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \


@@ -901,7 +922,9 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)

-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_194)$(__DEBUGRUNTIME) /DWIN32 \
+COREDLL_RESOURCES =  \
+       $(OBJS)\coredll_version.res
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -923,7 +946,7 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -936,9 +959,10 @@ ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \

-       $(OBJS)\advdll_version.res \

        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)

-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \
+ADVDLL_RESOURCES =  \
+       $(OBJS)\advdll_version.res
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -952,7 +976,7 @@ ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)

-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -965,12 +989,13 @@ MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_dummy.obj \
        /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_dummy.obj \

-       $(OBJS)\mediadll_version.res \

        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \
        $(OBJS)\mediadll_mediactrl_qt.obj
        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \
        $(OBJS)\mediadll_mediactrl_qt.obj

-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \
+MEDIADLL_RESOURCES =  \
+       $(OBJS)\mediadll_version.res
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -987,7 +1012,7 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
        $(OBJS)\medialib_mediactrl_qt.obj
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
        $(OBJS)\medialib_mediactrl_qt.obj

-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1000,7 +1025,6 @@ HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \

-       $(OBJS)\htmldll_version.res \

        $(OBJS)\htmldll_helpbest.obj \
        $(OBJS)\htmldll_helpctrl.obj \
        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpbest.obj \
        $(OBJS)\htmldll_helpctrl.obj \
        $(OBJS)\htmldll_helpdata.obj \


@@ -1025,7 +1049,9 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj
        $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj

-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLDLL_RESOURCES =  \
+       $(OBJS)\htmldll_version.res
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1062,7 +1088,7 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj

-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1075,10 +1101,11 @@ QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(OBJS)\qadll_dummy.obj \
        /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(OBJS)\qadll_dummy.obj \

-       $(OBJS)\qadll_version.res \

        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj
        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj

-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_RESOURCES =  \
+       $(OBJS)\qadll_version.res
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1093,7 +1120,7 @@ QALIB_OBJECTS =  \
        $(OBJS)\qalib_dummy.obj \
        $(OBJS)\qalib_debugrpt.obj \
        $(OBJS)\qalib_dbgrptg.obj
        $(OBJS)\qalib_dummy.obj \
        $(OBJS)\qalib_debugrpt.obj \
        $(OBJS)\qalib_dbgrptg.obj

-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1106,10 +1133,11 @@ XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \

-       $(OBJS)\xmldll_version.res \

        $(OBJS)\xmldll_xml.obj \
        $(OBJS)\xmldll_xtixml.obj
        $(OBJS)\xmldll_xml.obj \
        $(OBJS)\xmldll_xtixml.obj

-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_RESOURCES =  \
+       $(OBJS)\xmldll_version.res
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1124,7 +1152,7 @@ XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj \
        $(OBJS)\xmllib_xtixml.obj
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj \
        $(OBJS)\xmllib_xtixml.obj

-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1137,7 +1165,6 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \

-       $(OBJS)\xrcdll_version.res \

        $(OBJS)\xrcdll_xh_animatctrl.obj \
        $(OBJS)\xrcdll_xh_bmp.obj \
        $(OBJS)\xrcdll_xh_bmpcbox.obj \
        $(OBJS)\xrcdll_xh_animatctrl.obj \
        $(OBJS)\xrcdll_xh_bmp.obj \
        $(OBJS)\xrcdll_xh_bmpcbox.obj \


@@ -1199,7 +1226,9 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xmlres.obj \
        $(OBJS)\xrcdll_xmladv.obj \
        $(OBJS)\xrcdll_xmlrsall.obj
        $(OBJS)\xrcdll_xmlres.obj \
        $(OBJS)\xrcdll_xmladv.obj \
        $(OBJS)\xrcdll_xmlrsall.obj

-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_RESOURCES =  \
+       $(OBJS)\xrcdll_version.res
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1273,7 +1302,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xmlres.obj \
        $(OBJS)\xrclib_xmladv.obj \
        $(OBJS)\xrclib_xmlrsall.obj
        $(OBJS)\xrclib_xmlres.obj \
        $(OBJS)\xrclib_xmladv.obj \
        $(OBJS)\xrclib_xmlrsall.obj

-AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1286,14 +1315,15 @@ AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dummy.obj \
        /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dummy.obj \

-       $(OBJS)\auidll_version.res \

        $(OBJS)\auidll_framemanager.obj \
        $(OBJS)\auidll_dockart.obj \
        $(OBJS)\auidll_floatpane.obj \
        $(OBJS)\auidll_auibook.obj \
        $(OBJS)\auidll_auibar.obj \
        $(OBJS)\auidll_tabmdi.obj
        $(OBJS)\auidll_framemanager.obj \
        $(OBJS)\auidll_dockart.obj \
        $(OBJS)\auidll_floatpane.obj \
        $(OBJS)\auidll_auibook.obj \
        $(OBJS)\auidll_auibar.obj \
        $(OBJS)\auidll_tabmdi.obj

-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_RESOURCES =  \
+       $(OBJS)\auidll_version.res
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1312,7 +1342,55 @@ AUILIB_OBJECTS =  \
        $(OBJS)\auilib_auibook.obj \
        $(OBJS)\auilib_auibar.obj \
        $(OBJS)\auilib_tabmdi.obj
        $(OBJS)\auilib_auibook.obj \
        $(OBJS)\auilib_auibar.obj \
        $(OBJS)\auilib_tabmdi.obj

-PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)
+RIBBONDLL_OBJECTS =  \
+       $(OBJS)\ribbondll_dummy.obj \
+       $(OBJS)\ribbondll_art_internal.obj \
+       $(OBJS)\ribbondll_art_msw.obj \
+       $(OBJS)\ribbondll_art_aui.obj \
+       $(OBJS)\ribbondll_bar.obj \
+       $(OBJS)\ribbondll_buttonbar.obj \
+       $(OBJS)\ribbondll_control.obj \
+       $(OBJS)\ribbondll_gallery.obj \
+       $(OBJS)\ribbondll_page.obj \
+       $(OBJS)\ribbondll_panel.obj \
+       $(OBJS)\ribbondll_toolbar.obj
+RIBBONDLL_RESOURCES =  \
+       $(OBJS)\ribbondll_version.res
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+RIBBONLIB_OBJECTS =  \
+       $(OBJS)\ribbonlib_dummy.obj \
+       $(OBJS)\ribbonlib_art_internal.obj \
+       $(OBJS)\ribbonlib_art_msw.obj \
+       $(OBJS)\ribbonlib_art_aui.obj \
+       $(OBJS)\ribbonlib_bar.obj \
+       $(OBJS)\ribbonlib_buttonbar.obj \
+       $(OBJS)\ribbonlib_control.obj \
+       $(OBJS)\ribbonlib_gallery.obj \
+       $(OBJS)\ribbonlib_page.obj \
+       $(OBJS)\ribbonlib_panel.obj \
+       $(OBJS)\ribbonlib_toolbar.obj
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1325,7 +1403,6 @@ PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
 PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_dummy.obj \
        /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
 PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_dummy.obj \

-       $(OBJS)\propgriddll_version.res \

        $(OBJS)\propgriddll_advprops.obj \
        $(OBJS)\propgriddll_editors.obj \
        $(OBJS)\propgriddll_manager.obj \
        $(OBJS)\propgriddll_advprops.obj \
        $(OBJS)\propgriddll_editors.obj \
        $(OBJS)\propgriddll_manager.obj \


@@ -1334,7 +1411,9 @@ PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_propgridiface.obj \
        $(OBJS)\propgriddll_propgridpagestate.obj \
        $(OBJS)\propgriddll_props.obj
        $(OBJS)\propgriddll_propgridiface.obj \
        $(OBJS)\propgriddll_propgridpagestate.obj \
        $(OBJS)\propgriddll_props.obj

-PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
+PROPGRIDDLL_RESOURCES =  \
+       $(OBJS)\propgriddll_version.res
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1355,7 +1434,7 @@ PROPGRIDLIB_OBJECTS =  \
        $(OBJS)\propgridlib_propgridiface.obj \
        $(OBJS)\propgridlib_propgridpagestate.obj \
        $(OBJS)\propgridlib_props.obj
        $(OBJS)\propgridlib_propgridiface.obj \
        $(OBJS)\propgridlib_propgridpagestate.obj \
        $(OBJS)\propgridlib_props.obj

-RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1368,7 +1447,6 @@ RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_dummy.obj \

-       $(OBJS)\richtextdll_version.res \

        $(OBJS)\richtextdll_richtextctrl.obj \
        $(OBJS)\richtextdll_richtextbuffer.obj \
        $(OBJS)\richtextdll_richtextstyles.obj \
        $(OBJS)\richtextdll_richtextctrl.obj \
        $(OBJS)\richtextdll_richtextbuffer.obj \
        $(OBJS)\richtextdll_richtextstyles.obj \


@@ -1378,7 +1456,9 @@ RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_richtextsymboldlg.obj \
        $(OBJS)\richtextdll_richtextstyledlg.obj \
        $(OBJS)\richtextdll_richtextprint.obj
        $(OBJS)\richtextdll_richtextsymboldlg.obj \
        $(OBJS)\richtextdll_richtextstyledlg.obj \
        $(OBJS)\richtextdll_richtextprint.obj

-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTDLL_RESOURCES =  \
+       $(OBJS)\richtextdll_version.res
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1400,7 +1480,7 @@ RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj

-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1415,11 +1495,12 @@ STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
        $(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_dummy.obj \
        $(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_dummy.obj \

-       $(OBJS)\stcdll_version.res \

        $(OBJS)\stcdll_stc.obj \
        $(OBJS)\stcdll_PlatWX.obj \
        $(OBJS)\stcdll_ScintillaWX.obj
        $(OBJS)\stcdll_stc.obj \
        $(OBJS)\stcdll_PlatWX.obj \
        $(OBJS)\stcdll_ScintillaWX.obj

-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_RESOURCES =  \
+       $(OBJS)\stcdll_version.res
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1436,7 +1517,7 @@ STCLIB_OBJECTS =  \
        $(OBJS)\stclib_stc.obj \
        $(OBJS)\stclib_PlatWX.obj \
        $(OBJS)\stclib_ScintillaWX.obj
        $(OBJS)\stclib_stc.obj \
        $(OBJS)\stclib_PlatWX.obj \
        $(OBJS)\stclib_ScintillaWX.obj

-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1449,10 +1530,11 @@ GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
        /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \

-       $(OBJS)\gldll_version.res \

        $(OBJS)\gldll_glcmn.obj \
        $(OBJS)\gldll_glcanvas.obj
        $(OBJS)\gldll_glcmn.obj \
        $(OBJS)\gldll_glcanvas.obj

-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_491)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_RESOURCES =  \
+       $(OBJS)\gldll_version.res
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \


@@ -1483,10 +1565,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"

 WXDEBUGFLAG = d
 !endif
 WXDEBUGFLAG = d
 !endif

-!if "$(DEBUG_FLAG)" == "1"
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(UNICODE)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(UNICODE)" == "1"


@@ -1529,55 +1611,55 @@ LINK_TARGET_CPU = /MACHINE:AMD64
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_8 = D
+__RUNTIME_LIBS_10 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_21 = D
+__RUNTIME_LIBS_25 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_21 = $(__THREADSFLAG)
+__RUNTIME_LIBS_25 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1"
 __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(USE_GUI)" == "1"
 __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_34 = D
+__RUNTIME_LIBS_40 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_34 = $(__THREADSFLAG)
+__RUNTIME_LIBS_40 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1"
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(USE_GUI)" == "1"
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_47 = D
+__RUNTIME_LIBS_55 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_47 = $(__THREADSFLAG)
+__RUNTIME_LIBS_55 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_60 = D
+__RUNTIME_LIBS_70 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_60 = $(__THREADSFLAG)
+__RUNTIME_LIBS_70 = $(__THREADSFLAG)

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_73 = D
+__RUNTIME_LIBS_85 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_73 = $(__THREADSFLAG)
+__RUNTIME_LIBS_85 = $(__THREADSFLAG)

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_86 = D
+__RUNTIME_LIBS_100 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_86 = $(__THREADSFLAG)
+__RUNTIME_LIBS_100 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 


@@ -1589,11 +1671,23 @@ EXTRALIBS_FOR_BASE =
 __monodll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 __monodll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_100 = D
+__RUNTIME_LIBS_116 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_100 = $(__THREADSFLAG)
+__RUNTIME_LIBS_116 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \


@@ -1704,6 +1798,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_propgridiface.obj \
        $(OBJS)\monodll_propgridpagestate.obj \
        $(OBJS)\monodll_props.obj \
        $(OBJS)\monodll_propgridiface.obj \
        $(OBJS)\monodll_propgridpagestate.obj \
        $(OBJS)\monodll_props.obj \

+       $(OBJS)\monodll_art_internal.obj \
+       $(OBJS)\monodll_art_msw.obj \
+       $(OBJS)\monodll_art_aui.obj \
+       $(OBJS)\monodll_bar.obj \
+       $(OBJS)\monodll_ribbon_buttonbar.obj \
+       $(OBJS)\monodll_ribbon_control.obj \
+       $(OBJS)\monodll_gallery.obj \
+       $(OBJS)\monodll_page.obj \
+       $(OBJS)\monodll_panel.obj \
+       $(OBJS)\monodll_ribbon_toolbar.obj \

        $(OBJS)\monodll_richtextctrl.obj \
        $(OBJS)\monodll_richtextbuffer.obj \
        $(OBJS)\monodll_richtextstyles.obj \
        $(OBJS)\monodll_richtextctrl.obj \
        $(OBJS)\monodll_richtextbuffer.obj \
        $(OBJS)\monodll_richtextstyles.obj \


@@ -1772,56 +1876,56 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_filepickerg.obj \
        $(OBJS)\monodll_fontpickerg.obj \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_filepickerg.obj \
        $(OBJS)\monodll_fontpickerg.obj \

-       $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \

        $(OBJS)\monodll_prntdlgg.obj \
        $(OBJS)\monodll_prntdlgg.obj \

-       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_msw_accel.obj \

        $(OBJS)\monodll_artmsw.obj \
        $(OBJS)\monodll_artmsw.obj \

-       $(OBJS)\monodll_bmpbuttn.obj \
-       $(OBJS)\monodll_button.obj \
-       $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_choice.obj \
+       $(OBJS)\monodll_msw_bmpbuttn.obj \
+       $(OBJS)\monodll_msw_button.obj \
+       $(OBJS)\monodll_msw_checkbox.obj \
+       $(OBJS)\monodll_msw_choice.obj \

        $(OBJS)\monodll_colordlg.obj \
        $(OBJS)\monodll_combo.obj \
        $(OBJS)\monodll_colordlg.obj \
        $(OBJS)\monodll_combo.obj \

-       $(OBJS)\monodll_combobox.obj \
-       $(OBJS)\monodll_control.obj \
-       $(OBJS)\monodll_dialog.obj \
+       $(OBJS)\monodll_msw_combobox.obj \
+       $(OBJS)\monodll_msw_control.obj \
+       $(OBJS)\monodll_msw_dialog.obj \

        $(OBJS)\monodll_dirdlg.obj \
        $(OBJS)\monodll_dragimag.obj \
        $(OBJS)\monodll_filedlg.obj \
        $(OBJS)\monodll_frame.obj \
        $(OBJS)\monodll_dirdlg.obj \
        $(OBJS)\monodll_dragimag.obj \
        $(OBJS)\monodll_filedlg.obj \
        $(OBJS)\monodll_frame.obj \

-       $(OBJS)\monodll_gauge.obj \
+       $(OBJS)\monodll_msw_gauge.obj \

        $(OBJS)\monodll_headerctrl.obj \
        $(OBJS)\monodll_iniconf.obj \
        $(OBJS)\monodll_headerctrl.obj \
        $(OBJS)\monodll_iniconf.obj \

-       $(OBJS)\monodll_listbox.obj \
-       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_msw_listbox.obj \
+       $(OBJS)\monodll_msw_listctrl.obj \

        $(OBJS)\monodll_mdi.obj \
        $(OBJS)\monodll_mdi.obj \

-       $(OBJS)\monodll_menu.obj \
+       $(OBJS)\monodll_msw_menu.obj \

        $(OBJS)\monodll_menuitem.obj \
        $(OBJS)\monodll_metafile.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_nativewin.obj \
        $(OBJS)\monodll_menuitem.obj \
        $(OBJS)\monodll_metafile.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_nativewin.obj \

-       $(OBJS)\monodll_notebook.obj \
+       $(OBJS)\monodll_msw_notebook.obj \

        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \

-       $(OBJS)\monodll_radiobox.obj \
-       $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_scrolbar.obj \
-       $(OBJS)\monodll_slider.obj \
-       $(OBJS)\monodll_spinbutt.obj \
+       $(OBJS)\monodll_msw_radiobox.obj \
+       $(OBJS)\monodll_msw_radiobut.obj \
+       $(OBJS)\monodll_msw_scrolbar.obj \
+       $(OBJS)\monodll_msw_slider.obj \
+       $(OBJS)\monodll_msw_spinbutt.obj \

        $(OBJS)\monodll_spinctrl.obj \
        $(OBJS)\monodll_spinctrl.obj \

-       $(OBJS)\monodll_statbmp.obj \
-       $(OBJS)\monodll_statbox.obj \
+       $(OBJS)\monodll_msw_statbmp.obj \
+       $(OBJS)\monodll_msw_statbox.obj \

        $(OBJS)\monodll_statusbar.obj \
        $(OBJS)\monodll_statusbar.obj \

-       $(OBJS)\monodll_statline.obj \
-       $(OBJS)\monodll_stattext.obj \
-       $(OBJS)\monodll_toolbar.obj \
-       $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_msw_statline.obj \
+       $(OBJS)\monodll_msw_stattext.obj \
+       $(OBJS)\monodll_msw_toolbar.obj \
+       $(OBJS)\monodll_msw_textctrl.obj \

        $(OBJS)\monodll_textentry.obj \
        $(OBJS)\monodll_textentry.obj \

-       $(OBJS)\monodll_tglbtn.obj \
+       $(OBJS)\monodll_msw_tglbtn.obj \

        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_treectrl.obj \

-       $(OBJS)\monodll_checklst.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_msw_checklst.obj \
+       $(OBJS)\monodll_msw_fdrepdlg.obj \

        $(OBJS)\monodll_fontdlg.obj \
        $(OBJS)\monodll_accelcmn.obj \
        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_fontdlg.obj \
        $(OBJS)\monodll_accelcmn.obj \
        $(OBJS)\monodll_accesscmn.obj \


@@ -1928,7 +2032,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \

-       $(OBJS)\monodll_buttonbar.obj \
+       $(OBJS)\monodll_generic_buttonbar.obj \

        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_combog.obj \


@@ -2010,54 +2114,54 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \

-       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_generic_accel.obj \

        $(OBJS)\monodll_clrpickerg.obj \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_clrpickerg.obj \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \

-       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \

        $(OBJS)\monodll_filedlgg.obj \
        $(OBJS)\monodll_filepickerg.obj \
        $(OBJS)\monodll_fontdlgg.obj \
        $(OBJS)\monodll_fontpickerg.obj \
        $(OBJS)\monodll_filedlgg.obj \
        $(OBJS)\monodll_filepickerg.obj \
        $(OBJS)\monodll_fontdlgg.obj \
        $(OBJS)\monodll_fontpickerg.obj \

-       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \

        $(OBJS)\monodll_mdig.obj \
        $(OBJS)\monodll_msgdlgg.obj \
        $(OBJS)\monodll_prntdlgg.obj \
        $(OBJS)\monodll_mdig.obj \
        $(OBJS)\monodll_msgdlgg.obj \
        $(OBJS)\monodll_prntdlgg.obj \

-       $(OBJS)\monodll_bmpbuttn.obj \
-       $(OBJS)\monodll_button.obj \
-       $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_checklst.obj \
-       $(OBJS)\monodll_choice.obj \
-       $(OBJS)\monodll_combobox.obj \
-       $(OBJS)\monodll_control.obj \
+       $(OBJS)\monodll_univ_bmpbuttn.obj \
+       $(OBJS)\monodll_univ_button.obj \
+       $(OBJS)\monodll_univ_checkbox.obj \
+       $(OBJS)\monodll_univ_checklst.obj \
+       $(OBJS)\monodll_univ_choice.obj \
+       $(OBJS)\monodll_univ_combobox.obj \
+       $(OBJS)\monodll_univ_control.obj \

        $(OBJS)\monodll_ctrlrend.obj \
        $(OBJS)\monodll_ctrlrend.obj \

-       $(OBJS)\monodll_dialog.obj \
+       $(OBJS)\monodll_univ_dialog.obj \

        $(OBJS)\monodll_framuniv.obj \
        $(OBJS)\monodll_framuniv.obj \

-       $(OBJS)\monodll_gauge.obj \
+       $(OBJS)\monodll_univ_gauge.obj \

        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \

-       $(OBJS)\monodll_listbox.obj \
-       $(OBJS)\monodll_menu.obj \
-       $(OBJS)\monodll_notebook.obj \
-       $(OBJS)\monodll_radiobox.obj \
-       $(OBJS)\monodll_radiobut.obj \
+       $(OBJS)\monodll_univ_listbox.obj \
+       $(OBJS)\monodll_univ_menu.obj \
+       $(OBJS)\monodll_univ_notebook.obj \
+       $(OBJS)\monodll_univ_radiobox.obj \
+       $(OBJS)\monodll_univ_radiobut.obj \

        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrarrow.obj \

-       $(OBJS)\monodll_scrolbar.obj \
+       $(OBJS)\monodll_univ_scrolbar.obj \

        $(OBJS)\monodll_scrthumb.obj \
        $(OBJS)\monodll_settingsuniv.obj \
        $(OBJS)\monodll_scrthumb.obj \
        $(OBJS)\monodll_settingsuniv.obj \

-       $(OBJS)\monodll_slider.obj \
-       $(OBJS)\monodll_spinbutt.obj \
-       $(OBJS)\monodll_statbmp.obj \
-       $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statline.obj \
-       $(OBJS)\monodll_stattext.obj \
-       $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_univ_slider.obj \
+       $(OBJS)\monodll_univ_spinbutt.obj \
+       $(OBJS)\monodll_univ_statbmp.obj \
+       $(OBJS)\monodll_univ_statbox.obj \
+       $(OBJS)\monodll_univ_statline.obj \
+       $(OBJS)\monodll_univ_stattext.obj \
+       $(OBJS)\monodll_univ_statusbr.obj \

        $(OBJS)\monodll_stdrend.obj \
        $(OBJS)\monodll_stdrend.obj \

-       $(OBJS)\monodll_textctrl.obj \
-       $(OBJS)\monodll_tglbtn.obj \
+       $(OBJS)\monodll_univ_textctrl.obj \
+       $(OBJS)\monodll_univ_tglbtn.obj \

        $(OBJS)\monodll_theme.obj \
        $(OBJS)\monodll_theme.obj \

-       $(OBJS)\monodll_toolbar.obj \
+       $(OBJS)\monodll_univ_toolbar.obj \

        $(OBJS)\monodll_topluniv.obj \
        $(OBJS)\monodll_winuniv.obj \
        $(OBJS)\monodll_gtk.obj \
        $(OBJS)\monodll_topluniv.obj \
        $(OBJS)\monodll_winuniv.obj \
        $(OBJS)\monodll_gtk.obj \


@@ -2169,7 +2273,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \

-       $(OBJS)\monodll_buttonbar.obj \
+       $(OBJS)\monodll_generic_buttonbar.obj \

        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_combog.obj \


@@ -2219,6 +2323,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_hyperlinkg.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_hyperlinkg.obj \

+       $(OBJS)\monodll_infobar.obj \

        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_notifmsgg.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_notifmsgg.obj \
        $(OBJS)\monodll_odcombo.obj \


@@ -2258,6 +2363,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_hyperlinkg.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_hyperlinkg.obj \

+       $(OBJS)\monodll_infobar.obj \

        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_notifmsgg.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_notifmsgg.obj \
        $(OBJS)\monodll_odcombo.obj \


@@ -2282,10 +2388,10 @@ __monolib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_113 = D
+__RUNTIME_LIBS_131 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_113 = $(__THREADSFLAG)
+__RUNTIME_LIBS_131 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \


@@ -2396,6 +2502,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_propgridiface.obj \
        $(OBJS)\monolib_propgridpagestate.obj \
        $(OBJS)\monolib_props.obj \
        $(OBJS)\monolib_propgridiface.obj \
        $(OBJS)\monolib_propgridpagestate.obj \
        $(OBJS)\monolib_props.obj \

+       $(OBJS)\monolib_art_internal.obj \
+       $(OBJS)\monolib_art_msw.obj \
+       $(OBJS)\monolib_art_aui.obj \
+       $(OBJS)\monolib_bar.obj \
+       $(OBJS)\monolib_ribbon_buttonbar.obj \
+       $(OBJS)\monolib_ribbon_control.obj \
+       $(OBJS)\monolib_gallery.obj \
+       $(OBJS)\monolib_page.obj \
+       $(OBJS)\monolib_panel.obj \
+       $(OBJS)\monolib_ribbon_toolbar.obj \

        $(OBJS)\monolib_richtextctrl.obj \
        $(OBJS)\monolib_richtextbuffer.obj \
        $(OBJS)\monolib_richtextstyles.obj \
        $(OBJS)\monolib_richtextctrl.obj \
        $(OBJS)\monolib_richtextbuffer.obj \
        $(OBJS)\monolib_richtextstyles.obj \


@@ -2464,56 +2580,56 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_filepickerg.obj \
        $(OBJS)\monolib_fontpickerg.obj \
        $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_filepickerg.obj \
        $(OBJS)\monolib_fontpickerg.obj \

-       $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \

        $(OBJS)\monolib_prntdlgg.obj \
        $(OBJS)\monolib_prntdlgg.obj \

-       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_msw_accel.obj \

        $(OBJS)\monolib_artmsw.obj \
        $(OBJS)\monolib_artmsw.obj \

-       $(OBJS)\monolib_bmpbuttn.obj \
-       $(OBJS)\monolib_button.obj \
-       $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_choice.obj \
+       $(OBJS)\monolib_msw_bmpbuttn.obj \
+       $(OBJS)\monolib_msw_button.obj \
+       $(OBJS)\monolib_msw_checkbox.obj \
+       $(OBJS)\monolib_msw_choice.obj \

        $(OBJS)\monolib_colordlg.obj \
        $(OBJS)\monolib_combo.obj \
        $(OBJS)\monolib_colordlg.obj \
        $(OBJS)\monolib_combo.obj \

-       $(OBJS)\monolib_combobox.obj \
-       $(OBJS)\monolib_control.obj \
-       $(OBJS)\monolib_dialog.obj \
+       $(OBJS)\monolib_msw_combobox.obj \
+       $(OBJS)\monolib_msw_control.obj \
+       $(OBJS)\monolib_msw_dialog.obj \

        $(OBJS)\monolib_dirdlg.obj \
        $(OBJS)\monolib_dragimag.obj \
        $(OBJS)\monolib_filedlg.obj \
        $(OBJS)\monolib_frame.obj \
        $(OBJS)\monolib_dirdlg.obj \
        $(OBJS)\monolib_dragimag.obj \
        $(OBJS)\monolib_filedlg.obj \
        $(OBJS)\monolib_frame.obj \

-       $(OBJS)\monolib_gauge.obj \
+       $(OBJS)\monolib_msw_gauge.obj \

        $(OBJS)\monolib_headerctrl.obj \
        $(OBJS)\monolib_iniconf.obj \
        $(OBJS)\monolib_headerctrl.obj \
        $(OBJS)\monolib_iniconf.obj \

-       $(OBJS)\monolib_listbox.obj \
-       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_msw_listbox.obj \
+       $(OBJS)\monolib_msw_listctrl.obj \

        $(OBJS)\monolib_mdi.obj \
        $(OBJS)\monolib_mdi.obj \

-       $(OBJS)\monolib_menu.obj \
+       $(OBJS)\monolib_msw_menu.obj \

        $(OBJS)\monolib_menuitem.obj \
        $(OBJS)\monolib_metafile.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_nativewin.obj \
        $(OBJS)\monolib_menuitem.obj \
        $(OBJS)\monolib_metafile.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_nativewin.obj \

-       $(OBJS)\monolib_notebook.obj \
+       $(OBJS)\monolib_msw_notebook.obj \

        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \

-       $(OBJS)\monolib_radiobox.obj \
-       $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_scrolbar.obj \
-       $(OBJS)\monolib_slider.obj \
-       $(OBJS)\monolib_spinbutt.obj \
+       $(OBJS)\monolib_msw_radiobox.obj \
+       $(OBJS)\monolib_msw_radiobut.obj \
+       $(OBJS)\monolib_msw_scrolbar.obj \
+       $(OBJS)\monolib_msw_slider.obj \
+       $(OBJS)\monolib_msw_spinbutt.obj \

        $(OBJS)\monolib_spinctrl.obj \
        $(OBJS)\monolib_spinctrl.obj \

-       $(OBJS)\monolib_statbmp.obj \
-       $(OBJS)\monolib_statbox.obj \
+       $(OBJS)\monolib_msw_statbmp.obj \
+       $(OBJS)\monolib_msw_statbox.obj \

        $(OBJS)\monolib_statusbar.obj \
        $(OBJS)\monolib_statusbar.obj \

-       $(OBJS)\monolib_statline.obj \
-       $(OBJS)\monolib_stattext.obj \
-       $(OBJS)\monolib_toolbar.obj \
-       $(OBJS)\monolib_textctrl.obj \
+       $(OBJS)\monolib_msw_statline.obj \
+       $(OBJS)\monolib_msw_stattext.obj \
+       $(OBJS)\monolib_msw_toolbar.obj \
+       $(OBJS)\monolib_msw_textctrl.obj \

        $(OBJS)\monolib_textentry.obj \
        $(OBJS)\monolib_textentry.obj \

-       $(OBJS)\monolib_tglbtn.obj \
+       $(OBJS)\monolib_msw_tglbtn.obj \

        $(OBJS)\monolib_treectrl.obj \
        $(OBJS)\monolib_treectrl.obj \

-       $(OBJS)\monolib_checklst.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_msw_checklst.obj \
+       $(OBJS)\monolib_msw_fdrepdlg.obj \

        $(OBJS)\monolib_fontdlg.obj \
        $(OBJS)\monolib_accelcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_fontdlg.obj \
        $(OBJS)\monolib_accelcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \


@@ -2620,7 +2736,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \

-       $(OBJS)\monolib_buttonbar.obj \
+       $(OBJS)\monolib_generic_buttonbar.obj \

        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_combog.obj \


@@ -2702,54 +2818,54 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \

-       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_generic_accel.obj \

        $(OBJS)\monolib_clrpickerg.obj \
        $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \
        $(OBJS)\monolib_clrpickerg.obj \
        $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \

-       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \

        $(OBJS)\monolib_filedlgg.obj \
        $(OBJS)\monolib_filepickerg.obj \
        $(OBJS)\monolib_fontdlgg.obj \
        $(OBJS)\monolib_fontpickerg.obj \
        $(OBJS)\monolib_filedlgg.obj \
        $(OBJS)\monolib_filepickerg.obj \
        $(OBJS)\monolib_fontdlgg.obj \
        $(OBJS)\monolib_fontpickerg.obj \

-       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \

        $(OBJS)\monolib_mdig.obj \
        $(OBJS)\monolib_msgdlgg.obj \
        $(OBJS)\monolib_prntdlgg.obj \
        $(OBJS)\monolib_mdig.obj \
        $(OBJS)\monolib_msgdlgg.obj \
        $(OBJS)\monolib_prntdlgg.obj \

-       $(OBJS)\monolib_bmpbuttn.obj \
-       $(OBJS)\monolib_button.obj \
-       $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_checklst.obj \
-       $(OBJS)\monolib_choice.obj \
-       $(OBJS)\monolib_combobox.obj \
-       $(OBJS)\monolib_control.obj \
+       $(OBJS)\monolib_univ_bmpbuttn.obj \
+       $(OBJS)\monolib_univ_button.obj \
+       $(OBJS)\monolib_univ_checkbox.obj \
+       $(OBJS)\monolib_univ_checklst.obj \
+       $(OBJS)\monolib_univ_choice.obj \
+       $(OBJS)\monolib_univ_combobox.obj \
+       $(OBJS)\monolib_univ_control.obj \

        $(OBJS)\monolib_ctrlrend.obj \
        $(OBJS)\monolib_ctrlrend.obj \

-       $(OBJS)\monolib_dialog.obj \
+       $(OBJS)\monolib_univ_dialog.obj \

        $(OBJS)\monolib_framuniv.obj \
        $(OBJS)\monolib_framuniv.obj \

-       $(OBJS)\monolib_gauge.obj \
+       $(OBJS)\monolib_univ_gauge.obj \

        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \

-       $(OBJS)\monolib_listbox.obj \
-       $(OBJS)\monolib_menu.obj \
-       $(OBJS)\monolib_notebook.obj \
-       $(OBJS)\monolib_radiobox.obj \
-       $(OBJS)\monolib_radiobut.obj \
+       $(OBJS)\monolib_univ_listbox.obj \
+       $(OBJS)\monolib_univ_menu.obj \
+       $(OBJS)\monolib_univ_notebook.obj \
+       $(OBJS)\monolib_univ_radiobox.obj \
+       $(OBJS)\monolib_univ_radiobut.obj \

        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrarrow.obj \

-       $(OBJS)\monolib_scrolbar.obj \
+       $(OBJS)\monolib_univ_scrolbar.obj \

        $(OBJS)\monolib_scrthumb.obj \
        $(OBJS)\monolib_settingsuniv.obj \
        $(OBJS)\monolib_scrthumb.obj \
        $(OBJS)\monolib_settingsuniv.obj \

-       $(OBJS)\monolib_slider.obj \
-       $(OBJS)\monolib_spinbutt.obj \
-       $(OBJS)\monolib_statbmp.obj \
-       $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statline.obj \
-       $(OBJS)\monolib_stattext.obj \
-       $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_univ_slider.obj \
+       $(OBJS)\monolib_univ_spinbutt.obj \
+       $(OBJS)\monolib_univ_statbmp.obj \
+       $(OBJS)\monolib_univ_statbox.obj \
+       $(OBJS)\monolib_univ_statline.obj \
+       $(OBJS)\monolib_univ_stattext.obj \
+       $(OBJS)\monolib_univ_statusbr.obj \

        $(OBJS)\monolib_stdrend.obj \
        $(OBJS)\monolib_stdrend.obj \

-       $(OBJS)\monolib_textctrl.obj \
-       $(OBJS)\monolib_tglbtn.obj \
+       $(OBJS)\monolib_univ_textctrl.obj \
+       $(OBJS)\monolib_univ_tglbtn.obj \

        $(OBJS)\monolib_theme.obj \
        $(OBJS)\monolib_theme.obj \

-       $(OBJS)\monolib_toolbar.obj \
+       $(OBJS)\monolib_univ_toolbar.obj \

        $(OBJS)\monolib_topluniv.obj \
        $(OBJS)\monolib_winuniv.obj \
        $(OBJS)\monolib_gtk.obj \
        $(OBJS)\monolib_topluniv.obj \
        $(OBJS)\monolib_winuniv.obj \
        $(OBJS)\monolib_gtk.obj \


@@ -2861,7 +2977,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \

-       $(OBJS)\monolib_buttonbar.obj \
+       $(OBJS)\monolib_generic_buttonbar.obj \

        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_combog.obj \


@@ -2911,6 +3027,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \

+       $(OBJS)\monolib_infobar.obj \

        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \


@@ -2950,6 +3067,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \

+       $(OBJS)\monolib_infobar.obj \

        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \


@@ -2970,21 +3088,33 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_127 = D
+__RUNTIME_LIBS_147 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_127 = $(__THREADSFLAG)
+__RUNTIME_LIBS_147 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __baselib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __baselib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_140 = D
+__RUNTIME_LIBS_162 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_140 = $(__THREADSFLAG)
+__RUNTIME_LIBS_162 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxbase_namedll_DEP = $(__basedll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxbase_namedll_DEP = $(__basedll___depname)


@@ -2996,21 +3126,33 @@ ____wxbase_namelib_DEP = $(__baselib___depname)
 __netdll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
 !endif
 __netdll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_154 = D
+__RUNTIME_LIBS_178 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_154 = $(__THREADSFLAG)
+__RUNTIME_LIBS_178 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_167 = D
+__RUNTIME_LIBS_193 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_167 = $(__THREADSFLAG)
+__RUNTIME_LIBS_193 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxnet_namedll_DEP = $(__netdll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxnet_namedll_DEP = $(__netdll___depname)


@@ -3022,11 +3164,23 @@ ____wxnet_namelib_DEP = $(__netlib___depname)
 __coredll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
 !endif
 __coredll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_181 = D
+__RUNTIME_LIBS_209 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_181 = $(__THREADSFLAG)
+__RUNTIME_LIBS_209 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \


@@ -3083,56 +3237,56 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_filepickerg.obj \
        $(OBJS)\coredll_fontpickerg.obj \
        $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_filepickerg.obj \
        $(OBJS)\coredll_fontpickerg.obj \

-       $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \

        $(OBJS)\coredll_prntdlgg.obj \
        $(OBJS)\coredll_prntdlgg.obj \

-       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_msw_accel.obj \

        $(OBJS)\coredll_artmsw.obj \
        $(OBJS)\coredll_artmsw.obj \

-       $(OBJS)\coredll_bmpbuttn.obj \
-       $(OBJS)\coredll_button.obj \
-       $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_choice.obj \
+       $(OBJS)\coredll_msw_bmpbuttn.obj \
+       $(OBJS)\coredll_msw_button.obj \
+       $(OBJS)\coredll_msw_checkbox.obj \
+       $(OBJS)\coredll_msw_choice.obj \

        $(OBJS)\coredll_colordlg.obj \
        $(OBJS)\coredll_combo.obj \
        $(OBJS)\coredll_colordlg.obj \
        $(OBJS)\coredll_combo.obj \

-       $(OBJS)\coredll_combobox.obj \
-       $(OBJS)\coredll_control.obj \
-       $(OBJS)\coredll_dialog.obj \
+       $(OBJS)\coredll_msw_combobox.obj \
+       $(OBJS)\coredll_msw_control.obj \
+       $(OBJS)\coredll_msw_dialog.obj \

        $(OBJS)\coredll_dirdlg.obj \
        $(OBJS)\coredll_dragimag.obj \
        $(OBJS)\coredll_filedlg.obj \
        $(OBJS)\coredll_frame.obj \
        $(OBJS)\coredll_dirdlg.obj \
        $(OBJS)\coredll_dragimag.obj \
        $(OBJS)\coredll_filedlg.obj \
        $(OBJS)\coredll_frame.obj \

-       $(OBJS)\coredll_gauge.obj \
+       $(OBJS)\coredll_msw_gauge.obj \

        $(OBJS)\coredll_headerctrl.obj \
        $(OBJS)\coredll_iniconf.obj \
        $(OBJS)\coredll_headerctrl.obj \
        $(OBJS)\coredll_iniconf.obj \

-       $(OBJS)\coredll_listbox.obj \
-       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_msw_listbox.obj \
+       $(OBJS)\coredll_msw_listctrl.obj \

        $(OBJS)\coredll_mdi.obj \
        $(OBJS)\coredll_mdi.obj \

-       $(OBJS)\coredll_menu.obj \
+       $(OBJS)\coredll_msw_menu.obj \

        $(OBJS)\coredll_menuitem.obj \
        $(OBJS)\coredll_metafile.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_nativewin.obj \
        $(OBJS)\coredll_menuitem.obj \
        $(OBJS)\coredll_metafile.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_nativewin.obj \

-       $(OBJS)\coredll_notebook.obj \
+       $(OBJS)\coredll_msw_notebook.obj \

        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \

-       $(OBJS)\coredll_radiobox.obj \
-       $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_scrolbar.obj \
-       $(OBJS)\coredll_slider.obj \
-       $(OBJS)\coredll_spinbutt.obj \
+       $(OBJS)\coredll_msw_radiobox.obj \
+       $(OBJS)\coredll_msw_radiobut.obj \
+       $(OBJS)\coredll_msw_scrolbar.obj \
+       $(OBJS)\coredll_msw_slider.obj \
+       $(OBJS)\coredll_msw_spinbutt.obj \

        $(OBJS)\coredll_spinctrl.obj \
        $(OBJS)\coredll_spinctrl.obj \

-       $(OBJS)\coredll_statbmp.obj \
-       $(OBJS)\coredll_statbox.obj \
+       $(OBJS)\coredll_msw_statbmp.obj \
+       $(OBJS)\coredll_msw_statbox.obj \

        $(OBJS)\coredll_statusbar.obj \
        $(OBJS)\coredll_statusbar.obj \

-       $(OBJS)\coredll_statline.obj \
-       $(OBJS)\coredll_stattext.obj \
-       $(OBJS)\coredll_toolbar.obj \
-       $(OBJS)\coredll_textctrl.obj \
+       $(OBJS)\coredll_msw_statline.obj \
+       $(OBJS)\coredll_msw_stattext.obj \
+       $(OBJS)\coredll_msw_toolbar.obj \
+       $(OBJS)\coredll_msw_textctrl.obj \

        $(OBJS)\coredll_textentry.obj \
        $(OBJS)\coredll_textentry.obj \

-       $(OBJS)\coredll_tglbtn.obj \
+       $(OBJS)\coredll_msw_tglbtn.obj \

        $(OBJS)\coredll_treectrl.obj \
        $(OBJS)\coredll_treectrl.obj \

-       $(OBJS)\coredll_checklst.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_msw_checklst.obj \
+       $(OBJS)\coredll_msw_fdrepdlg.obj \

        $(OBJS)\coredll_fontdlg.obj \
        $(OBJS)\coredll_accelcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_fontdlg.obj \
        $(OBJS)\coredll_accelcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \


@@ -3321,54 +3475,54 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \

-       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_generic_accel.obj \

        $(OBJS)\coredll_clrpickerg.obj \
        $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \
        $(OBJS)\coredll_clrpickerg.obj \
        $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \

-       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \

        $(OBJS)\coredll_filedlgg.obj \
        $(OBJS)\coredll_filepickerg.obj \
        $(OBJS)\coredll_fontdlgg.obj \
        $(OBJS)\coredll_fontpickerg.obj \
        $(OBJS)\coredll_filedlgg.obj \
        $(OBJS)\coredll_filepickerg.obj \
        $(OBJS)\coredll_fontdlgg.obj \
        $(OBJS)\coredll_fontpickerg.obj \

-       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \

        $(OBJS)\coredll_mdig.obj \
        $(OBJS)\coredll_msgdlgg.obj \
        $(OBJS)\coredll_prntdlgg.obj \
        $(OBJS)\coredll_mdig.obj \
        $(OBJS)\coredll_msgdlgg.obj \
        $(OBJS)\coredll_prntdlgg.obj \

-       $(OBJS)\coredll_bmpbuttn.obj \
-       $(OBJS)\coredll_button.obj \
-       $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_checklst.obj \
-       $(OBJS)\coredll_choice.obj \
-       $(OBJS)\coredll_combobox.obj \
-       $(OBJS)\coredll_control.obj \
+       $(OBJS)\coredll_univ_bmpbuttn.obj \
+       $(OBJS)\coredll_univ_button.obj \
+       $(OBJS)\coredll_univ_checkbox.obj \
+       $(OBJS)\coredll_univ_checklst.obj \
+       $(OBJS)\coredll_univ_choice.obj \
+       $(OBJS)\coredll_univ_combobox.obj \
+       $(OBJS)\coredll_univ_control.obj \

        $(OBJS)\coredll_ctrlrend.obj \
        $(OBJS)\coredll_ctrlrend.obj \

-       $(OBJS)\coredll_dialog.obj \
+       $(OBJS)\coredll_univ_dialog.obj \

        $(OBJS)\coredll_framuniv.obj \
        $(OBJS)\coredll_framuniv.obj \

-       $(OBJS)\coredll_gauge.obj \
+       $(OBJS)\coredll_univ_gauge.obj \

        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \

-       $(OBJS)\coredll_listbox.obj \
-       $(OBJS)\coredll_menu.obj \
-       $(OBJS)\coredll_notebook.obj \
-       $(OBJS)\coredll_radiobox.obj \
-       $(OBJS)\coredll_radiobut.obj \
+       $(OBJS)\coredll_univ_listbox.obj \
+       $(OBJS)\coredll_univ_menu.obj \
+       $(OBJS)\coredll_univ_notebook.obj \
+       $(OBJS)\coredll_univ_radiobox.obj \
+       $(OBJS)\coredll_univ_radiobut.obj \

        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrarrow.obj \

-       $(OBJS)\coredll_scrolbar.obj \
+       $(OBJS)\coredll_univ_scrolbar.obj \

        $(OBJS)\coredll_scrthumb.obj \
        $(OBJS)\coredll_settingsuniv.obj \
        $(OBJS)\coredll_scrthumb.obj \
        $(OBJS)\coredll_settingsuniv.obj \

-       $(OBJS)\coredll_slider.obj \
-       $(OBJS)\coredll_spinbutt.obj \
-       $(OBJS)\coredll_statbmp.obj \
-       $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statline.obj \
-       $(OBJS)\coredll_stattext.obj \
-       $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_univ_slider.obj \
+       $(OBJS)\coredll_univ_spinbutt.obj \
+       $(OBJS)\coredll_univ_statbmp.obj \
+       $(OBJS)\coredll_univ_statbox.obj \
+       $(OBJS)\coredll_univ_statline.obj \
+       $(OBJS)\coredll_univ_stattext.obj \
+       $(OBJS)\coredll_univ_statusbr.obj \

        $(OBJS)\coredll_stdrend.obj \
        $(OBJS)\coredll_stdrend.obj \

-       $(OBJS)\coredll_textctrl.obj \
-       $(OBJS)\coredll_tglbtn.obj \
+       $(OBJS)\coredll_univ_textctrl.obj \
+       $(OBJS)\coredll_univ_tglbtn.obj \

        $(OBJS)\coredll_theme.obj \
        $(OBJS)\coredll_theme.obj \

-       $(OBJS)\coredll_toolbar.obj \
+       $(OBJS)\coredll_univ_toolbar.obj \

        $(OBJS)\coredll_topluniv.obj \
        $(OBJS)\coredll_winuniv.obj \
        $(OBJS)\coredll_gtk.obj \
        $(OBJS)\coredll_topluniv.obj \
        $(OBJS)\coredll_winuniv.obj \
        $(OBJS)\coredll_gtk.obj \


@@ -3516,10 +3670,10 @@ __corelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_194 = D
+__RUNTIME_LIBS_224 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_194 = $(__THREADSFLAG)
+__RUNTIME_LIBS_224 = $(__THREADSFLAG)

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \


@@ -3576,56 +3730,56 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_filepickerg.obj \
        $(OBJS)\corelib_fontpickerg.obj \
        $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_filepickerg.obj \
        $(OBJS)\corelib_fontpickerg.obj \

-       $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \

        $(OBJS)\corelib_prntdlgg.obj \
        $(OBJS)\corelib_prntdlgg.obj \

-       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_msw_accel.obj \

        $(OBJS)\corelib_artmsw.obj \
        $(OBJS)\corelib_artmsw.obj \

-       $(OBJS)\corelib_bmpbuttn.obj \
-       $(OBJS)\corelib_button.obj \
-       $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_choice.obj \
+       $(OBJS)\corelib_msw_bmpbuttn.obj \
+       $(OBJS)\corelib_msw_button.obj \
+       $(OBJS)\corelib_msw_checkbox.obj \
+       $(OBJS)\corelib_msw_choice.obj \

        $(OBJS)\corelib_colordlg.obj \
        $(OBJS)\corelib_combo.obj \
        $(OBJS)\corelib_colordlg.obj \
        $(OBJS)\corelib_combo.obj \

-       $(OBJS)\corelib_combobox.obj \
-       $(OBJS)\corelib_control.obj \
-       $(OBJS)\corelib_dialog.obj \
+       $(OBJS)\corelib_msw_combobox.obj \
+       $(OBJS)\corelib_msw_control.obj \
+       $(OBJS)\corelib_msw_dialog.obj \

        $(OBJS)\corelib_dirdlg.obj \
        $(OBJS)\corelib_dragimag.obj \
        $(OBJS)\corelib_filedlg.obj \
        $(OBJS)\corelib_frame.obj \
        $(OBJS)\corelib_dirdlg.obj \
        $(OBJS)\corelib_dragimag.obj \
        $(OBJS)\corelib_filedlg.obj \
        $(OBJS)\corelib_frame.obj \

-       $(OBJS)\corelib_gauge.obj \
+       $(OBJS)\corelib_msw_gauge.obj \

        $(OBJS)\corelib_headerctrl.obj \
        $(OBJS)\corelib_iniconf.obj \
        $(OBJS)\corelib_headerctrl.obj \
        $(OBJS)\corelib_iniconf.obj \

-       $(OBJS)\corelib_listbox.obj \
-       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_msw_listbox.obj \
+       $(OBJS)\corelib_msw_listctrl.obj \

        $(OBJS)\corelib_mdi.obj \
        $(OBJS)\corelib_mdi.obj \

-       $(OBJS)\corelib_menu.obj \
+       $(OBJS)\corelib_msw_menu.obj \

        $(OBJS)\corelib_menuitem.obj \
        $(OBJS)\corelib_metafile.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_nativewin.obj \
        $(OBJS)\corelib_menuitem.obj \
        $(OBJS)\corelib_metafile.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_nativewin.obj \

-       $(OBJS)\corelib_notebook.obj \
+       $(OBJS)\corelib_msw_notebook.obj \

        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \

-       $(OBJS)\corelib_radiobox.obj \
-       $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_scrolbar.obj \
-       $(OBJS)\corelib_slider.obj \
-       $(OBJS)\corelib_spinbutt.obj \
+       $(OBJS)\corelib_msw_radiobox.obj \
+       $(OBJS)\corelib_msw_radiobut.obj \
+       $(OBJS)\corelib_msw_scrolbar.obj \
+       $(OBJS)\corelib_msw_slider.obj \
+       $(OBJS)\corelib_msw_spinbutt.obj \

        $(OBJS)\corelib_spinctrl.obj \
        $(OBJS)\corelib_spinctrl.obj \

-       $(OBJS)\corelib_statbmp.obj \
-       $(OBJS)\corelib_statbox.obj \
+       $(OBJS)\corelib_msw_statbmp.obj \
+       $(OBJS)\corelib_msw_statbox.obj \

        $(OBJS)\corelib_statusbar.obj \
        $(OBJS)\corelib_statusbar.obj \

-       $(OBJS)\corelib_statline.obj \
-       $(OBJS)\corelib_stattext.obj \
-       $(OBJS)\corelib_toolbar.obj \
-       $(OBJS)\corelib_textctrl.obj \
+       $(OBJS)\corelib_msw_statline.obj \
+       $(OBJS)\corelib_msw_stattext.obj \
+       $(OBJS)\corelib_msw_toolbar.obj \
+       $(OBJS)\corelib_msw_textctrl.obj \

        $(OBJS)\corelib_textentry.obj \
        $(OBJS)\corelib_textentry.obj \

-       $(OBJS)\corelib_tglbtn.obj \
+       $(OBJS)\corelib_msw_tglbtn.obj \

        $(OBJS)\corelib_treectrl.obj \
        $(OBJS)\corelib_treectrl.obj \

-       $(OBJS)\corelib_checklst.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_msw_checklst.obj \
+       $(OBJS)\corelib_msw_fdrepdlg.obj \

        $(OBJS)\corelib_fontdlg.obj \
        $(OBJS)\corelib_accelcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_fontdlg.obj \
        $(OBJS)\corelib_accelcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \


@@ -3814,54 +3968,54 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \

-       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_generic_accel.obj \

        $(OBJS)\corelib_clrpickerg.obj \
        $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \
        $(OBJS)\corelib_clrpickerg.obj \
        $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \

-       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \

        $(OBJS)\corelib_filedlgg.obj \
        $(OBJS)\corelib_filepickerg.obj \
        $(OBJS)\corelib_fontdlgg.obj \
        $(OBJS)\corelib_fontpickerg.obj \
        $(OBJS)\corelib_filedlgg.obj \
        $(OBJS)\corelib_filepickerg.obj \
        $(OBJS)\corelib_fontdlgg.obj \
        $(OBJS)\corelib_fontpickerg.obj \

-       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \

        $(OBJS)\corelib_mdig.obj \
        $(OBJS)\corelib_msgdlgg.obj \
        $(OBJS)\corelib_prntdlgg.obj \
        $(OBJS)\corelib_mdig.obj \
        $(OBJS)\corelib_msgdlgg.obj \
        $(OBJS)\corelib_prntdlgg.obj \

-       $(OBJS)\corelib_bmpbuttn.obj \
-       $(OBJS)\corelib_button.obj \
-       $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_checklst.obj \
-       $(OBJS)\corelib_choice.obj \
-       $(OBJS)\corelib_combobox.obj \
-       $(OBJS)\corelib_control.obj \
+       $(OBJS)\corelib_univ_bmpbuttn.obj \
+       $(OBJS)\corelib_univ_button.obj \
+       $(OBJS)\corelib_univ_checkbox.obj \
+       $(OBJS)\corelib_univ_checklst.obj \
+       $(OBJS)\corelib_univ_choice.obj \
+       $(OBJS)\corelib_univ_combobox.obj \
+       $(OBJS)\corelib_univ_control.obj \

        $(OBJS)\corelib_ctrlrend.obj \
        $(OBJS)\corelib_ctrlrend.obj \

-       $(OBJS)\corelib_dialog.obj \
+       $(OBJS)\corelib_univ_dialog.obj \

        $(OBJS)\corelib_framuniv.obj \
        $(OBJS)\corelib_framuniv.obj \

-       $(OBJS)\corelib_gauge.obj \
+       $(OBJS)\corelib_univ_gauge.obj \

        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \

-       $(OBJS)\corelib_listbox.obj \
-       $(OBJS)\corelib_menu.obj \
-       $(OBJS)\corelib_notebook.obj \
-       $(OBJS)\corelib_radiobox.obj \
-       $(OBJS)\corelib_radiobut.obj \
+       $(OBJS)\corelib_univ_listbox.obj \
+       $(OBJS)\corelib_univ_menu.obj \
+       $(OBJS)\corelib_univ_notebook.obj \
+       $(OBJS)\corelib_univ_radiobox.obj \
+       $(OBJS)\corelib_univ_radiobut.obj \

        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrarrow.obj \

-       $(OBJS)\corelib_scrolbar.obj \
+       $(OBJS)\corelib_univ_scrolbar.obj \

        $(OBJS)\corelib_scrthumb.obj \
        $(OBJS)\corelib_settingsuniv.obj \
        $(OBJS)\corelib_scrthumb.obj \
        $(OBJS)\corelib_settingsuniv.obj \

-       $(OBJS)\corelib_slider.obj \
-       $(OBJS)\corelib_spinbutt.obj \
-       $(OBJS)\corelib_statbmp.obj \
-       $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statline.obj \
-       $(OBJS)\corelib_stattext.obj \
-       $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_univ_slider.obj \
+       $(OBJS)\corelib_univ_spinbutt.obj \
+       $(OBJS)\corelib_univ_statbmp.obj \
+       $(OBJS)\corelib_univ_statbox.obj \
+       $(OBJS)\corelib_univ_statline.obj \
+       $(OBJS)\corelib_univ_stattext.obj \
+       $(OBJS)\corelib_univ_statusbr.obj \

        $(OBJS)\corelib_stdrend.obj \
        $(OBJS)\corelib_stdrend.obj \

-       $(OBJS)\corelib_textctrl.obj \
-       $(OBJS)\corelib_tglbtn.obj \
+       $(OBJS)\corelib_univ_textctrl.obj \
+       $(OBJS)\corelib_univ_tglbtn.obj \

        $(OBJS)\corelib_theme.obj \
        $(OBJS)\corelib_theme.obj \

-       $(OBJS)\corelib_toolbar.obj \
+       $(OBJS)\corelib_univ_toolbar.obj \

        $(OBJS)\corelib_topluniv.obj \
        $(OBJS)\corelib_winuniv.obj \
        $(OBJS)\corelib_gtk.obj \
        $(OBJS)\corelib_topluniv.obj \
        $(OBJS)\corelib_winuniv.obj \
        $(OBJS)\corelib_gtk.obj \


@@ -4014,11 +4168,23 @@ ____wxcore_namelib_DEP = $(__corelib___depname)
 __advdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
 !endif
 __advdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_208 = D
+__RUNTIME_LIBS_240 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_208 = $(__THREADSFLAG)
+__RUNTIME_LIBS_240 = $(__THREADSFLAG)

 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \


@@ -4039,6 +4205,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \

+       $(OBJS)\advdll_infobar.obj \

        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \


@@ -4078,6 +4245,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \

+       $(OBJS)\advdll_infobar.obj \

        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \


@@ -4099,10 +4267,10 @@ __advlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_221 = D
+__RUNTIME_LIBS_255 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_221 = $(__THREADSFLAG)
+__RUNTIME_LIBS_255 = $(__THREADSFLAG)

 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \


@@ -4123,6 +4291,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \

+       $(OBJS)\advlib_infobar.obj \

        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \


@@ -4162,6 +4331,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \

+       $(OBJS)\advlib_infobar.obj \

        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \


@@ -4188,21 +4358,33 @@ ____wxadv_namelib_DEP = $(__advlib___depname)
 __mediadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
 !endif
 __mediadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_235 = D
+__RUNTIME_LIBS_271 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_235 = $(__THREADSFLAG)
+__RUNTIME_LIBS_271 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 __medialib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 __medialib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_248 = D
+__RUNTIME_LIBS_286 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_248 = $(__THREADSFLAG)
+__RUNTIME_LIBS_286 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxmedia_namedll_DEP = $(__mediadll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxmedia_namedll_DEP = $(__mediadll___depname)


@@ -4214,21 +4396,33 @@ ____wxmedia_namelib_DEP = $(__medialib___depname)
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_262 = D
+__RUNTIME_LIBS_302 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_262 = $(__THREADSFLAG)
+__RUNTIME_LIBS_302 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_275 = D
+__RUNTIME_LIBS_317 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_275 = $(__THREADSFLAG)
+__RUNTIME_LIBS_317 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxhtml_namedll_DEP = $(__htmldll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxhtml_namedll_DEP = $(__htmldll___depname)


@@ -4240,21 +4434,33 @@ ____wxhtml_namelib_DEP = $(__htmllib___depname)
 __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif
 __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_289 = D
+__RUNTIME_LIBS_333 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_289 = $(__THREADSFLAG)
+__RUNTIME_LIBS_333 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qalib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qalib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_302 = D
+__RUNTIME_LIBS_348 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_302 = $(__THREADSFLAG)
+__RUNTIME_LIBS_348 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxqa_namedll_DEP = $(__qadll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxqa_namedll_DEP = $(__qadll___depname)


@@ -4266,21 +4472,33 @@ ____wxqa_namelib_DEP = $(__qalib___depname)
 __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif
 __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_316 = D
+__RUNTIME_LIBS_364 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_316 = $(__THREADSFLAG)
+__RUNTIME_LIBS_364 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __xmllib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __xmllib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_329 = D
+__RUNTIME_LIBS_379 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_329 = $(__THREADSFLAG)
+__RUNTIME_LIBS_379 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxxml_namedll_DEP = $(__xmldll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxml_namedll_DEP = $(__xmldll___depname)


@@ -4292,21 +4510,33 @@ ____wxxml_namelib_DEP = $(__xmllib___depname)
 __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif
 __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_343 = D
+__RUNTIME_LIBS_395 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_343 = $(__THREADSFLAG)
+__RUNTIME_LIBS_395 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
 __xrclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
 __xrclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_356 = D
+__RUNTIME_LIBS_410 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_356 = $(__THREADSFLAG)
+__RUNTIME_LIBS_410 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxxrc_namedll_DEP = $(__xrcdll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxrc_namedll_DEP = $(__xrcdll___depname)


@@ -4318,21 +4548,33 @@ ____wxxrc_namelib_DEP = $(__xrclib___depname)
 __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif
 __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_370 = D
+__RUNTIME_LIBS_426 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_370 = $(__THREADSFLAG)
+__RUNTIME_LIBS_426 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
 __auilib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
 __auilib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_383 = D
+__RUNTIME_LIBS_441 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_383 = $(__THREADSFLAG)
+__RUNTIME_LIBS_441 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxaui_namedll_DEP = $(__auidll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxaui_namedll_DEP = $(__auidll___depname)


@@ -4340,25 +4582,75 @@ ____wxaui_namedll_DEP = $(__auidll___depname)
 !if "$(SHARED)" == "0"
 ____wxaui_namelib_DEP = $(__auilib___depname)
 !endif
 !if "$(SHARED)" == "0"
 ____wxaui_namelib_DEP = $(__auilib___depname)
 !endif

+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+__ribbondll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_457 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_457 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+__ribbonlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_472 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_472 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxribbon_namedll_DEP = $(__ribbondll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxribbon_namelib_DEP = $(__ribbonlib___depname)
+!endif

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 __propgriddll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 __propgriddll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_488 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_488 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
 __propgridlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
 __propgridlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_410 = D
+__RUNTIME_LIBS_503 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+__RUNTIME_LIBS_503 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxpropgrid_namedll_DEP = $(__propgriddll___depname)


@@ -4370,21 +4662,33 @@ ____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
 __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif
 __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_519 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_519 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
 __richtextlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
 __richtextlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_437 = D
+__RUNTIME_LIBS_534 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_437 = $(__THREADSFLAG)
+__RUNTIME_LIBS_534 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxrichtext_namedll_DEP = $(__richtextdll___depname)


@@ -4396,21 +4700,33 @@ ____wxrichtext_namelib_DEP = $(__richtextlib___depname)
 __stcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
 !endif
 __stcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_451 = D
+__RUNTIME_LIBS_550 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_451 = $(__THREADSFLAG)
+__RUNTIME_LIBS_550 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
 __stclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
 __stclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_464 = D
+__RUNTIME_LIBS_565 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_464 = $(__THREADSFLAG)
+__RUNTIME_LIBS_565 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxstc_namedll_DEP = $(__stcdll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxstc_namedll_DEP = $(__stcdll___depname)


@@ -4422,11 +4738,23 @@ ____wxstc_namelib_DEP = $(__stclib___depname)
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_478 = D
+__RUNTIME_LIBS_581 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+__RUNTIME_LIBS_581 = $(__THREADSFLAG)

 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \


@@ -4445,10 +4773,10 @@ __gllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_491 = D
+__RUNTIME_LIBS_596 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_491 = $(__THREADSFLAG)
+__RUNTIME_LIBS_596 = $(__THREADSFLAG)

 !endif
 !if "$(SHARED)" == "1"
 ____wxgl_namedll_DEP = $(__gldll___depname)
 !endif
 !if "$(SHARED)" == "1"
 ____wxgl_namedll_DEP = $(__gldll___depname)


@@ -4467,64 +4795,73 @@ __htmldll_library_link_LIBR = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_5 = /DEBUG

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO_4 = 
+__DEBUGINFO_5 = 

 !endif
 !if "$(DEBUG_INFO)" == "0"
 !endif
 !if "$(DEBUG_INFO)" == "0"

-__DEBUGINFO_4 = 
+__DEBUGINFO_5 = 

 !endif
 !if "$(DEBUG_INFO)" == "1"
 !endif
 !if "$(DEBUG_INFO)" == "1"

-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_5 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_5 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_5 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_5 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_5 = /d _DEBUG

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"

-____DEBUGRUNTIME_4 = /d _DEBUG
+__DEBUGRUNTIME_10 = 

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"

-____DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_10 = /opt:ref /opt:icf

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-____DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_10 = /opt:ref /opt:icf

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"

-____DEBUGRUNTIME_4 = /d _DEBUG
+__DEBUGRUNTIME_10 = 

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"

-__NO_VC_CRTDBG_p_64 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"

-__NO_VC_CRTDBG_p_64 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__

 !endif
 !if "$(WXUNIV)" == "1"
 !endif
 !if "$(WXUNIV)" == "1"

-__WXUNIV_DEFINE_p_58 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_57 = /d __WXDEBUG__
+__WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__

 !endif
 !endif

-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_57 = /d __WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_61 = /d wxDEBUG_LEVEL=0

 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"

-__EXCEPTIONS_DEFINE_p_57 = /d wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS

 !endif
 !if "$(USE_RTTI)" == "0"
 !endif
 !if "$(USE_RTTI)" == "0"

-__RTTI_DEFINE_p_57 = /d wxNO_RTTI
+__RTTI_DEFINE_p_61 = /d wxNO_RTTI

 !endif
 !if "$(USE_THREADS)" == "0"
 !endif
 !if "$(USE_THREADS)" == "0"

-__THREAD_DEFINE_p_57 = /d wxNO_THREADS
+__THREAD_DEFINE_p_61 = /d wxNO_THREADS

 !endif
 !if "$(UNICODE)" == "0"
 !endif
 !if "$(UNICODE)" == "0"

-__UNICODE_DEFINE_p_58 = /d wxUSE_UNICODE=0
+__UNICODE_DEFINE_p_62 = /d wxUSE_UNICODE=0

 !endif
 !if "$(UNICODE)" == "1"
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p_58 = /d _UNICODE
+__UNICODE_DEFINE_p_62 = /d _UNICODE

 !endif
 !if "$(MSLU)" == "1"
 !endif
 !if "$(MSLU)" == "1"

-__MSLU_DEFINE_p_57 = /d wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_61 = /d wxUSE_UNICODE_MSLU=1

 !endif
 !if "$(USE_GDIPLUS)" == "1"
 !endif
 !if "$(USE_GDIPLUS)" == "1"

-__GFXCTX_DEFINE_p_57 = /d wxUSE_GRAPHICS_CONTEXT=1
+__GFXCTX_DEFINE_p_61 = /d wxUSE_GRAPHICS_CONTEXT=1

 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib


@@ -4610,11 +4947,8 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0

 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS


@@ -4651,7 +4985,7 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -4719,6 +5053,11 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib

+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb


@@ -4797,8 +5136,8 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(MONODLL_OBJECTS)  $(__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 wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__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 wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4812,8 +5151,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(BASEDLL_OBJECTS)  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 wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_139)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  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 wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4831,8 +5170,8 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(NETDLL_OBJECTS)  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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(__DEBUGINFO_170)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4850,8 +5189,8 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(COREDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4869,8 +5208,8 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(ADVDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4888,8 +5227,8 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(MEDIADLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4907,8 +5246,8 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(HTMLDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4926,8 +5265,8 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(QADLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4945,8 +5284,8 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(XMLDLL_OBJECTS)  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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  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 wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4964,8 +5303,8 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(XRCDLL_OBJECTS)  $(__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 wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_387)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__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 wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4983,8 +5322,8 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(AUIDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -5000,10 +5339,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !endif
 
 wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib: $(OBJS)\ribbonlib_dummy.obj  $(RIBBONLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(RIBBONLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_RIBBON)" == "1"
+wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(PROPGRIDDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -5021,8 +5379,8 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(RICHTEXTDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -5040,8 +5398,8 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(STCDLL_OBJECTS)  $(__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 wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__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 wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -5059,8 +5417,8 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)

-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(GLDLL_OBJECTS)  $(__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 wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__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 wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -5105,7 +5463,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
 build_cfg_file: $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)

-       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)

        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)


@@ -5767,6 +6125,9 @@ $(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx
 $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 

+$(OBJS)\monodll_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp
+

 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
 
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
 


@@ -6004,6 +6365,12 @@ $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp
 
 $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp
 

+$(OBJS)\monodll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+

 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 


@@ -6055,6 +6422,9 @@ $(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp
 $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 

+$(OBJS)\monodll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+

 $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp
 
 $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp
 


@@ -6115,15 +6485,42 @@ $(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 

+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+

 $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
 $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 

+$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+

 $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
 
 $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
 

+$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+

 $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 


@@ -6136,15 +6533,27 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 

+$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+

 $(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 

+$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+

 $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
 
 $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
 

+$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+

 $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 


@@ -6160,72 +6569,201 @@ $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 
 $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 

+$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+

 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 

+$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+

 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 

+$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+

 $(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 

+$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+
+$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+
+$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+

 $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
 $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 

+$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+

 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 

+$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+

 $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 

+$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+

 $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 

-$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+
+$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 

+$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+

 $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 

+$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+
+$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
+

 $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 

+$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+

 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 

+$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+

 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
 

+$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+

 $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 

+$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+

 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 

+$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+
+$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+

 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 

+$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+

 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 

+$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+

 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 


@@ -6571,6 +7109,36 @@ $(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
 $(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
 

+$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+

 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 


@@ -6878,469 +7446,189 @@ $(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 !endif
 
 !if "$(USE_GUI)" == "1"


@@ -7689,7 +7977,7 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 !endif
 
 !if "$(USE_GUI)" == "1"

-$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 


@@ -7923,6 +8211,11 @@ $(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp


@@ -7999,11 +8292,14 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc

 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 

+$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp
+

 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
 
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
 


@@ -8241,6 +8537,12 @@ $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
 
 $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
 

+$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+

 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 


@@ -8292,6 +8594,9 @@ $(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
 $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 

+$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+

 $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
 
 $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
 


@@ -8352,15 +8657,42 @@ $(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 

+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+

 $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
 $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 

+$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+

 $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
 
 $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
 

+$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+

 $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 


@@ -8373,15 +8705,27 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 

+$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+

 $(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 

+$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+

 $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
 
 $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
 

+$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+

 $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 


@@ -8397,72 +8741,201 @@ $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 
 $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 

+$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+

 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 

+$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+

 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 

+$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+

 $(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 

+$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+
+$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+
+$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+

 $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
 $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 

+$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+

 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 

+$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+

 $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 

+$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+

 $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 

+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+

 $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 

+$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+

 $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 

+$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+
+$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
+

 $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 

+$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+

 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 

+$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+

 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
 

+$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+

 $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 

+$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+

 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 

+$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+
+$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+

 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 

+$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+

 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 

+$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+

 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 


@@ -8808,6 +9281,36 @@ $(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
 $(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
 

+$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+

 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 


@@ -9115,414 +9618,134 @@ $(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 !endif
 
 !if "$(USE_GUI)" == "1"


@@ -9926,7 +10149,7 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 !endif
 
 !if "$(USE_GUI)" == "1"

-$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 


@@ -10160,6 +10383,11 @@ $(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp


@@ -10239,7 +10467,10 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+
+$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp

 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp


@@ -10478,6 +10709,12 @@ $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
 
 $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
 

+$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+

 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 


@@ -10529,6 +10766,9 @@ $(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
 $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 

+$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+

 $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
 
 $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
 


@@ -10556,6 +10796,9 @@ $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
 $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 

+$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp
+

 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
 
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
 


@@ -10793,6 +11036,12 @@ $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
 
 $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
 

+$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+

 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 


@@ -10844,6 +11093,9 @@ $(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
 $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 

+$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+

 $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
 
 $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
 


@@ -10872,7 +11124,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc

 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp


@@ -10953,7 +11205,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc

 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp


@@ -10979,15 +11231,42 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
 $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
 
 $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
 

+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+

 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 

-$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
+$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+
+$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
 
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
 

+$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+

 $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 


@@ -11000,15 +11279,27 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 

+$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+

 $(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 

+$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+

 $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
 
 $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
 

+$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+

 $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 


@@ -11024,72 +11315,201 @@ $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 
 $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 

+$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+

 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 

+$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+

 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 

+$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+

 $(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 

+$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+
+$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+
+$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+

 $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
 $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 

+$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+

 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 

+$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+

 $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 

+$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+

 $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 

+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+

 $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 

+$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+

 $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 

+$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+
+$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
+

 $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 

+$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+

 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 

+$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+

 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
 

+$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+

 $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 

+$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+

 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 

+$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+
+$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+

 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 

+$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+

 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 

+$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+

 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 


@@ -11225,437 +11645,157 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp

 !endif
 
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 !endif
 
 !if "$(USE_GUI)" == "1"


@@ -12360,15 +12500,42 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
 $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
 
 $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
 

+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+

 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 

+$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+

 $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp
 
 $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp
 

+$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+

 $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 


@@ -12381,15 +12548,27 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 

+$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+

 $(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 

+$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+

 $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
 
 $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
 

+$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+

 $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 


@@ -12405,72 +12584,201 @@ $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 
 $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 

+$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+

 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 

+$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+

 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 

+$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+

 $(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 

+$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+
+$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+
+$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+

 $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
 $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 

+$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+

 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 

+$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+

 $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 

+$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+

 $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 

+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+

 $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 

+$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+

 $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
 
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
 

+$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+
+$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
+

 $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 

+$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+

 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 

+$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+

 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
 

+$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+

 $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 

+$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+

 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 

+$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+
+$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+

 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 

+$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+

 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 

+$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+

 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 


@@ -12754,291 +13062,11 @@ $(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 

-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp


@@ -13718,7 +13746,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc

 
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
 
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp


@@ -13783,6 +13811,9 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
 $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 

+$(OBJS)\advdll_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+

 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
 


@@ -13894,6 +13925,9 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
 $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 

+$(OBJS)\advlib_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+

 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
 


@@ -13943,7 +13977,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc

 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp


@@ -13976,7 +14010,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc

 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp


@@ -14129,7 +14163,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc

 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp


@@ -14150,7 +14184,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc

 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp


@@ -14171,7 +14205,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc

 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp


@@ -14546,7 +14580,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc

 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp


@@ -14587,11 +14621,80 @@ $(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 

+$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+
+$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
+$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+

 $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc

 
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
 
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp


@@ -14648,7 +14751,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc

 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp


@@ -14711,7 +14814,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc

 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp


@@ -14738,7 +14841,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc

 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp