Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index aa7872f7af644debc687410d6a1737f421aab6aa..ceb6f40843fbd3dfff531b0aed864105e421642c 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

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


@@ -14,14 +14,15 @@
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r

-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r

        TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
        TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r

-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r

        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r


@@ -29,19 +30,21 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r

-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5\r

 COMPILER_PREFIX = vc\r
 OBJS = \\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)\r

 LIBDIRNAME = \\r
 LIBDIRNAME = \\r

-       ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \\r
-       /D_CRT_SECURE_NO_WARNINGS /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\include \\r
+       /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(CPPFLAGS) $(CFLAGS)\r

 WXREGEX_OBJECTS =  \\r
        $(OBJS)\wxregex_regcomp.obj \\r
        $(OBJS)\wxregex_regexec.obj \\r
 WXREGEX_OBJECTS =  \\r
        $(OBJS)\wxregex_regcomp.obj \\r
        $(OBJS)\wxregex_regexec.obj \\r


@@ -49,8 +52,9 @@ WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regfree.obj\r
 WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
        $(OBJS)\wxregex_regfree.obj\r
 WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
-       $(CPPFLAGS) $(CFLAGS)\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)\r

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


@@ -66,8 +70,10 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_inffast.obj\r
 WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
        $(OBJS)\wxzlib_inffast.obj\r
 WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
-       /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \\r
+       $(CPPFLAGS) $(CFLAGS)\r

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


@@ -86,8 +92,10 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwutil.obj\r
 WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
        $(OBJS)\wxpng_pngwutil.obj\r
 WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
-       /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(SETUPHDIR) \\r
+       $(CPPFLAGS) $(CFLAGS)\r

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


@@ -137,9 +145,11 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jdmerge.obj\r
 WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
        $(OBJS)\wxjpeg_jdmerge.obj\r
 WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r

-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
-       /I..\..\src\zlib /I..\..\src\jpeg /I..\..\src\tiff\libtiff \\r
-       /D_CRT_NONSTDC_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \\r
+       /I..\..\src\jpeg /I..\..\src\tiff\libtiff /D_CRT_NONSTDC_NO_WARNINGS \\r
+       $(CPPFLAGS) $(CFLAGS)\r

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


@@ -158,8 +168,11 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_fax3sm.obj \\r
        $(OBJS)\wxtiff_tif_flush.obj \\r
        $(OBJS)\wxtiff_tif_getimage.obj \\r
        $(OBJS)\wxtiff_tif_fax3sm.obj \\r
        $(OBJS)\wxtiff_tif_flush.obj \\r
        $(OBJS)\wxtiff_tif_getimage.obj \\r

+       $(OBJS)\wxtiff_tif_jbig.obj \\r

        $(OBJS)\wxtiff_tif_jpeg.obj \\r
        $(OBJS)\wxtiff_tif_jpeg.obj \\r

+       $(OBJS)\wxtiff_tif_jpeg_12.obj \\r

        $(OBJS)\wxtiff_tif_luv.obj \\r
        $(OBJS)\wxtiff_tif_luv.obj \\r

+       $(OBJS)\wxtiff_tif_lzma.obj \\r

        $(OBJS)\wxtiff_tif_lzw.obj \\r
        $(OBJS)\wxtiff_tif_next.obj \\r
        $(OBJS)\wxtiff_tif_ojpeg.obj \\r
        $(OBJS)\wxtiff_tif_lzw.obj \\r
        $(OBJS)\wxtiff_tif_next.obj \\r
        $(OBJS)\wxtiff_tif_ojpeg.obj \\r


@@ -179,149 +192,170 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_zip.obj\r
 WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \\r
        $(OBJS)\wxtiff_tif_zip.obj\r
 WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \\r
-       /D_CRT_SECURE_NO_WARNINGS /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) \\r
-       $(CFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(LIBDIRNAME) \\r
+       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)\r

 WXEXPAT_OBJECTS =  \\r
        $(OBJS)\wxexpat_xmlparse.obj \\r
        $(OBJS)\wxexpat_xmlrole.obj \\r
        $(OBJS)\wxexpat_xmltok.obj\r
 WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \\r
 WXEXPAT_OBJECTS =  \\r
        $(OBJS)\wxexpat_xmlparse.obj \\r
        $(OBJS)\wxexpat_xmlrole.obj \\r
        $(OBJS)\wxexpat_xmltok.obj\r
 WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \\r
-       /D_CRT_SECURE_NO_WARNINGS /I..\..\src\stc\scintilla\include \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /I$(SETUPHDIR) /I..\..\include $(__wxscintilla_usingdll_p) /D__WXMSW__ \\r
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 WXSCINTILLA_OBJECTS =  \\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /I$(SETUPHDIR) /I..\..\include $(__wxscintilla_usingdll_p) /D__WXMSW__ \\r
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 WXSCINTILLA_OBJECTS =  \\r

-       $(OBJS)\wxscintilla_AutoComplete.obj \\r
-       $(OBJS)\wxscintilla_CallTip.obj \\r
-       $(OBJS)\wxscintilla_CellBuffer.obj \\r
-       $(OBJS)\wxscintilla_CharClassify.obj \\r
-       $(OBJS)\wxscintilla_ContractionState.obj \\r
-       $(OBJS)\wxscintilla_Decoration.obj \\r
-       $(OBJS)\wxscintilla_Document.obj \\r
-       $(OBJS)\wxscintilla_DocumentAccessor.obj \\r
-       $(OBJS)\wxscintilla_Editor.obj \\r
-       $(OBJS)\wxscintilla_ExternalLexer.obj \\r
-       $(OBJS)\wxscintilla_Indicator.obj \\r
-       $(OBJS)\wxscintilla_KeyMap.obj \\r
-       $(OBJS)\wxscintilla_KeyWords.obj \\r
-       $(OBJS)\wxscintilla_LexAPDL.obj \\r
-       $(OBJS)\wxscintilla_LexASY.obj \\r
-       $(OBJS)\wxscintilla_LexAU3.obj \\r
-       $(OBJS)\wxscintilla_LexAVE.obj \\r
+       $(OBJS)\wxscintilla_LexA68k.obj \\r

        $(OBJS)\wxscintilla_LexAbaqus.obj \\r
        $(OBJS)\wxscintilla_LexAda.obj \\r
        $(OBJS)\wxscintilla_LexAbaqus.obj \\r
        $(OBJS)\wxscintilla_LexAda.obj \\r

+       $(OBJS)\wxscintilla_LexAPDL.obj \\r

        $(OBJS)\wxscintilla_LexAsm.obj \\r
        $(OBJS)\wxscintilla_LexAsn1.obj \\r
        $(OBJS)\wxscintilla_LexAsm.obj \\r
        $(OBJS)\wxscintilla_LexAsn1.obj \\r

+       $(OBJS)\wxscintilla_LexASY.obj \\r
+       $(OBJS)\wxscintilla_LexAU3.obj \\r
+       $(OBJS)\wxscintilla_LexAVE.obj \\r
+       $(OBJS)\wxscintilla_LexAVS.obj \\r

        $(OBJS)\wxscintilla_LexBaan.obj \\r
        $(OBJS)\wxscintilla_LexBash.obj \\r
        $(OBJS)\wxscintilla_LexBasic.obj \\r
        $(OBJS)\wxscintilla_LexBullant.obj \\r
        $(OBJS)\wxscintilla_LexBaan.obj \\r
        $(OBJS)\wxscintilla_LexBash.obj \\r
        $(OBJS)\wxscintilla_LexBasic.obj \\r
        $(OBJS)\wxscintilla_LexBullant.obj \\r

-       $(OBJS)\wxscintilla_LexCLW.obj \\r
-       $(OBJS)\wxscintilla_LexCOBOL.obj \\r
-       $(OBJS)\wxscintilla_LexCPP.obj \\r
-       $(OBJS)\wxscintilla_LexCSS.obj \\r

        $(OBJS)\wxscintilla_LexCaml.obj \\r
        $(OBJS)\wxscintilla_LexCaml.obj \\r

+       $(OBJS)\wxscintilla_LexCLW.obj \\r

        $(OBJS)\wxscintilla_LexCmake.obj \\r
        $(OBJS)\wxscintilla_LexCmake.obj \\r

+       $(OBJS)\wxscintilla_LexCOBOL.obj \\r
+       $(OBJS)\wxscintilla_LexCoffeeScript.obj \\r

        $(OBJS)\wxscintilla_LexConf.obj \\r
        $(OBJS)\wxscintilla_LexConf.obj \\r

+       $(OBJS)\wxscintilla_LexCPP.obj \\r

        $(OBJS)\wxscintilla_LexCrontab.obj \\r
        $(OBJS)\wxscintilla_LexCsound.obj \\r
        $(OBJS)\wxscintilla_LexCrontab.obj \\r
        $(OBJS)\wxscintilla_LexCsound.obj \\r

+       $(OBJS)\wxscintilla_LexCSS.obj \\r

        $(OBJS)\wxscintilla_LexD.obj \\r
        $(OBJS)\wxscintilla_LexD.obj \\r

-       $(OBJS)\wxscintilla_LexEScript.obj \\r
+       $(OBJS)\wxscintilla_LexECL.obj \\r

        $(OBJS)\wxscintilla_LexEiffel.obj \\r
        $(OBJS)\wxscintilla_LexErlang.obj \\r
        $(OBJS)\wxscintilla_LexEiffel.obj \\r
        $(OBJS)\wxscintilla_LexErlang.obj \\r

+       $(OBJS)\wxscintilla_LexEScript.obj \\r

        $(OBJS)\wxscintilla_LexFlagship.obj \\r
        $(OBJS)\wxscintilla_LexForth.obj \\r
        $(OBJS)\wxscintilla_LexFortran.obj \\r
        $(OBJS)\wxscintilla_LexGAP.obj \\r
        $(OBJS)\wxscintilla_LexGui4Cli.obj \\r
        $(OBJS)\wxscintilla_LexFlagship.obj \\r
        $(OBJS)\wxscintilla_LexForth.obj \\r
        $(OBJS)\wxscintilla_LexFortran.obj \\r
        $(OBJS)\wxscintilla_LexGAP.obj \\r
        $(OBJS)\wxscintilla_LexGui4Cli.obj \\r

-       $(OBJS)\wxscintilla_LexHTML.obj \\r

        $(OBJS)\wxscintilla_LexHaskell.obj \\r
        $(OBJS)\wxscintilla_LexHaskell.obj \\r

+       $(OBJS)\wxscintilla_LexHTML.obj \\r

        $(OBJS)\wxscintilla_LexInno.obj \\r
        $(OBJS)\wxscintilla_LexKix.obj \\r
        $(OBJS)\wxscintilla_LexLisp.obj \\r
        $(OBJS)\wxscintilla_LexLout.obj \\r
        $(OBJS)\wxscintilla_LexLua.obj \\r
        $(OBJS)\wxscintilla_LexInno.obj \\r
        $(OBJS)\wxscintilla_LexKix.obj \\r
        $(OBJS)\wxscintilla_LexLisp.obj \\r
        $(OBJS)\wxscintilla_LexLout.obj \\r
        $(OBJS)\wxscintilla_LexLua.obj \\r

-       $(OBJS)\wxscintilla_LexMMIXAL.obj \\r
-       $(OBJS)\wxscintilla_LexMPT.obj \\r
-       $(OBJS)\wxscintilla_LexMSSQL.obj \\r

        $(OBJS)\wxscintilla_LexMagik.obj \\r
        $(OBJS)\wxscintilla_LexMarkdown.obj \\r
        $(OBJS)\wxscintilla_LexMatlab.obj \\r
        $(OBJS)\wxscintilla_LexMetapost.obj \\r
        $(OBJS)\wxscintilla_LexMagik.obj \\r
        $(OBJS)\wxscintilla_LexMarkdown.obj \\r
        $(OBJS)\wxscintilla_LexMatlab.obj \\r
        $(OBJS)\wxscintilla_LexMetapost.obj \\r

+       $(OBJS)\wxscintilla_LexMMIXAL.obj \\r
+       $(OBJS)\wxscintilla_LexModula.obj \\r
+       $(OBJS)\wxscintilla_LexMPT.obj \\r
+       $(OBJS)\wxscintilla_LexMSSQL.obj \\r

        $(OBJS)\wxscintilla_LexMySQL.obj \\r
        $(OBJS)\wxscintilla_LexNimrod.obj \\r
        $(OBJS)\wxscintilla_LexNsis.obj \\r
        $(OBJS)\wxscintilla_LexOpal.obj \\r
        $(OBJS)\wxscintilla_LexMySQL.obj \\r
        $(OBJS)\wxscintilla_LexNimrod.obj \\r
        $(OBJS)\wxscintilla_LexNsis.obj \\r
        $(OBJS)\wxscintilla_LexOpal.obj \\r

+       $(OBJS)\wxscintilla_LexOScript.obj \\r

        $(OBJS)\wxscintilla_LexOthers.obj \\r
        $(OBJS)\wxscintilla_LexOthers.obj \\r

+       $(OBJS)\wxscintilla_LexPascal.obj \\r

        $(OBJS)\wxscintilla_LexPB.obj \\r
        $(OBJS)\wxscintilla_LexPB.obj \\r

+       $(OBJS)\wxscintilla_LexPerl.obj \\r

        $(OBJS)\wxscintilla_LexPLM.obj \\r
        $(OBJS)\wxscintilla_LexPOV.obj \\r
        $(OBJS)\wxscintilla_LexPLM.obj \\r
        $(OBJS)\wxscintilla_LexPOV.obj \\r

-       $(OBJS)\wxscintilla_LexPS.obj \\r
-       $(OBJS)\wxscintilla_LexPascal.obj \\r
-       $(OBJS)\wxscintilla_LexPerl.obj \\r

        $(OBJS)\wxscintilla_LexPowerPro.obj \\r
        $(OBJS)\wxscintilla_LexPowerShell.obj \\r
        $(OBJS)\wxscintilla_LexProgress.obj \\r
        $(OBJS)\wxscintilla_LexPowerPro.obj \\r
        $(OBJS)\wxscintilla_LexPowerShell.obj \\r
        $(OBJS)\wxscintilla_LexProgress.obj \\r

+       $(OBJS)\wxscintilla_LexPS.obj \\r

        $(OBJS)\wxscintilla_LexPython.obj \\r
        $(OBJS)\wxscintilla_LexR.obj \\r
        $(OBJS)\wxscintilla_LexRebol.obj \\r
        $(OBJS)\wxscintilla_LexRuby.obj \\r
        $(OBJS)\wxscintilla_LexPython.obj \\r
        $(OBJS)\wxscintilla_LexR.obj \\r
        $(OBJS)\wxscintilla_LexRebol.obj \\r
        $(OBJS)\wxscintilla_LexRuby.obj \\r

-       $(OBJS)\wxscintilla_LexSML.obj \\r
-       $(OBJS)\wxscintilla_LexSQL.obj \\r

        $(OBJS)\wxscintilla_LexScriptol.obj \\r
        $(OBJS)\wxscintilla_LexSmalltalk.obj \\r
        $(OBJS)\wxscintilla_LexScriptol.obj \\r
        $(OBJS)\wxscintilla_LexSmalltalk.obj \\r

+       $(OBJS)\wxscintilla_LexSML.obj \\r

        $(OBJS)\wxscintilla_LexSorcus.obj \\r
        $(OBJS)\wxscintilla_LexSpecman.obj \\r
        $(OBJS)\wxscintilla_LexSpice.obj \\r
        $(OBJS)\wxscintilla_LexSorcus.obj \\r
        $(OBJS)\wxscintilla_LexSpecman.obj \\r
        $(OBJS)\wxscintilla_LexSpice.obj \\r

+       $(OBJS)\wxscintilla_LexSQL.obj \\r

        $(OBJS)\wxscintilla_LexTACL.obj \\r
        $(OBJS)\wxscintilla_LexTADS3.obj \\r
        $(OBJS)\wxscintilla_LexTAL.obj \\r
        $(OBJS)\wxscintilla_LexTCL.obj \\r
        $(OBJS)\wxscintilla_LexTACL.obj \\r
        $(OBJS)\wxscintilla_LexTADS3.obj \\r
        $(OBJS)\wxscintilla_LexTAL.obj \\r
        $(OBJS)\wxscintilla_LexTCL.obj \\r

+       $(OBJS)\wxscintilla_LexTCMD.obj \\r

        $(OBJS)\wxscintilla_LexTeX.obj \\r
        $(OBJS)\wxscintilla_LexTeX.obj \\r

+       $(OBJS)\wxscintilla_LexTxt2tags.obj \\r

        $(OBJS)\wxscintilla_LexVB.obj \\r
        $(OBJS)\wxscintilla_LexVB.obj \\r

-       $(OBJS)\wxscintilla_LexVHDL.obj \\r

        $(OBJS)\wxscintilla_LexVerilog.obj \\r
        $(OBJS)\wxscintilla_LexVerilog.obj \\r

+       $(OBJS)\wxscintilla_LexVHDL.obj \\r
+       $(OBJS)\wxscintilla_LexVisualProlog.obj \\r

        $(OBJS)\wxscintilla_LexYAML.obj \\r
        $(OBJS)\wxscintilla_LexYAML.obj \\r

+       $(OBJS)\wxscintilla_Accessor.obj \\r
+       $(OBJS)\wxscintilla_CharacterSet.obj \\r
+       $(OBJS)\wxscintilla_LexerBase.obj \\r
+       $(OBJS)\wxscintilla_LexerModule.obj \\r
+       $(OBJS)\wxscintilla_LexerNoExceptions.obj \\r
+       $(OBJS)\wxscintilla_LexerSimple.obj \\r
+       $(OBJS)\wxscintilla_PropSetSimple.obj \\r
+       $(OBJS)\wxscintilla_StyleContext.obj \\r
+       $(OBJS)\wxscintilla_WordList.obj \\r
+       $(OBJS)\wxscintilla_AutoComplete.obj \\r
+       $(OBJS)\wxscintilla_CallTip.obj \\r
+       $(OBJS)\wxscintilla_Catalogue.obj \\r
+       $(OBJS)\wxscintilla_CellBuffer.obj \\r
+       $(OBJS)\wxscintilla_CharClassify.obj \\r
+       $(OBJS)\wxscintilla_ContractionState.obj \\r
+       $(OBJS)\wxscintilla_Decoration.obj \\r
+       $(OBJS)\wxscintilla_Document.obj \\r
+       $(OBJS)\wxscintilla_Editor.obj \\r
+       $(OBJS)\wxscintilla_ExternalLexer.obj \\r
+       $(OBJS)\wxscintilla_Indicator.obj \\r
+       $(OBJS)\wxscintilla_KeyMap.obj \\r

        $(OBJS)\wxscintilla_LineMarker.obj \\r
        $(OBJS)\wxscintilla_PerLine.obj \\r
        $(OBJS)\wxscintilla_PositionCache.obj \\r
        $(OBJS)\wxscintilla_LineMarker.obj \\r
        $(OBJS)\wxscintilla_PerLine.obj \\r
        $(OBJS)\wxscintilla_PositionCache.obj \\r

-       $(OBJS)\wxscintilla_PropSet.obj \\r

        $(OBJS)\wxscintilla_RESearch.obj \\r
        $(OBJS)\wxscintilla_RunStyles.obj \\r
        $(OBJS)\wxscintilla_ScintillaBase.obj \\r
        $(OBJS)\wxscintilla_Selection.obj \\r
        $(OBJS)\wxscintilla_Style.obj \\r
        $(OBJS)\wxscintilla_RESearch.obj \\r
        $(OBJS)\wxscintilla_RunStyles.obj \\r
        $(OBJS)\wxscintilla_ScintillaBase.obj \\r
        $(OBJS)\wxscintilla_Selection.obj \\r
        $(OBJS)\wxscintilla_Style.obj \\r

-       $(OBJS)\wxscintilla_StyleContext.obj \\r

        $(OBJS)\wxscintilla_UniConversion.obj \\r
        $(OBJS)\wxscintilla_ViewStyle.obj \\r
        $(OBJS)\wxscintilla_UniConversion.obj \\r
        $(OBJS)\wxscintilla_ViewStyle.obj \\r

-       $(OBJS)\wxscintilla_WindowAccessor.obj \\r

        $(OBJS)\wxscintilla_XPM.obj\r
 MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\wxscintilla_XPM.obj\r
 MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)\r
 MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)\r
 MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)\r


@@ -373,6 +407,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_mimecmn.obj \\r
        $(OBJS)\monodll_module.obj \\r
        $(OBJS)\monodll_mstream.obj \\r
        $(OBJS)\monodll_mimecmn.obj \\r
        $(OBJS)\monodll_module.obj \\r
        $(OBJS)\monodll_mstream.obj \\r

+       $(OBJS)\monodll_numformatter.obj \\r

        $(OBJS)\monodll_object.obj \\r
        $(OBJS)\monodll_platinfo.obj \\r
        $(OBJS)\monodll_powercmn.obj \\r
        $(OBJS)\monodll_object.obj \\r
        $(OBJS)\monodll_platinfo.obj \\r
        $(OBJS)\monodll_powercmn.obj \\r


@@ -392,6 +427,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_tarstrm.obj \\r
        $(OBJS)\monodll_textbuf.obj \\r
        $(OBJS)\monodll_textfile.obj \\r
        $(OBJS)\monodll_tarstrm.obj \\r
        $(OBJS)\monodll_textbuf.obj \\r
        $(OBJS)\monodll_textfile.obj \\r

+       $(OBJS)\monodll_time.obj \\r

        $(OBJS)\monodll_timercmn.obj \\r
        $(OBJS)\monodll_timerimpl.obj \\r
        $(OBJS)\monodll_tokenzr.obj \\r
        $(OBJS)\monodll_timercmn.obj \\r
        $(OBJS)\monodll_timerimpl.obj \\r
        $(OBJS)\monodll_tokenzr.obj \\r


@@ -417,6 +453,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dde.obj \\r
        $(OBJS)\monodll_dir.obj \\r
        $(OBJS)\monodll_dlmsw.obj \\r
        $(OBJS)\monodll_dde.obj \\r
        $(OBJS)\monodll_dir.obj \\r
        $(OBJS)\monodll_dlmsw.obj \\r

+       $(OBJS)\monodll_evtloopconsole.obj \\r

        $(OBJS)\monodll_mimetype.obj \\r
        $(OBJS)\monodll_power.obj \\r
        $(OBJS)\monodll_regconf.obj \\r
        $(OBJS)\monodll_mimetype.obj \\r
        $(OBJS)\monodll_power.obj \\r
        $(OBJS)\monodll_regconf.obj \\r


@@ -433,7 +470,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_fs_mem.obj \\r
        $(OBJS)\monodll_msgout.obj \\r
        $(OBJS)\monodll_utilscmn.obj \\r
        $(OBJS)\monodll_fs_mem.obj \\r
        $(OBJS)\monodll_msgout.obj \\r
        $(OBJS)\monodll_utilscmn.obj \\r

-       $(OBJS)\monodll_evtloop.obj \\r

        $(OBJS)\monodll_main.obj \\r
        $(OBJS)\monodll_mslu.obj \\r
        $(OBJS)\monodll_volume.obj \\r
        $(OBJS)\monodll_main.obj \\r
        $(OBJS)\monodll_mslu.obj \\r
        $(OBJS)\monodll_volume.obj \\r


@@ -457,25 +493,29 @@ MONODLL_RESOURCES =  \
 MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
 MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)\r
 MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)\r
 MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
        /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
        /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)\r


@@ -527,6 +567,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_mimecmn.obj \\r
        $(OBJS)\monolib_module.obj \\r
        $(OBJS)\monolib_mstream.obj \\r
        $(OBJS)\monolib_mimecmn.obj \\r
        $(OBJS)\monolib_module.obj \\r
        $(OBJS)\monolib_mstream.obj \\r

+       $(OBJS)\monolib_numformatter.obj \\r

        $(OBJS)\monolib_object.obj \\r
        $(OBJS)\monolib_platinfo.obj \\r
        $(OBJS)\monolib_powercmn.obj \\r
        $(OBJS)\monolib_object.obj \\r
        $(OBJS)\monolib_platinfo.obj \\r
        $(OBJS)\monolib_powercmn.obj \\r


@@ -546,6 +587,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_tarstrm.obj \\r
        $(OBJS)\monolib_textbuf.obj \\r
        $(OBJS)\monolib_textfile.obj \\r
        $(OBJS)\monolib_tarstrm.obj \\r
        $(OBJS)\monolib_textbuf.obj \\r
        $(OBJS)\monolib_textfile.obj \\r

+       $(OBJS)\monolib_time.obj \\r

        $(OBJS)\monolib_timercmn.obj \\r
        $(OBJS)\monolib_timerimpl.obj \\r
        $(OBJS)\monolib_tokenzr.obj \\r
        $(OBJS)\monolib_timercmn.obj \\r
        $(OBJS)\monolib_timerimpl.obj \\r
        $(OBJS)\monolib_tokenzr.obj \\r


@@ -571,6 +613,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dde.obj \\r
        $(OBJS)\monolib_dir.obj \\r
        $(OBJS)\monolib_dlmsw.obj \\r
        $(OBJS)\monolib_dde.obj \\r
        $(OBJS)\monolib_dir.obj \\r
        $(OBJS)\monolib_dlmsw.obj \\r

+       $(OBJS)\monolib_evtloopconsole.obj \\r

        $(OBJS)\monolib_mimetype.obj \\r
        $(OBJS)\monolib_power.obj \\r
        $(OBJS)\monolib_regconf.obj \\r
        $(OBJS)\monolib_mimetype.obj \\r
        $(OBJS)\monolib_power.obj \\r
        $(OBJS)\monolib_regconf.obj \\r


@@ -587,7 +630,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_fs_mem.obj \\r
        $(OBJS)\monolib_msgout.obj \\r
        $(OBJS)\monolib_utilscmn.obj \\r
        $(OBJS)\monolib_fs_mem.obj \\r
        $(OBJS)\monolib_msgout.obj \\r
        $(OBJS)\monolib_utilscmn.obj \\r

-       $(OBJS)\monolib_evtloop.obj \\r

        $(OBJS)\monolib_main.obj \\r
        $(OBJS)\monolib_mslu.obj \\r
        $(OBJS)\monolib_volume.obj \\r
        $(OBJS)\monolib_main.obj \\r
        $(OBJS)\monolib_mslu.obj \\r
        $(OBJS)\monolib_volume.obj \\r


@@ -608,27 +650,29 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_xtixml.obj\r
 BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\monolib_xtixml.obj\r
 BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \\r
-       $(CPPFLAGS) $(CFLAGS)\r
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)\r

 BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
 BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 BASEDLL_OBJECTS =  \\r
        $(OBJS)\basedll_dummy.obj \\r
        $(OBJS)\basedll_any.obj \\r
 BASEDLL_OBJECTS =  \\r
        $(OBJS)\basedll_dummy.obj \\r
        $(OBJS)\basedll_any.obj \\r


@@ -677,6 +721,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_mimecmn.obj \\r
        $(OBJS)\basedll_module.obj \\r
        $(OBJS)\basedll_mstream.obj \\r
        $(OBJS)\basedll_mimecmn.obj \\r
        $(OBJS)\basedll_module.obj \\r
        $(OBJS)\basedll_mstream.obj \\r

+       $(OBJS)\basedll_numformatter.obj \\r

        $(OBJS)\basedll_object.obj \\r
        $(OBJS)\basedll_platinfo.obj \\r
        $(OBJS)\basedll_powercmn.obj \\r
        $(OBJS)\basedll_object.obj \\r
        $(OBJS)\basedll_platinfo.obj \\r
        $(OBJS)\basedll_powercmn.obj \\r


@@ -696,6 +741,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_tarstrm.obj \\r
        $(OBJS)\basedll_textbuf.obj \\r
        $(OBJS)\basedll_textfile.obj \\r
        $(OBJS)\basedll_tarstrm.obj \\r
        $(OBJS)\basedll_textbuf.obj \\r
        $(OBJS)\basedll_textfile.obj \\r

+       $(OBJS)\basedll_time.obj \\r

        $(OBJS)\basedll_timercmn.obj \\r
        $(OBJS)\basedll_timerimpl.obj \\r
        $(OBJS)\basedll_tokenzr.obj \\r
        $(OBJS)\basedll_timercmn.obj \\r
        $(OBJS)\basedll_timerimpl.obj \\r
        $(OBJS)\basedll_tokenzr.obj \\r


@@ -721,6 +767,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dde.obj \\r
        $(OBJS)\basedll_dir.obj \\r
        $(OBJS)\basedll_dlmsw.obj \\r
        $(OBJS)\basedll_dde.obj \\r
        $(OBJS)\basedll_dir.obj \\r
        $(OBJS)\basedll_dlmsw.obj \\r

+       $(OBJS)\basedll_evtloopconsole.obj \\r

        $(OBJS)\basedll_mimetype.obj \\r
        $(OBJS)\basedll_power.obj \\r
        $(OBJS)\basedll_regconf.obj \\r
        $(OBJS)\basedll_mimetype.obj \\r
        $(OBJS)\basedll_power.obj \\r
        $(OBJS)\basedll_regconf.obj \\r


@@ -737,7 +784,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_fs_mem.obj \\r
        $(OBJS)\basedll_msgout.obj \\r
        $(OBJS)\basedll_utilscmn.obj \\r
        $(OBJS)\basedll_fs_mem.obj \\r
        $(OBJS)\basedll_msgout.obj \\r
        $(OBJS)\basedll_utilscmn.obj \\r

-       $(OBJS)\basedll_evtloop.obj \\r

        $(OBJS)\basedll_main.obj \\r
        $(OBJS)\basedll_mslu.obj \\r
        $(OBJS)\basedll_volume.obj\r
        $(OBJS)\basedll_main.obj \\r
        $(OBJS)\basedll_mslu.obj \\r
        $(OBJS)\basedll_volume.obj\r


@@ -746,25 +792,28 @@ BASEDLL_RESOURCES =  \
 BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
 BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)\r

 BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
 BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 BASELIB_OBJECTS =  \\r
        $(OBJS)\baselib_dummy.obj \\r
        $(OBJS)\baselib_any.obj \\r
 BASELIB_OBJECTS =  \\r
        $(OBJS)\baselib_dummy.obj \\r
        $(OBJS)\baselib_any.obj \\r


@@ -813,6 +862,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_mimecmn.obj \\r
        $(OBJS)\baselib_module.obj \\r
        $(OBJS)\baselib_mstream.obj \\r
        $(OBJS)\baselib_mimecmn.obj \\r
        $(OBJS)\baselib_module.obj \\r
        $(OBJS)\baselib_mstream.obj \\r

+       $(OBJS)\baselib_numformatter.obj \\r

        $(OBJS)\baselib_object.obj \\r
        $(OBJS)\baselib_platinfo.obj \\r
        $(OBJS)\baselib_powercmn.obj \\r
        $(OBJS)\baselib_object.obj \\r
        $(OBJS)\baselib_platinfo.obj \\r
        $(OBJS)\baselib_powercmn.obj \\r


@@ -832,6 +882,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_tarstrm.obj \\r
        $(OBJS)\baselib_textbuf.obj \\r
        $(OBJS)\baselib_textfile.obj \\r
        $(OBJS)\baselib_tarstrm.obj \\r
        $(OBJS)\baselib_textbuf.obj \\r
        $(OBJS)\baselib_textfile.obj \\r

+       $(OBJS)\baselib_time.obj \\r

        $(OBJS)\baselib_timercmn.obj \\r
        $(OBJS)\baselib_timerimpl.obj \\r
        $(OBJS)\baselib_tokenzr.obj \\r
        $(OBJS)\baselib_timercmn.obj \\r
        $(OBJS)\baselib_timerimpl.obj \\r
        $(OBJS)\baselib_tokenzr.obj \\r


@@ -857,6 +908,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dde.obj \\r
        $(OBJS)\baselib_dir.obj \\r
        $(OBJS)\baselib_dlmsw.obj \\r
        $(OBJS)\baselib_dde.obj \\r
        $(OBJS)\baselib_dir.obj \\r
        $(OBJS)\baselib_dlmsw.obj \\r

+       $(OBJS)\baselib_evtloopconsole.obj \\r

        $(OBJS)\baselib_mimetype.obj \\r
        $(OBJS)\baselib_power.obj \\r
        $(OBJS)\baselib_regconf.obj \\r
        $(OBJS)\baselib_mimetype.obj \\r
        $(OBJS)\baselib_power.obj \\r
        $(OBJS)\baselib_regconf.obj \\r


@@ -873,22 +925,22 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_fs_mem.obj \\r
        $(OBJS)\baselib_msgout.obj \\r
        $(OBJS)\baselib_utilscmn.obj \\r
        $(OBJS)\baselib_fs_mem.obj \\r
        $(OBJS)\baselib_msgout.obj \\r
        $(OBJS)\baselib_utilscmn.obj \\r

-       $(OBJS)\baselib_evtloop.obj \\r

        $(OBJS)\baselib_main.obj \\r
        $(OBJS)\baselib_mslu.obj \\r
        $(OBJS)\baselib_volume.obj\r
 NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\baselib_main.obj \\r
        $(OBJS)\baselib_mslu.obj \\r
        $(OBJS)\baselib_volume.obj\r
 NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET \\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 NETDLL_OBJECTS =  \\r
        $(OBJS)\netdll_dummy.obj \\r
        $(OBJS)\netdll_fs_inet.obj \\r
 NETDLL_OBJECTS =  \\r
        $(OBJS)\netdll_dummy.obj \\r
        $(OBJS)\netdll_fs_inet.obj \\r


@@ -908,14 +960,16 @@ NETDLL_RESOURCES =  \
 NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \\r
 NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 NETLIB_OBJECTS =  \\r
        $(OBJS)\netlib_dummy.obj \\r
        $(OBJS)\netlib_fs_inet.obj \\r
 NETLIB_OBJECTS =  \\r
        $(OBJS)\netlib_dummy.obj \\r
        $(OBJS)\netlib_fs_inet.obj \\r


@@ -932,23 +986,23 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_urlmsw.obj\r
 COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\netlib_urlmsw.obj\r
 COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 \\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 COREDLL_OBJECTS =  \\r
        $(OBJS)\coredll_dummy.obj \\r
        $(OBJS)\coredll_event.obj \\r
        $(OBJS)\coredll_fs_mem.obj \\r
        $(OBJS)\coredll_msgout.obj \\r
        $(OBJS)\coredll_utilscmn.obj \\r
 COREDLL_OBJECTS =  \\r
        $(OBJS)\coredll_dummy.obj \\r
        $(OBJS)\coredll_event.obj \\r
        $(OBJS)\coredll_fs_mem.obj \\r
        $(OBJS)\coredll_msgout.obj \\r
        $(OBJS)\coredll_utilscmn.obj \\r

-       $(OBJS)\coredll_evtloop.obj \\r

        $(OBJS)\coredll_main.obj \\r
        $(OBJS)\coredll_mslu.obj \\r
        $(OBJS)\coredll_volume.obj \\r
        $(OBJS)\coredll_main.obj \\r
        $(OBJS)\coredll_mslu.obj \\r
        $(OBJS)\coredll_volume.obj \\r


@@ -958,37 +1012,39 @@ COREDLL_RESOURCES =  \
 CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \\r
 CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \\r
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 CORELIB_OBJECTS =  \\r
        $(OBJS)\corelib_dummy.obj \\r
        $(OBJS)\corelib_event.obj \\r
        $(OBJS)\corelib_fs_mem.obj \\r
        $(OBJS)\corelib_msgout.obj \\r
        $(OBJS)\corelib_utilscmn.obj \\r
 CORELIB_OBJECTS =  \\r
        $(OBJS)\corelib_dummy.obj \\r
        $(OBJS)\corelib_event.obj \\r
        $(OBJS)\corelib_fs_mem.obj \\r
        $(OBJS)\corelib_msgout.obj \\r
        $(OBJS)\corelib_utilscmn.obj \\r

-       $(OBJS)\corelib_evtloop.obj \\r

        $(OBJS)\corelib_main.obj \\r
        $(OBJS)\corelib_mslu.obj \\r
        $(OBJS)\corelib_volume.obj \\r
        $(____CORE_SRC_FILENAMES_3_OBJECTS)\r
 ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\corelib_main.obj \\r
        $(OBJS)\corelib_mslu.obj \\r
        $(OBJS)\corelib_volume.obj \\r
        $(____CORE_SRC_FILENAMES_3_OBJECTS)\r
 ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 ADVDLL_OBJECTS =  \\r
        $(OBJS)\advdll_dummy.obj \\r
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)\r
 ADVDLL_OBJECTS =  \\r
        $(OBJS)\advdll_dummy.obj \\r
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)\r


@@ -997,29 +1053,32 @@ ADVDLL_RESOURCES =  \
 ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \\r
 ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 ADVLIB_OBJECTS =  \\r
        $(OBJS)\advlib_dummy.obj \\r
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)\r
 MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
 ADVLIB_OBJECTS =  \\r
        $(OBJS)\advlib_dummy.obj \\r
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)\r
 MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 MEDIADLL_OBJECTS =  \\r
        $(OBJS)\mediadll_dummy.obj \\r
        $(OBJS)\mediadll_mediactrlcmn.obj \\r
 MEDIADLL_OBJECTS =  \\r
        $(OBJS)\mediadll_dummy.obj \\r
        $(OBJS)\mediadll_mediactrlcmn.obj \\r


@@ -1031,14 +1090,16 @@ MEDIADLL_RESOURCES =  \
 MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \\r
 MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 MEDIALIB_OBJECTS =  \\r
        $(OBJS)\medialib_dummy.obj \\r
        $(OBJS)\medialib_mediactrlcmn.obj \\r
 MEDIALIB_OBJECTS =  \\r
        $(OBJS)\medialib_dummy.obj \\r
        $(OBJS)\medialib_mediactrlcmn.obj \\r


@@ -1047,16 +1108,17 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrl_qt.obj\r
 HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        $(OBJS)\medialib_mediactrl_qt.obj\r
 HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 HTMLDLL_OBJECTS =  \\r
        $(OBJS)\htmldll_dummy.obj \\r
        $(OBJS)\htmldll_helpbest.obj \\r
 HTMLDLL_OBJECTS =  \\r
        $(OBJS)\htmldll_dummy.obj \\r
        $(OBJS)\htmldll_helpbest.obj \\r


@@ -1090,14 +1152,16 @@ HTMLDLL_RESOURCES =  \
 HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \\r
 HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 HTMLLIB_OBJECTS =  \\r
        $(OBJS)\htmllib_dummy.obj \\r
        $(OBJS)\htmllib_helpbest.obj \\r
 HTMLLIB_OBJECTS =  \\r
        $(OBJS)\htmllib_dummy.obj \\r
        $(OBJS)\htmllib_helpbest.obj \\r


@@ -1126,87 +1190,135 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_styleparams.obj \\r
        $(OBJS)\htmllib_winpars.obj \\r
        $(OBJS)\htmllib_htmllbox.obj\r
        $(OBJS)\htmllib_styleparams.obj \\r
        $(OBJS)\htmllib_winpars.obj \\r
        $(OBJS)\htmllib_htmllbox.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_WEBVIEW $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_webviewdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+WEBVIEWDLL_OBJECTS =  \\r
+       $(OBJS)\webviewdll_dummy.obj \\r
+       $(OBJS)\webviewdll_webview_ie.obj \\r
+       $(OBJS)\webviewdll_webview.obj \\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
+WEBVIEWDLL_RESOURCES =  \\r
+       $(OBJS)\webviewdll_version.res\r
+WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_webviewlib.pch" \\r

        $(CPPFLAGS) $(CXXFLAGS)\r
        $(CPPFLAGS) $(CXXFLAGS)\r

+WEBVIEWLIB_OBJECTS =  \\r
+       $(OBJS)\webviewlib_dummy.obj \\r
+       $(OBJS)\webviewlib_webview_ie.obj \\r
+       $(OBJS)\webviewlib_webview.obj \\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 QADLL_OBJECTS =  \\r
        $(OBJS)\qadll_dummy.obj \\r
        $(OBJS)\qadll_debugrpt.obj \\r
        $(OBJS)\qadll_dbgrptg.obj\r
 QADLL_RESOURCES =  \\r
        $(OBJS)\qadll_version.res\r
 QADLL_OBJECTS =  \\r
        $(OBJS)\qadll_dummy.obj \\r
        $(OBJS)\qadll_debugrpt.obj \\r
        $(OBJS)\qadll_dbgrptg.obj\r
 QADLL_RESOURCES =  \\r
        $(OBJS)\qadll_version.res\r

-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \\r
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 QALIB_OBJECTS =  \\r
        $(OBJS)\qalib_dummy.obj \\r
        $(OBJS)\qalib_debugrpt.obj \\r
        $(OBJS)\qalib_dbgrptg.obj\r
 QALIB_OBJECTS =  \\r
        $(OBJS)\qalib_dummy.obj \\r
        $(OBJS)\qalib_debugrpt.obj \\r
        $(OBJS)\qalib_dbgrptg.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML \\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 XMLDLL_OBJECTS =  \\r
        $(OBJS)\xmldll_dummy.obj \\r
        $(OBJS)\xmldll_xml.obj \\r
        $(OBJS)\xmldll_xtixml.obj\r
 XMLDLL_RESOURCES =  \\r
        $(OBJS)\xmldll_version.res\r
 XMLDLL_OBJECTS =  \\r
        $(OBJS)\xmldll_dummy.obj \\r
        $(OBJS)\xmldll_xml.obj \\r
        $(OBJS)\xmldll_xtixml.obj\r
 XMLDLL_RESOURCES =  \\r
        $(OBJS)\xmldll_version.res\r

-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \\r
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \\r
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 XMLLIB_OBJECTS =  \\r
        $(OBJS)\xmllib_dummy.obj \\r
        $(OBJS)\xmllib_xml.obj \\r
        $(OBJS)\xmllib_xtixml.obj\r
 XMLLIB_OBJECTS =  \\r
        $(OBJS)\xmllib_dummy.obj \\r
        $(OBJS)\xmllib_xml.obj \\r
        $(OBJS)\xmllib_xtixml.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 XRCDLL_OBJECTS =  \\r
        $(OBJS)\xrcdll_dummy.obj \\r
        $(OBJS)\xrcdll_xh_animatctrl.obj \\r
 XRCDLL_OBJECTS =  \\r
        $(OBJS)\xrcdll_dummy.obj \\r
        $(OBJS)\xrcdll_xh_animatctrl.obj \\r

+       $(OBJS)\xrcdll_xh_bannerwindow.obj \\r

        $(OBJS)\xrcdll_xh_bmp.obj \\r
        $(OBJS)\xrcdll_xh_bmpcbox.obj \\r
        $(OBJS)\xrcdll_xh_bmpbt.obj \\r
        $(OBJS)\xrcdll_xh_bmp.obj \\r
        $(OBJS)\xrcdll_xh_bmpcbox.obj \\r
        $(OBJS)\xrcdll_xh_bmpbt.obj \\r


@@ -1260,6 +1372,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_sttxt.obj \\r
        $(OBJS)\xrcdll_xh_text.obj \\r
        $(OBJS)\xrcdll_xh_tglbtn.obj \\r
        $(OBJS)\xrcdll_xh_sttxt.obj \\r
        $(OBJS)\xrcdll_xh_text.obj \\r
        $(OBJS)\xrcdll_xh_tglbtn.obj \\r

+       $(OBJS)\xrcdll_xh_timectrl.obj \\r

        $(OBJS)\xrcdll_xh_toolb.obj \\r
        $(OBJS)\xrcdll_xh_toolbk.obj \\r
        $(OBJS)\xrcdll_xh_tree.obj \\r
        $(OBJS)\xrcdll_xh_toolb.obj \\r
        $(OBJS)\xrcdll_xh_toolbk.obj \\r
        $(OBJS)\xrcdll_xh_tree.obj \\r


@@ -1271,20 +1384,23 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xmlrsall.obj\r
 XRCDLL_RESOURCES =  \\r
        $(OBJS)\xrcdll_version.res\r
        $(OBJS)\xrcdll_xmlrsall.obj\r
 XRCDLL_RESOURCES =  \\r
        $(OBJS)\xrcdll_version.res\r

-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \\r
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 XRCLIB_OBJECTS =  \\r
        $(OBJS)\xrclib_dummy.obj \\r
        $(OBJS)\xrclib_xh_animatctrl.obj \\r
 XRCLIB_OBJECTS =  \\r
        $(OBJS)\xrclib_dummy.obj \\r
        $(OBJS)\xrclib_xh_animatctrl.obj \\r

+       $(OBJS)\xrclib_xh_bannerwindow.obj \\r

        $(OBJS)\xrclib_xh_bmp.obj \\r
        $(OBJS)\xrclib_xh_bmpcbox.obj \\r
        $(OBJS)\xrclib_xh_bmpbt.obj \\r
        $(OBJS)\xrclib_xh_bmp.obj \\r
        $(OBJS)\xrclib_xh_bmpcbox.obj \\r
        $(OBJS)\xrclib_xh_bmpbt.obj \\r


@@ -1338,6 +1454,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_sttxt.obj \\r
        $(OBJS)\xrclib_xh_text.obj \\r
        $(OBJS)\xrclib_xh_tglbtn.obj \\r
        $(OBJS)\xrclib_xh_sttxt.obj \\r
        $(OBJS)\xrclib_xh_text.obj \\r
        $(OBJS)\xrclib_xh_tglbtn.obj \\r

+       $(OBJS)\xrclib_xh_timectrl.obj \\r

        $(OBJS)\xrclib_xh_toolb.obj \\r
        $(OBJS)\xrclib_xh_toolbk.obj \\r
        $(OBJS)\xrclib_xh_tree.obj \\r
        $(OBJS)\xrclib_xh_toolb.obj \\r
        $(OBJS)\xrclib_xh_toolbk.obj \\r
        $(OBJS)\xrclib_xh_tree.obj \\r


@@ -1347,18 +1464,19 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xmlres.obj \\r
        $(OBJS)\xrclib_xmladv.obj \\r
        $(OBJS)\xrclib_xmlrsall.obj\r
        $(OBJS)\xrclib_xmlres.obj \\r
        $(OBJS)\xrclib_xmladv.obj \\r
        $(OBJS)\xrclib_xmlrsall.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auidll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 AUIDLL_OBJECTS =  \\r
        $(OBJS)\auidll_dummy.obj \\r
        $(OBJS)\auidll_framemanager.obj \\r
 AUIDLL_OBJECTS =  \\r
        $(OBJS)\auidll_dummy.obj \\r
        $(OBJS)\auidll_framemanager.obj \\r


@@ -1366,20 +1484,24 @@ AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_floatpane.obj \\r
        $(OBJS)\auidll_auibook.obj \\r
        $(OBJS)\auidll_auibar.obj \\r
        $(OBJS)\auidll_floatpane.obj \\r
        $(OBJS)\auidll_auibook.obj \\r
        $(OBJS)\auidll_auibar.obj \\r

-       $(OBJS)\auidll_tabmdi.obj\r
+       $(OBJS)\auidll_tabmdi.obj \\r
+       $(OBJS)\auidll_tabart.obj \\r
+       $(OBJS)\auidll_xh_auinotbk.obj\r

 AUIDLL_RESOURCES =  \\r
        $(OBJS)\auidll_version.res\r
 AUIDLL_RESOURCES =  \\r
        $(OBJS)\auidll_version.res\r

-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \\r
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 AUILIB_OBJECTS =  \\r
        $(OBJS)\auilib_dummy.obj \\r
        $(OBJS)\auilib_framemanager.obj \\r
 AUILIB_OBJECTS =  \\r
        $(OBJS)\auilib_dummy.obj \\r
        $(OBJS)\auilib_framemanager.obj \\r


@@ -1387,19 +1509,22 @@ AUILIB_OBJECTS =  \
        $(OBJS)\auilib_floatpane.obj \\r
        $(OBJS)\auilib_auibook.obj \\r
        $(OBJS)\auilib_auibar.obj \\r
        $(OBJS)\auilib_floatpane.obj \\r
        $(OBJS)\auilib_auibook.obj \\r
        $(OBJS)\auilib_auibar.obj \\r

-       $(OBJS)\auilib_tabmdi.obj\r
-RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(OBJS)\auilib_tabmdi.obj \\r
+       $(OBJS)\auilib_tabart.obj \\r
+       $(OBJS)\auilib_xh_auinotbk.obj\r
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbondll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 RIBBONDLL_OBJECTS =  \\r
        $(OBJS)\ribbondll_dummy.obj \\r
        $(OBJS)\ribbondll_art_internal.obj \\r
 RIBBONDLL_OBJECTS =  \\r
        $(OBJS)\ribbondll_dummy.obj \\r
        $(OBJS)\ribbondll_art_internal.obj \\r


@@ -1411,20 +1536,23 @@ RIBBONDLL_OBJECTS =  \
        $(OBJS)\ribbondll_gallery.obj \\r
        $(OBJS)\ribbondll_page.obj \\r
        $(OBJS)\ribbondll_panel.obj \\r
        $(OBJS)\ribbondll_gallery.obj \\r
        $(OBJS)\ribbondll_page.obj \\r
        $(OBJS)\ribbondll_panel.obj \\r

-       $(OBJS)\ribbondll_toolbar.obj\r
+       $(OBJS)\ribbondll_toolbar.obj \\r
+       $(OBJS)\ribbondll_xh_ribbon.obj\r

 RIBBONDLL_RESOURCES =  \\r
        $(OBJS)\ribbondll_version.res\r
 RIBBONDLL_RESOURCES =  \\r
        $(OBJS)\ribbondll_version.res\r

-RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \\r
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_ribbonlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 RIBBONLIB_OBJECTS =  \\r
        $(OBJS)\ribbonlib_dummy.obj \\r
        $(OBJS)\ribbonlib_art_internal.obj \\r
 RIBBONLIB_OBJECTS =  \\r
        $(OBJS)\ribbonlib_dummy.obj \\r
        $(OBJS)\ribbonlib_art_internal.obj \\r


@@ -1436,19 +1564,21 @@ RIBBONLIB_OBJECTS =  \
        $(OBJS)\ribbonlib_gallery.obj \\r
        $(OBJS)\ribbonlib_page.obj \\r
        $(OBJS)\ribbonlib_panel.obj \\r
        $(OBJS)\ribbonlib_gallery.obj \\r
        $(OBJS)\ribbonlib_page.obj \\r
        $(OBJS)\ribbonlib_panel.obj \\r

-       $(OBJS)\ribbonlib_toolbar.obj\r
-PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(OBJS)\ribbonlib_toolbar.obj \\r
+       $(OBJS)\ribbonlib_xh_ribbon.obj\r
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgriddll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 PROPGRIDDLL_OBJECTS =  \\r
        $(OBJS)\propgriddll_dummy.obj \\r
        $(OBJS)\propgriddll_advprops.obj \\r
 PROPGRIDDLL_OBJECTS =  \\r
        $(OBJS)\propgriddll_dummy.obj \\r
        $(OBJS)\propgriddll_advprops.obj \\r


@@ -1461,17 +1591,19 @@ PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_props.obj\r
 PROPGRIDDLL_RESOURCES =  \\r
        $(OBJS)\propgriddll_version.res\r
        $(OBJS)\propgriddll_props.obj\r
 PROPGRIDDLL_RESOURCES =  \\r
        $(OBJS)\propgriddll_version.res\r

-PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \\r
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_propgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 PROPGRIDLIB_OBJECTS =  \\r
        $(OBJS)\propgridlib_dummy.obj \\r
        $(OBJS)\propgridlib_advprops.obj \\r
 PROPGRIDLIB_OBJECTS =  \\r
        $(OBJS)\propgridlib_dummy.obj \\r
        $(OBJS)\propgridlib_advprops.obj \\r


@@ -1482,65 +1614,72 @@ PROPGRIDLIB_OBJECTS =  \
        $(OBJS)\propgridlib_propgridiface.obj \\r
        $(OBJS)\propgridlib_propgridpagestate.obj \\r
        $(OBJS)\propgridlib_props.obj\r
        $(OBJS)\propgridlib_propgridiface.obj \\r
        $(OBJS)\propgridlib_propgridpagestate.obj \\r
        $(OBJS)\propgridlib_props.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextdll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 RICHTEXTDLL_OBJECTS =  \\r
        $(OBJS)\richtextdll_dummy.obj \\r
 RICHTEXTDLL_OBJECTS =  \\r
        $(OBJS)\richtextdll_dummy.obj \\r

-       $(OBJS)\richtextdll_richtextctrl.obj \\r

        $(OBJS)\richtextdll_richtextbuffer.obj \\r
        $(OBJS)\richtextdll_richtextbuffer.obj \\r

-       $(OBJS)\richtextdll_richtextstyles.obj \\r
-       $(OBJS)\richtextdll_richtextxml.obj \\r
-       $(OBJS)\richtextdll_richtexthtml.obj \\r
+       $(OBJS)\richtextdll_richtextctrl.obj \\r

        $(OBJS)\richtextdll_richtextformatdlg.obj \\r
        $(OBJS)\richtextdll_richtextformatdlg.obj \\r

-       $(OBJS)\richtextdll_richtextsymboldlg.obj \\r
-       $(OBJS)\richtextdll_richtextstyledlg.obj \\r
+       $(OBJS)\richtextdll_richtexthtml.obj \\r
+       $(OBJS)\richtextdll_richtextimagedlg.obj \\r

        $(OBJS)\richtextdll_richtextprint.obj \\r
        $(OBJS)\richtextdll_richtextprint.obj \\r

-       $(OBJS)\richtextdll_richtextimagedlg.obj\r
+       $(OBJS)\richtextdll_richtextstyledlg.obj \\r
+       $(OBJS)\richtextdll_richtextstyles.obj \\r
+       $(OBJS)\richtextdll_richtextsymboldlg.obj \\r
+       $(OBJS)\richtextdll_richtextxml.obj \\r
+       $(OBJS)\richtextdll_xh_richtext.obj\r

 RICHTEXTDLL_RESOURCES =  \\r
        $(OBJS)\richtextdll_version.res\r
 RICHTEXTDLL_RESOURCES =  \\r
        $(OBJS)\richtextdll_version.res\r

-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \\r
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 RICHTEXTLIB_OBJECTS =  \\r
        $(OBJS)\richtextlib_dummy.obj \\r
 RICHTEXTLIB_OBJECTS =  \\r
        $(OBJS)\richtextlib_dummy.obj \\r

-       $(OBJS)\richtextlib_richtextctrl.obj \\r

        $(OBJS)\richtextlib_richtextbuffer.obj \\r
        $(OBJS)\richtextlib_richtextbuffer.obj \\r

-       $(OBJS)\richtextlib_richtextstyles.obj \\r
-       $(OBJS)\richtextlib_richtextxml.obj \\r
-       $(OBJS)\richtextlib_richtexthtml.obj \\r
+       $(OBJS)\richtextlib_richtextctrl.obj \\r

        $(OBJS)\richtextlib_richtextformatdlg.obj \\r
        $(OBJS)\richtextlib_richtextformatdlg.obj \\r

-       $(OBJS)\richtextlib_richtextsymboldlg.obj \\r
-       $(OBJS)\richtextlib_richtextstyledlg.obj \\r
+       $(OBJS)\richtextlib_richtexthtml.obj \\r
+       $(OBJS)\richtextlib_richtextimagedlg.obj \\r

        $(OBJS)\richtextlib_richtextprint.obj \\r
        $(OBJS)\richtextlib_richtextprint.obj \\r

-       $(OBJS)\richtextlib_richtextimagedlg.obj\r
-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(OBJS)\richtextlib_richtextstyledlg.obj \\r
+       $(OBJS)\richtextlib_richtextstyles.obj \\r
+       $(OBJS)\richtextlib_richtextsymboldlg.obj \\r
+       $(OBJS)\richtextlib_richtextxml.obj \\r
+       $(OBJS)\richtextlib_xh_richtext.obj\r
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS)\r


@@ -1551,16 +1690,18 @@ STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_ScintillaWX.obj\r
 STCDLL_RESOURCES =  \\r
        $(OBJS)\stcdll_version.res\r
        $(OBJS)\stcdll_ScintillaWX.obj\r
 STCDLL_RESOURCES =  \\r
        $(OBJS)\stcdll_version.res\r

-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \\r
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r

        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
        /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
        /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
        /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS)\r


@@ -1569,35 +1710,38 @@ STCLIB_OBJECTS =  \
        $(OBJS)\stclib_stc.obj \\r
        $(OBJS)\stclib_PlatWX.obj \\r
        $(OBJS)\stclib_ScintillaWX.obj\r
        $(OBJS)\stclib_stc.obj \\r
        $(OBJS)\stclib_PlatWX.obj \\r
        $(OBJS)\stclib_ScintillaWX.obj\r

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

        $(__DEBUGINFO) \\r
        $(__DEBUGINFO) \\r

-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \\r
+       /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
+       /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)\r

 GLDLL_OBJECTS =  \\r
        $(OBJS)\gldll_dummy.obj \\r
        $(OBJS)\gldll_glcmn.obj \\r
        $(OBJS)\gldll_glcanvas.obj\r
 GLDLL_RESOURCES =  \\r
        $(OBJS)\gldll_version.res\r
 GLDLL_OBJECTS =  \\r
        $(OBJS)\gldll_dummy.obj \\r
        $(OBJS)\gldll_glcmn.obj \\r
        $(OBJS)\gldll_glcanvas.obj\r
 GLDLL_RESOURCES =  \\r
        $(OBJS)\gldll_version.res\r

-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \\r
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_627)$(__DEBUGRUNTIME) /DWIN32 \\r

        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \\r

-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \\r
-       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \\r
-       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \\r
-       /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \\r
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \\r
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \\r
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 GLLIB_OBJECTS =  \\r
        $(OBJS)\gllib_dummy.obj \\r
        $(OBJS)\gllib_glcmn.obj \\r
 GLLIB_OBJECTS =  \\r
        $(OBJS)\gllib_dummy.obj \\r
        $(OBJS)\gllib_glcmn.obj \\r


@@ -1606,11 +1750,38 @@ BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+!if "$(TARGET_CPU)" == "AMD64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r

 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "0"\r
+WXCOMPILER = _vc\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+WXCOMPILER = _vc$(COMPILER_VERSION)$(ARCH_SUFFIX)\r

 !endif\r
 !if "$(OFFICIAL_BUILD)" == "0"\r
 VENDORTAG = _$(VENDOR)\r
 !endif\r
 !if "$(OFFICIAL_BUILD)" == "0"\r
 VENDORTAG = _$(VENDOR)\r


@@ -1630,18 +1801,6 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r

-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r

 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r


@@ -1657,12 +1816,18 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "X64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r

 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "x64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r

 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_10 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_10 = D\r
 !endif\r


@@ -1721,14 +1886,14 @@ __wxscintilla_usingdll_p = /DWXUSINGDLL
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

 !endif\r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r
 __monodll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r
 __monodll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_11)\r

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


@@ -1737,7 +1902,7 @@ __DEBUGINFO_108 =
 __DEBUGINFO_108 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_108 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_116 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_116 = D\r


@@ -1779,9 +1944,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_styleparams.obj \\r
        $(OBJS)\monodll_winpars.obj \\r
        $(OBJS)\monodll_htmllbox.obj \\r
        $(OBJS)\monodll_styleparams.obj \\r
        $(OBJS)\monodll_winpars.obj \\r
        $(OBJS)\monodll_htmllbox.obj \\r

+       $(OBJS)\monodll_webview_ie.obj \\r
+       $(OBJS)\monodll_webview.obj \\r
+       $(OBJS)\monodll_webviewarchivehandler.obj \\r
+       $(OBJS)\monodll_webviewfshandler.obj \\r

        $(OBJS)\monodll_debugrpt.obj \\r
        $(OBJS)\monodll_dbgrptg.obj \\r
        $(OBJS)\monodll_xh_animatctrl.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
        $(OBJS)\monodll_dbgrptg.obj \\r
        $(OBJS)\monodll_xh_animatctrl.obj \\r

+       $(OBJS)\monodll_xh_bannerwindow.obj \\r

        $(OBJS)\monodll_xh_bmp.obj \\r
        $(OBJS)\monodll_xh_bmpcbox.obj \\r
        $(OBJS)\monodll_xh_bmpbt.obj \\r
        $(OBJS)\monodll_xh_bmp.obj \\r
        $(OBJS)\monodll_xh_bmpcbox.obj \\r
        $(OBJS)\monodll_xh_bmpbt.obj \\r


@@ -1835,6 +2005,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_sttxt.obj \\r
        $(OBJS)\monodll_xh_text.obj \\r
        $(OBJS)\monodll_xh_tglbtn.obj \\r
        $(OBJS)\monodll_xh_sttxt.obj \\r
        $(OBJS)\monodll_xh_text.obj \\r
        $(OBJS)\monodll_xh_tglbtn.obj \\r

+       $(OBJS)\monodll_xh_timectrl.obj \\r

        $(OBJS)\monodll_xh_toolb.obj \\r
        $(OBJS)\monodll_xh_toolbk.obj \\r
        $(OBJS)\monodll_xh_tree.obj \\r
        $(OBJS)\monodll_xh_toolb.obj \\r
        $(OBJS)\monodll_xh_toolbk.obj \\r
        $(OBJS)\monodll_xh_tree.obj \\r


@@ -1850,6 +2021,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_auibook.obj \\r
        $(OBJS)\monodll_auibar.obj \\r
        $(OBJS)\monodll_tabmdi.obj \\r
        $(OBJS)\monodll_auibook.obj \\r
        $(OBJS)\monodll_auibar.obj \\r
        $(OBJS)\monodll_tabmdi.obj \\r

+       $(OBJS)\monodll_tabart.obj \\r
+       $(OBJS)\monodll_xh_auinotbk.obj \\r

        $(OBJS)\monodll_advprops.obj \\r
        $(OBJS)\monodll_editors.obj \\r
        $(OBJS)\monodll_manager.obj \\r
        $(OBJS)\monodll_advprops.obj \\r
        $(OBJS)\monodll_editors.obj \\r
        $(OBJS)\monodll_manager.obj \\r


@@ -1866,18 +2039,20 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_ribbon_control.obj \\r
        $(OBJS)\monodll_gallery.obj \\r
        $(OBJS)\monodll_page.obj \\r
        $(OBJS)\monodll_ribbon_control.obj \\r
        $(OBJS)\monodll_gallery.obj \\r
        $(OBJS)\monodll_page.obj \\r

-       $(OBJS)\monodll_panel.obj \\r
+       $(OBJS)\monodll_ribbon_panel.obj \\r

        $(OBJS)\monodll_ribbon_toolbar.obj \\r
        $(OBJS)\monodll_ribbon_toolbar.obj \\r

-       $(OBJS)\monodll_richtextctrl.obj \\r
+       $(OBJS)\monodll_xh_ribbon.obj \\r

        $(OBJS)\monodll_richtextbuffer.obj \\r
        $(OBJS)\monodll_richtextbuffer.obj \\r

-       $(OBJS)\monodll_richtextstyles.obj \\r
-       $(OBJS)\monodll_richtextxml.obj \\r
-       $(OBJS)\monodll_richtexthtml.obj \\r
+       $(OBJS)\monodll_richtextctrl.obj \\r

        $(OBJS)\monodll_richtextformatdlg.obj \\r
        $(OBJS)\monodll_richtextformatdlg.obj \\r

-       $(OBJS)\monodll_richtextsymboldlg.obj \\r
-       $(OBJS)\monodll_richtextstyledlg.obj \\r
-       $(OBJS)\monodll_richtextprint.obj \\r
+       $(OBJS)\monodll_richtexthtml.obj \\r

        $(OBJS)\monodll_richtextimagedlg.obj \\r
        $(OBJS)\monodll_richtextimagedlg.obj \\r

+       $(OBJS)\monodll_richtextprint.obj \\r
+       $(OBJS)\monodll_richtextstyledlg.obj \\r
+       $(OBJS)\monodll_richtextstyles.obj \\r
+       $(OBJS)\monodll_richtextsymboldlg.obj \\r
+       $(OBJS)\monodll_richtextxml.obj \\r
+       $(OBJS)\monodll_xh_richtext.obj \\r

        $(OBJS)\monodll_stc.obj \\r
        $(OBJS)\monodll_PlatWX.obj \\r
        $(OBJS)\monodll_ScintillaWX.obj\r
        $(OBJS)\monodll_stc.obj \\r
        $(OBJS)\monodll_PlatWX.obj \\r
        $(OBJS)\monodll_ScintillaWX.obj\r


@@ -1912,10 +2087,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \\r
        $(OBJS)\monodll_imaglist.obj \\r
        $(OBJS)\monodll_minifram.obj \\r
        $(OBJS)\monodll_icon.obj \\r
        $(OBJS)\monodll_imaglist.obj \\r
        $(OBJS)\monodll_minifram.obj \\r

+       $(OBJS)\monodll_nonownedwnd.obj \\r

        $(OBJS)\monodll_dataobj.obj \\r
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r
        $(OBJS)\monodll_dataobj.obj \\r
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r

+       $(OBJS)\monodll_safearray.obj \\r

        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r


@@ -1924,9 +2101,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r

+       $(OBJS)\monodll_textmeasure.obj \\r

        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r
        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r

+       $(OBJS)\monodll_uiaction.obj \\r

        $(OBJS)\monodll_utilsgui.obj \\r
        $(OBJS)\monodll_utilsgui.obj \\r

+       $(OBJS)\monodll_utilswin.obj \\r

        $(OBJS)\monodll_uxtheme.obj \\r
        $(OBJS)\monodll_window.obj \\r
        $(OBJS)\monodll_helpchm.obj \\r
        $(OBJS)\monodll_uxtheme.obj \\r
        $(OBJS)\monodll_window.obj \\r
        $(OBJS)\monodll_helpchm.obj \\r


@@ -1940,6 +2120,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_generic_statusbr.obj \\r
        $(OBJS)\monodll_prntdlgg.obj \\r
        $(OBJS)\monodll_msw_accel.obj \\r
        $(OBJS)\monodll_generic_statusbr.obj \\r
        $(OBJS)\monodll_prntdlgg.obj \\r
        $(OBJS)\monodll_msw_accel.obj \\r

+       $(OBJS)\monodll_anybutton.obj \\r

        $(OBJS)\monodll_artmsw.obj \\r
        $(OBJS)\monodll_msw_bmpbuttn.obj \\r
        $(OBJS)\monodll_msw_button.obj \\r
        $(OBJS)\monodll_artmsw.obj \\r
        $(OBJS)\monodll_msw_bmpbuttn.obj \\r
        $(OBJS)\monodll_msw_button.obj \\r


@@ -1952,6 +2133,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msw_dialog.obj \\r
        $(OBJS)\monodll_dirdlg.obj \\r
        $(OBJS)\monodll_dragimag.obj \\r
        $(OBJS)\monodll_msw_dialog.obj \\r
        $(OBJS)\monodll_dirdlg.obj \\r
        $(OBJS)\monodll_dragimag.obj \\r

+       $(OBJS)\monodll_evtloop.obj \\r

        $(OBJS)\monodll_filedlg.obj \\r
        $(OBJS)\monodll_frame.obj \\r
        $(OBJS)\monodll_msw_gauge.obj \\r
        $(OBJS)\monodll_filedlg.obj \\r
        $(OBJS)\monodll_frame.obj \\r
        $(OBJS)\monodll_msw_gauge.obj \\r


@@ -1969,6 +2151,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msw_notebook.obj \\r
        $(OBJS)\monodll_access.obj \\r
        $(OBJS)\monodll_ownerdrw.obj \\r
        $(OBJS)\monodll_msw_notebook.obj \\r
        $(OBJS)\monodll_access.obj \\r
        $(OBJS)\monodll_ownerdrw.obj \\r

+       $(OBJS)\monodll_msw_panel.obj \\r

        $(OBJS)\monodll_progdlg.obj \\r
        $(OBJS)\monodll_msw_radiobox.obj \\r
        $(OBJS)\monodll_msw_radiobut.obj \\r
        $(OBJS)\monodll_progdlg.obj \\r
        $(OBJS)\monodll_msw_radiobox.obj \\r
        $(OBJS)\monodll_msw_radiobut.obj \\r


@@ -1987,24 +2170,29 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_textentry.obj \\r
        $(OBJS)\monodll_msw_tglbtn.obj \\r
        $(OBJS)\monodll_treectrl.obj \\r
        $(OBJS)\monodll_textentry.obj \\r
        $(OBJS)\monodll_msw_tglbtn.obj \\r
        $(OBJS)\monodll_treectrl.obj \\r

-       $(OBJS)\monodll_uiaction.obj \\r

        $(OBJS)\monodll_msw_checklst.obj \\r
        $(OBJS)\monodll_msw_fdrepdlg.obj \\r
        $(OBJS)\monodll_fontdlg.obj \\r
        $(OBJS)\monodll_accelcmn.obj \\r
        $(OBJS)\monodll_accesscmn.obj \\r
        $(OBJS)\monodll_anidecod.obj \\r
        $(OBJS)\monodll_msw_checklst.obj \\r
        $(OBJS)\monodll_msw_fdrepdlg.obj \\r
        $(OBJS)\monodll_fontdlg.obj \\r
        $(OBJS)\monodll_accelcmn.obj \\r
        $(OBJS)\monodll_accesscmn.obj \\r
        $(OBJS)\monodll_anidecod.obj \\r

+       $(OBJS)\monodll_affinematrix2d.obj \\r

        $(OBJS)\monodll_appcmn.obj \\r
        $(OBJS)\monodll_artprov.obj \\r
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_appcmn.obj \\r
        $(OBJS)\monodll_artprov.obj \\r
        $(OBJS)\monodll_artstd.obj \\r

+       $(OBJS)\monodll_arttango.obj \\r

        $(OBJS)\monodll_bmpbase.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r

+       $(OBJS)\monodll_bmpbtncmn.obj \\r

        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r

+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r

        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
        $(OBJS)\monodll_colourcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
        $(OBJS)\monodll_colourcmn.obj \\r

+       $(OBJS)\monodll_colourdata.obj \\r

        $(OBJS)\monodll_combocmn.obj \\r
        $(OBJS)\monodll_cmdproc.obj \\r
        $(OBJS)\monodll_cmndata.obj \\r
        $(OBJS)\monodll_combocmn.obj \\r
        $(OBJS)\monodll_cmdproc.obj \\r
        $(OBJS)\monodll_cmndata.obj \\r


@@ -2012,11 +2200,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_cshelp.obj \\r
        $(OBJS)\monodll_ctrlcmn.obj \\r
        $(OBJS)\monodll_ctrlsub.obj \\r
        $(OBJS)\monodll_cshelp.obj \\r
        $(OBJS)\monodll_ctrlcmn.obj \\r
        $(OBJS)\monodll_ctrlsub.obj \\r

-       $(OBJS)\monodll_datacmn.obj \\r

        $(OBJS)\monodll_dcbase.obj \\r
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
        $(OBJS)\monodll_dcbase.obj \\r
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r

+       $(OBJS)\monodll_dirctrlcmn.obj \\r

        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r


@@ -2032,6 +2220,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontpickercmn.obj \\r
        $(OBJS)\monodll_fldlgcmn.obj \\r
        $(OBJS)\monodll_fontcmn.obj \\r
        $(OBJS)\monodll_fontpickercmn.obj \\r
        $(OBJS)\monodll_fldlgcmn.obj \\r
        $(OBJS)\monodll_fontcmn.obj \\r

+       $(OBJS)\monodll_fontdata.obj \\r

        $(OBJS)\monodll_graphicc.obj \\r
        $(OBJS)\monodll_fontenumcmn.obj \\r
        $(OBJS)\monodll_fontmap.obj \\r
        $(OBJS)\monodll_graphicc.obj \\r
        $(OBJS)\monodll_fontenumcmn.obj \\r
        $(OBJS)\monodll_fontmap.obj \\r


@@ -2063,38 +2252,51 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_layout.obj \\r
        $(OBJS)\monodll_lboxcmn.obj \\r
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_layout.obj \\r
        $(OBJS)\monodll_lboxcmn.obj \\r
        $(OBJS)\monodll_listctrlcmn.obj \\r

+       $(OBJS)\monodll_markupparser.obj \\r

        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r

+       $(OBJS)\monodll_modalhook.obj \\r

        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r

+       $(OBJS)\monodll_panelcmn.obj \\r

        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r

+       $(OBJS)\monodll_preferencescmn.obj \\r

        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r

+       $(OBJS)\monodll_radiobtncmn.obj \\r

        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r

+       $(OBJS)\monodll_scrolbarcmn.obj \\r

        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r

+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r

        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r

+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r

        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r

+       $(OBJS)\monodll_textmeasurecmn.obj \\r

        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
        $(OBJS)\monodll_valgen.obj \\r
        $(OBJS)\monodll_validate.obj \\r
        $(OBJS)\monodll_valtext.obj \\r
        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
        $(OBJS)\monodll_valgen.obj \\r
        $(OBJS)\monodll_validate.obj \\r
        $(OBJS)\monodll_valtext.obj \\r

+       $(OBJS)\monodll_valnum.obj \\r

        $(OBJS)\monodll_wincmn.obj \\r
        $(OBJS)\monodll_windowid.obj \\r
        $(OBJS)\monodll_wrapsizer.obj \\r
        $(OBJS)\monodll_wincmn.obj \\r
        $(OBJS)\monodll_windowid.obj \\r
        $(OBJS)\monodll_wrapsizer.obj \\r


@@ -2112,10 +2314,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_infobar.obj \\r
        $(OBJS)\monodll_listbkg.obj \\r
        $(OBJS)\monodll_logg.obj \\r
        $(OBJS)\monodll_infobar.obj \\r
        $(OBJS)\monodll_listbkg.obj \\r
        $(OBJS)\monodll_logg.obj \\r

+       $(OBJS)\monodll_markuptext.obj \\r

        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r

-       $(OBJS)\monodll_panelg.obj \\r

        $(OBJS)\monodll_progdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r

+       $(OBJS)\monodll_preferencesg.obj \\r

        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r


@@ -2132,7 +2335,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r

-       $(OBJS)\monodll_vscroll.obj\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r

 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_OBJECTS =  \\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_OBJECTS =  \\r


@@ -2164,10 +2368,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \\r
        $(OBJS)\monodll_imaglist.obj \\r
        $(OBJS)\monodll_minifram.obj \\r
        $(OBJS)\monodll_icon.obj \\r
        $(OBJS)\monodll_imaglist.obj \\r
        $(OBJS)\monodll_minifram.obj \\r

+       $(OBJS)\monodll_nonownedwnd.obj \\r

        $(OBJS)\monodll_dataobj.obj \\r
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r
        $(OBJS)\monodll_dataobj.obj \\r
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r

+       $(OBJS)\monodll_safearray.obj \\r

        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r


@@ -2176,15 +2382,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r

+       $(OBJS)\monodll_textmeasure.obj \\r

        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r
        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r

+       $(OBJS)\monodll_uiaction.obj \\r

        $(OBJS)\monodll_utilsgui.obj \\r
        $(OBJS)\monodll_utilsgui.obj \\r

+       $(OBJS)\monodll_utilswin.obj \\r

        $(OBJS)\monodll_uxtheme.obj \\r
        $(OBJS)\monodll_window.obj \\r
        $(OBJS)\monodll_helpchm.obj \\r
        $(OBJS)\monodll_helpwin.obj \\r
        $(OBJS)\monodll_automtn.obj \\r
        $(OBJS)\monodll_uuid.obj \\r
        $(OBJS)\monodll_uxtheme.obj \\r
        $(OBJS)\monodll_window.obj \\r
        $(OBJS)\monodll_helpchm.obj \\r
        $(OBJS)\monodll_helpwin.obj \\r
        $(OBJS)\monodll_automtn.obj \\r
        $(OBJS)\monodll_uuid.obj \\r

+       $(OBJS)\monodll_evtloop.obj \\r

        $(OBJS)\monodll_generic_accel.obj \\r
        $(OBJS)\monodll_clrpickerg.obj \\r
        $(OBJS)\monodll_collpaneg.obj \\r
        $(OBJS)\monodll_generic_accel.obj \\r
        $(OBJS)\monodll_clrpickerg.obj \\r
        $(OBJS)\monodll_collpaneg.obj \\r


@@ -2241,17 +2451,23 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_accelcmn.obj \\r
        $(OBJS)\monodll_accesscmn.obj \\r
        $(OBJS)\monodll_anidecod.obj \\r
        $(OBJS)\monodll_accelcmn.obj \\r
        $(OBJS)\monodll_accesscmn.obj \\r
        $(OBJS)\monodll_anidecod.obj \\r

+       $(OBJS)\monodll_affinematrix2d.obj \\r

        $(OBJS)\monodll_appcmn.obj \\r
        $(OBJS)\monodll_artprov.obj \\r
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_appcmn.obj \\r
        $(OBJS)\monodll_artprov.obj \\r
        $(OBJS)\monodll_artstd.obj \\r

+       $(OBJS)\monodll_arttango.obj \\r

        $(OBJS)\monodll_bmpbase.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r

+       $(OBJS)\monodll_bmpbtncmn.obj \\r

        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r

+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r

        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
        $(OBJS)\monodll_colourcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
        $(OBJS)\monodll_colourcmn.obj \\r

+       $(OBJS)\monodll_colourdata.obj \\r

        $(OBJS)\monodll_combocmn.obj \\r
        $(OBJS)\monodll_cmdproc.obj \\r
        $(OBJS)\monodll_cmndata.obj \\r
        $(OBJS)\monodll_combocmn.obj \\r
        $(OBJS)\monodll_cmdproc.obj \\r
        $(OBJS)\monodll_cmndata.obj \\r


@@ -2259,11 +2475,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_cshelp.obj \\r
        $(OBJS)\monodll_ctrlcmn.obj \\r
        $(OBJS)\monodll_ctrlsub.obj \\r
        $(OBJS)\monodll_cshelp.obj \\r
        $(OBJS)\monodll_ctrlcmn.obj \\r
        $(OBJS)\monodll_ctrlsub.obj \\r

-       $(OBJS)\monodll_datacmn.obj \\r

        $(OBJS)\monodll_dcbase.obj \\r
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
        $(OBJS)\monodll_dcbase.obj \\r
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r

+       $(OBJS)\monodll_dirctrlcmn.obj \\r

        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r


@@ -2279,6 +2495,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontpickercmn.obj \\r
        $(OBJS)\monodll_fldlgcmn.obj \\r
        $(OBJS)\monodll_fontcmn.obj \\r
        $(OBJS)\monodll_fontpickercmn.obj \\r
        $(OBJS)\monodll_fldlgcmn.obj \\r
        $(OBJS)\monodll_fontcmn.obj \\r

+       $(OBJS)\monodll_fontdata.obj \\r

        $(OBJS)\monodll_graphicc.obj \\r
        $(OBJS)\monodll_fontenumcmn.obj \\r
        $(OBJS)\monodll_fontmap.obj \\r
        $(OBJS)\monodll_graphicc.obj \\r
        $(OBJS)\monodll_fontenumcmn.obj \\r
        $(OBJS)\monodll_fontmap.obj \\r


@@ -2310,38 +2527,51 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_layout.obj \\r
        $(OBJS)\monodll_lboxcmn.obj \\r
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_layout.obj \\r
        $(OBJS)\monodll_lboxcmn.obj \\r
        $(OBJS)\monodll_listctrlcmn.obj \\r

+       $(OBJS)\monodll_markupparser.obj \\r

        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r

+       $(OBJS)\monodll_modalhook.obj \\r

        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r

+       $(OBJS)\monodll_panelcmn.obj \\r

        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r

+       $(OBJS)\monodll_preferencescmn.obj \\r

        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r

+       $(OBJS)\monodll_radiobtncmn.obj \\r

        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r

+       $(OBJS)\monodll_scrolbarcmn.obj \\r

        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r

+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r

        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r

+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r

        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r

+       $(OBJS)\monodll_textmeasurecmn.obj \\r

        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
        $(OBJS)\monodll_valgen.obj \\r
        $(OBJS)\monodll_validate.obj \\r
        $(OBJS)\monodll_valtext.obj \\r
        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
        $(OBJS)\monodll_valgen.obj \\r
        $(OBJS)\monodll_validate.obj \\r
        $(OBJS)\monodll_valtext.obj \\r

+       $(OBJS)\monodll_valnum.obj \\r

        $(OBJS)\monodll_wincmn.obj \\r
        $(OBJS)\monodll_windowid.obj \\r
        $(OBJS)\monodll_wrapsizer.obj \\r
        $(OBJS)\monodll_wincmn.obj \\r
        $(OBJS)\monodll_windowid.obj \\r
        $(OBJS)\monodll_wrapsizer.obj \\r


@@ -2359,10 +2589,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_infobar.obj \\r
        $(OBJS)\monodll_listbkg.obj \\r
        $(OBJS)\monodll_logg.obj \\r
        $(OBJS)\monodll_infobar.obj \\r
        $(OBJS)\monodll_listbkg.obj \\r
        $(OBJS)\monodll_logg.obj \\r

+       $(OBJS)\monodll_markuptext.obj \\r

        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r

-       $(OBJS)\monodll_panelg.obj \\r

        $(OBJS)\monodll_progdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r

+       $(OBJS)\monodll_preferencesg.obj \\r

        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r


@@ -2379,7 +2610,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r

-       $(OBJS)\monodll_vscroll.obj\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r

 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r


@@ -2387,8 +2619,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bmpcboxcmn.obj \\r
        $(OBJS)\monodll_calctrlcmn.obj \\r
        $(OBJS)\monodll_datavcmn.obj \\r
        $(OBJS)\monodll_bmpcboxcmn.obj \\r
        $(OBJS)\monodll_calctrlcmn.obj \\r
        $(OBJS)\monodll_datavcmn.obj \\r

+       $(OBJS)\monodll_gridcmn.obj \\r

        $(OBJS)\monodll_hyperlnkcmn.obj \\r
        $(OBJS)\monodll_hyperlnkcmn.obj \\r

+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r

        $(OBJS)\monodll_aboutdlgg.obj \\r
        $(OBJS)\monodll_aboutdlgg.obj \\r

+       $(OBJS)\monodll_bannerwindow.obj \\r

        $(OBJS)\monodll_bmpcboxg.obj \\r
        $(OBJS)\monodll_calctrlg.obj \\r
        $(OBJS)\monodll_commandlinkbuttong.obj \\r
        $(OBJS)\monodll_bmpcboxg.obj \\r
        $(OBJS)\monodll_calctrlg.obj \\r
        $(OBJS)\monodll_commandlinkbuttong.obj \\r


@@ -2405,14 +2641,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notifmsgg.obj \\r
        $(OBJS)\monodll_odcombo.obj \\r
        $(OBJS)\monodll_propdlg.obj \\r
        $(OBJS)\monodll_notifmsgg.obj \\r
        $(OBJS)\monodll_odcombo.obj \\r
        $(OBJS)\monodll_propdlg.obj \\r

+       $(OBJS)\monodll_richtooltipg.obj \\r

        $(OBJS)\monodll_sashwin.obj \\r
        $(OBJS)\monodll_splash.obj \\r
        $(OBJS)\monodll_sashwin.obj \\r
        $(OBJS)\monodll_splash.obj \\r

+       $(OBJS)\monodll_timectrlg.obj \\r

        $(OBJS)\monodll_tipdlg.obj \\r
        $(OBJS)\monodll_tipdlg.obj \\r

+       $(OBJS)\monodll_treelist.obj \\r

        $(OBJS)\monodll_wizard.obj \\r
        $(OBJS)\monodll_taskbarcmn.obj \\r
        $(OBJS)\monodll_aboutdlg.obj \\r
        $(OBJS)\monodll_wizard.obj \\r
        $(OBJS)\monodll_taskbarcmn.obj \\r
        $(OBJS)\monodll_aboutdlg.obj \\r

-       $(OBJS)\monodll_hyperlink.obj \\r

        $(OBJS)\monodll_notifmsg.obj \\r
        $(OBJS)\monodll_notifmsg.obj \\r

+       $(OBJS)\monodll_richtooltip.obj \\r

        $(OBJS)\monodll_sound.obj \\r
        $(OBJS)\monodll_taskbar.obj \\r
        $(OBJS)\monodll_joystick.obj \\r
        $(OBJS)\monodll_sound.obj \\r
        $(OBJS)\monodll_taskbar.obj \\r
        $(OBJS)\monodll_joystick.obj \\r


@@ -2421,7 +2660,10 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_calctrl.obj \\r
        $(OBJS)\monodll_commandlinkbutton.obj \\r
        $(OBJS)\monodll_datecontrols.obj \\r
        $(OBJS)\monodll_calctrl.obj \\r
        $(OBJS)\monodll_commandlinkbutton.obj \\r
        $(OBJS)\monodll_datecontrols.obj \\r

-       $(OBJS)\monodll_datectrl.obj\r
+       $(OBJS)\monodll_datectrl.obj \\r
+       $(OBJS)\monodll_datetimectrl.obj \\r
+       $(OBJS)\monodll_hyperlink.obj \\r
+       $(OBJS)\monodll_timectrl.obj\r

 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r


@@ -2429,8 +2671,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bmpcboxcmn.obj \\r
        $(OBJS)\monodll_calctrlcmn.obj \\r
        $(OBJS)\monodll_datavcmn.obj \\r
        $(OBJS)\monodll_bmpcboxcmn.obj \\r
        $(OBJS)\monodll_calctrlcmn.obj \\r
        $(OBJS)\monodll_datavcmn.obj \\r

+       $(OBJS)\monodll_gridcmn.obj \\r

        $(OBJS)\monodll_hyperlnkcmn.obj \\r
        $(OBJS)\monodll_hyperlnkcmn.obj \\r

+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r

        $(OBJS)\monodll_aboutdlgg.obj \\r
        $(OBJS)\monodll_aboutdlgg.obj \\r

+       $(OBJS)\monodll_bannerwindow.obj \\r

        $(OBJS)\monodll_bmpcboxg.obj \\r
        $(OBJS)\monodll_calctrlg.obj \\r
        $(OBJS)\monodll_commandlinkbuttong.obj \\r
        $(OBJS)\monodll_bmpcboxg.obj \\r
        $(OBJS)\monodll_calctrlg.obj \\r
        $(OBJS)\monodll_commandlinkbuttong.obj \\r


@@ -2447,14 +2693,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notifmsgg.obj \\r
        $(OBJS)\monodll_odcombo.obj \\r
        $(OBJS)\monodll_propdlg.obj \\r
        $(OBJS)\monodll_notifmsgg.obj \\r
        $(OBJS)\monodll_odcombo.obj \\r
        $(OBJS)\monodll_propdlg.obj \\r

+       $(OBJS)\monodll_richtooltipg.obj \\r

        $(OBJS)\monodll_sashwin.obj \\r
        $(OBJS)\monodll_splash.obj \\r
        $(OBJS)\monodll_sashwin.obj \\r
        $(OBJS)\monodll_splash.obj \\r

+       $(OBJS)\monodll_timectrlg.obj \\r

        $(OBJS)\monodll_tipdlg.obj \\r
        $(OBJS)\monodll_tipdlg.obj \\r

+       $(OBJS)\monodll_treelist.obj \\r

        $(OBJS)\monodll_wizard.obj \\r
        $(OBJS)\monodll_taskbarcmn.obj \\r
        $(OBJS)\monodll_aboutdlg.obj \\r
        $(OBJS)\monodll_wizard.obj \\r
        $(OBJS)\monodll_taskbarcmn.obj \\r
        $(OBJS)\monodll_aboutdlg.obj \\r

-       $(OBJS)\monodll_hyperlink.obj \\r

        $(OBJS)\monodll_notifmsg.obj \\r
        $(OBJS)\monodll_notifmsg.obj \\r

+       $(OBJS)\monodll_richtooltip.obj \\r

        $(OBJS)\monodll_sound.obj \\r
        $(OBJS)\monodll_taskbar.obj \\r
        $(OBJS)\monodll_joystick.obj \\r
        $(OBJS)\monodll_sound.obj \\r
        $(OBJS)\monodll_taskbar.obj \\r
        $(OBJS)\monodll_joystick.obj \\r


@@ -2507,9 +2756,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_styleparams.obj \\r
        $(OBJS)\monolib_winpars.obj \\r
        $(OBJS)\monolib_htmllbox.obj \\r
        $(OBJS)\monolib_styleparams.obj \\r
        $(OBJS)\monolib_winpars.obj \\r
        $(OBJS)\monolib_htmllbox.obj \\r

+       $(OBJS)\monolib_webview_ie.obj \\r
+       $(OBJS)\monolib_webview.obj \\r
+       $(OBJS)\monolib_webviewarchivehandler.obj \\r
+       $(OBJS)\monolib_webviewfshandler.obj \\r

        $(OBJS)\monolib_debugrpt.obj \\r
        $(OBJS)\monolib_dbgrptg.obj \\r
        $(OBJS)\monolib_xh_animatctrl.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
        $(OBJS)\monolib_dbgrptg.obj \\r
        $(OBJS)\monolib_xh_animatctrl.obj \\r

+       $(OBJS)\monolib_xh_bannerwindow.obj \\r

        $(OBJS)\monolib_xh_bmp.obj \\r
        $(OBJS)\monolib_xh_bmpcbox.obj \\r
        $(OBJS)\monolib_xh_bmpbt.obj \\r
        $(OBJS)\monolib_xh_bmp.obj \\r
        $(OBJS)\monolib_xh_bmpcbox.obj \\r
        $(OBJS)\monolib_xh_bmpbt.obj \\r


@@ -2563,6 +2817,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_sttxt.obj \\r
        $(OBJS)\monolib_xh_text.obj \\r
        $(OBJS)\monolib_xh_tglbtn.obj \\r
        $(OBJS)\monolib_xh_sttxt.obj \\r
        $(OBJS)\monolib_xh_text.obj \\r
        $(OBJS)\monolib_xh_tglbtn.obj \\r

+       $(OBJS)\monolib_xh_timectrl.obj \\r

        $(OBJS)\monolib_xh_toolb.obj \\r
        $(OBJS)\monolib_xh_toolbk.obj \\r
        $(OBJS)\monolib_xh_tree.obj \\r
        $(OBJS)\monolib_xh_toolb.obj \\r
        $(OBJS)\monolib_xh_toolbk.obj \\r
        $(OBJS)\monolib_xh_tree.obj \\r


@@ -2578,6 +2833,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_auibook.obj \\r
        $(OBJS)\monolib_auibar.obj \\r
        $(OBJS)\monolib_tabmdi.obj \\r
        $(OBJS)\monolib_auibook.obj \\r
        $(OBJS)\monolib_auibar.obj \\r
        $(OBJS)\monolib_tabmdi.obj \\r

+       $(OBJS)\monolib_tabart.obj \\r
+       $(OBJS)\monolib_xh_auinotbk.obj \\r

        $(OBJS)\monolib_advprops.obj \\r
        $(OBJS)\monolib_editors.obj \\r
        $(OBJS)\monolib_manager.obj \\r
        $(OBJS)\monolib_advprops.obj \\r
        $(OBJS)\monolib_editors.obj \\r
        $(OBJS)\monolib_manager.obj \\r


@@ -2594,18 +2851,20 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_ribbon_control.obj \\r
        $(OBJS)\monolib_gallery.obj \\r
        $(OBJS)\monolib_page.obj \\r
        $(OBJS)\monolib_ribbon_control.obj \\r
        $(OBJS)\monolib_gallery.obj \\r
        $(OBJS)\monolib_page.obj \\r

-       $(OBJS)\monolib_panel.obj \\r
+       $(OBJS)\monolib_ribbon_panel.obj \\r

        $(OBJS)\monolib_ribbon_toolbar.obj \\r
        $(OBJS)\monolib_ribbon_toolbar.obj \\r

-       $(OBJS)\monolib_richtextctrl.obj \\r
+       $(OBJS)\monolib_xh_ribbon.obj \\r

        $(OBJS)\monolib_richtextbuffer.obj \\r
        $(OBJS)\monolib_richtextbuffer.obj \\r

-       $(OBJS)\monolib_richtextstyles.obj \\r
-       $(OBJS)\monolib_richtextxml.obj \\r
-       $(OBJS)\monolib_richtexthtml.obj \\r
+       $(OBJS)\monolib_richtextctrl.obj \\r

        $(OBJS)\monolib_richtextformatdlg.obj \\r
        $(OBJS)\monolib_richtextformatdlg.obj \\r

-       $(OBJS)\monolib_richtextsymboldlg.obj \\r
-       $(OBJS)\monolib_richtextstyledlg.obj \\r
-       $(OBJS)\monolib_richtextprint.obj \\r
+       $(OBJS)\monolib_richtexthtml.obj \\r

        $(OBJS)\monolib_richtextimagedlg.obj \\r
        $(OBJS)\monolib_richtextimagedlg.obj \\r

+       $(OBJS)\monolib_richtextprint.obj \\r
+       $(OBJS)\monolib_richtextstyledlg.obj \\r
+       $(OBJS)\monolib_richtextstyles.obj \\r
+       $(OBJS)\monolib_richtextsymboldlg.obj \\r
+       $(OBJS)\monolib_richtextxml.obj \\r
+       $(OBJS)\monolib_xh_richtext.obj \\r

        $(OBJS)\monolib_stc.obj \\r
        $(OBJS)\monolib_PlatWX.obj \\r
        $(OBJS)\monolib_ScintillaWX.obj\r
        $(OBJS)\monolib_stc.obj \\r
        $(OBJS)\monolib_PlatWX.obj \\r
        $(OBJS)\monolib_ScintillaWX.obj\r


@@ -2640,10 +2899,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \\r
        $(OBJS)\monolib_imaglist.obj \\r
        $(OBJS)\monolib_minifram.obj \\r
        $(OBJS)\monolib_icon.obj \\r
        $(OBJS)\monolib_imaglist.obj \\r
        $(OBJS)\monolib_minifram.obj \\r

+       $(OBJS)\monolib_nonownedwnd.obj \\r

        $(OBJS)\monolib_dataobj.obj \\r
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r
        $(OBJS)\monolib_dataobj.obj \\r
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r

+       $(OBJS)\monolib_safearray.obj \\r

        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r


@@ -2652,9 +2913,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r

+       $(OBJS)\monolib_textmeasure.obj \\r

        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r
        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r

+       $(OBJS)\monolib_uiaction.obj \\r

        $(OBJS)\monolib_utilsgui.obj \\r
        $(OBJS)\monolib_utilsgui.obj \\r

+       $(OBJS)\monolib_utilswin.obj \\r

        $(OBJS)\monolib_uxtheme.obj \\r
        $(OBJS)\monolib_window.obj \\r
        $(OBJS)\monolib_helpchm.obj \\r
        $(OBJS)\monolib_uxtheme.obj \\r
        $(OBJS)\monolib_window.obj \\r
        $(OBJS)\monolib_helpchm.obj \\r


@@ -2668,6 +2932,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_generic_statusbr.obj \\r
        $(OBJS)\monolib_prntdlgg.obj \\r
        $(OBJS)\monolib_msw_accel.obj \\r
        $(OBJS)\monolib_generic_statusbr.obj \\r
        $(OBJS)\monolib_prntdlgg.obj \\r
        $(OBJS)\monolib_msw_accel.obj \\r

+       $(OBJS)\monolib_anybutton.obj \\r

        $(OBJS)\monolib_artmsw.obj \\r
        $(OBJS)\monolib_msw_bmpbuttn.obj \\r
        $(OBJS)\monolib_msw_button.obj \\r
        $(OBJS)\monolib_artmsw.obj \\r
        $(OBJS)\monolib_msw_bmpbuttn.obj \\r
        $(OBJS)\monolib_msw_button.obj \\r


@@ -2680,6 +2945,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msw_dialog.obj \\r
        $(OBJS)\monolib_dirdlg.obj \\r
        $(OBJS)\monolib_dragimag.obj \\r
        $(OBJS)\monolib_msw_dialog.obj \\r
        $(OBJS)\monolib_dirdlg.obj \\r
        $(OBJS)\monolib_dragimag.obj \\r

+       $(OBJS)\monolib_evtloop.obj \\r

        $(OBJS)\monolib_filedlg.obj \\r
        $(OBJS)\monolib_frame.obj \\r
        $(OBJS)\monolib_msw_gauge.obj \\r
        $(OBJS)\monolib_filedlg.obj \\r
        $(OBJS)\monolib_frame.obj \\r
        $(OBJS)\monolib_msw_gauge.obj \\r


@@ -2697,6 +2963,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msw_notebook.obj \\r
        $(OBJS)\monolib_access.obj \\r
        $(OBJS)\monolib_ownerdrw.obj \\r
        $(OBJS)\monolib_msw_notebook.obj \\r
        $(OBJS)\monolib_access.obj \\r
        $(OBJS)\monolib_ownerdrw.obj \\r

+       $(OBJS)\monolib_msw_panel.obj \\r

        $(OBJS)\monolib_progdlg.obj \\r
        $(OBJS)\monolib_msw_radiobox.obj \\r
        $(OBJS)\monolib_msw_radiobut.obj \\r
        $(OBJS)\monolib_progdlg.obj \\r
        $(OBJS)\monolib_msw_radiobox.obj \\r
        $(OBJS)\monolib_msw_radiobut.obj \\r


@@ -2715,24 +2982,29 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textentry.obj \\r
        $(OBJS)\monolib_msw_tglbtn.obj \\r
        $(OBJS)\monolib_treectrl.obj \\r
        $(OBJS)\monolib_textentry.obj \\r
        $(OBJS)\monolib_msw_tglbtn.obj \\r
        $(OBJS)\monolib_treectrl.obj \\r

-       $(OBJS)\monolib_uiaction.obj \\r

        $(OBJS)\monolib_msw_checklst.obj \\r
        $(OBJS)\monolib_msw_fdrepdlg.obj \\r
        $(OBJS)\monolib_fontdlg.obj \\r
        $(OBJS)\monolib_accelcmn.obj \\r
        $(OBJS)\monolib_accesscmn.obj \\r
        $(OBJS)\monolib_anidecod.obj \\r
        $(OBJS)\monolib_msw_checklst.obj \\r
        $(OBJS)\monolib_msw_fdrepdlg.obj \\r
        $(OBJS)\monolib_fontdlg.obj \\r
        $(OBJS)\monolib_accelcmn.obj \\r
        $(OBJS)\monolib_accesscmn.obj \\r
        $(OBJS)\monolib_anidecod.obj \\r

+       $(OBJS)\monolib_affinematrix2d.obj \\r

        $(OBJS)\monolib_appcmn.obj \\r
        $(OBJS)\monolib_artprov.obj \\r
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_appcmn.obj \\r
        $(OBJS)\monolib_artprov.obj \\r
        $(OBJS)\monolib_artstd.obj \\r

+       $(OBJS)\monolib_arttango.obj \\r

        $(OBJS)\monolib_bmpbase.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r

+       $(OBJS)\monolib_bmpbtncmn.obj \\r

        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r

+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r

        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
        $(OBJS)\monolib_colourcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
        $(OBJS)\monolib_colourcmn.obj \\r

+       $(OBJS)\monolib_colourdata.obj \\r

        $(OBJS)\monolib_combocmn.obj \\r
        $(OBJS)\monolib_cmdproc.obj \\r
        $(OBJS)\monolib_cmndata.obj \\r
        $(OBJS)\monolib_combocmn.obj \\r
        $(OBJS)\monolib_cmdproc.obj \\r
        $(OBJS)\monolib_cmndata.obj \\r


@@ -2740,11 +3012,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_cshelp.obj \\r
        $(OBJS)\monolib_ctrlcmn.obj \\r
        $(OBJS)\monolib_ctrlsub.obj \\r
        $(OBJS)\monolib_cshelp.obj \\r
        $(OBJS)\monolib_ctrlcmn.obj \\r
        $(OBJS)\monolib_ctrlsub.obj \\r

-       $(OBJS)\monolib_datacmn.obj \\r

        $(OBJS)\monolib_dcbase.obj \\r
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
        $(OBJS)\monolib_dcbase.obj \\r
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r

+       $(OBJS)\monolib_dirctrlcmn.obj \\r

        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r


@@ -2760,6 +3032,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontpickercmn.obj \\r
        $(OBJS)\monolib_fldlgcmn.obj \\r
        $(OBJS)\monolib_fontcmn.obj \\r
        $(OBJS)\monolib_fontpickercmn.obj \\r
        $(OBJS)\monolib_fldlgcmn.obj \\r
        $(OBJS)\monolib_fontcmn.obj \\r

+       $(OBJS)\monolib_fontdata.obj \\r

        $(OBJS)\monolib_graphicc.obj \\r
        $(OBJS)\monolib_fontenumcmn.obj \\r
        $(OBJS)\monolib_fontmap.obj \\r
        $(OBJS)\monolib_graphicc.obj \\r
        $(OBJS)\monolib_fontenumcmn.obj \\r
        $(OBJS)\monolib_fontmap.obj \\r


@@ -2791,38 +3064,51 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_layout.obj \\r
        $(OBJS)\monolib_lboxcmn.obj \\r
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_layout.obj \\r
        $(OBJS)\monolib_lboxcmn.obj \\r
        $(OBJS)\monolib_listctrlcmn.obj \\r

+       $(OBJS)\monolib_markupparser.obj \\r

        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r

+       $(OBJS)\monolib_modalhook.obj \\r

        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r

+       $(OBJS)\monolib_panelcmn.obj \\r

        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r

+       $(OBJS)\monolib_preferencescmn.obj \\r

        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r

+       $(OBJS)\monolib_radiobtncmn.obj \\r

        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r

+       $(OBJS)\monolib_scrolbarcmn.obj \\r

        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r

+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r

        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r

+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r

        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r

+       $(OBJS)\monolib_textmeasurecmn.obj \\r

        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
        $(OBJS)\monolib_valgen.obj \\r
        $(OBJS)\monolib_validate.obj \\r
        $(OBJS)\monolib_valtext.obj \\r
        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
        $(OBJS)\monolib_valgen.obj \\r
        $(OBJS)\monolib_validate.obj \\r
        $(OBJS)\monolib_valtext.obj \\r

+       $(OBJS)\monolib_valnum.obj \\r

        $(OBJS)\monolib_wincmn.obj \\r
        $(OBJS)\monolib_windowid.obj \\r
        $(OBJS)\monolib_wrapsizer.obj \\r
        $(OBJS)\monolib_wincmn.obj \\r
        $(OBJS)\monolib_windowid.obj \\r
        $(OBJS)\monolib_wrapsizer.obj \\r


@@ -2840,10 +3126,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_infobar.obj \\r
        $(OBJS)\monolib_listbkg.obj \\r
        $(OBJS)\monolib_logg.obj \\r
        $(OBJS)\monolib_infobar.obj \\r
        $(OBJS)\monolib_listbkg.obj \\r
        $(OBJS)\monolib_logg.obj \\r

+       $(OBJS)\monolib_markuptext.obj \\r

        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r

-       $(OBJS)\monolib_panelg.obj \\r

        $(OBJS)\monolib_progdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r

+       $(OBJS)\monolib_preferencesg.obj \\r

        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r


@@ -2860,7 +3147,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r

-       $(OBJS)\monolib_vscroll.obj\r
+       $(OBJS)\monolib_vscroll.obj \\r
+       $(OBJS)\monolib_xmlreshandler.obj\r

 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \\r


@@ -2892,10 +3180,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \\r
        $(OBJS)\monolib_imaglist.obj \\r
        $(OBJS)\monolib_minifram.obj \\r
        $(OBJS)\monolib_icon.obj \\r
        $(OBJS)\monolib_imaglist.obj \\r
        $(OBJS)\monolib_minifram.obj \\r

+       $(OBJS)\monolib_nonownedwnd.obj \\r

        $(OBJS)\monolib_dataobj.obj \\r
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r
        $(OBJS)\monolib_dataobj.obj \\r
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r

+       $(OBJS)\monolib_safearray.obj \\r

        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r


@@ -2904,15 +3194,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r

+       $(OBJS)\monolib_textmeasure.obj \\r

        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r
        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r

+       $(OBJS)\monolib_uiaction.obj \\r

        $(OBJS)\monolib_utilsgui.obj \\r
        $(OBJS)\monolib_utilsgui.obj \\r

+       $(OBJS)\monolib_utilswin.obj \\r

        $(OBJS)\monolib_uxtheme.obj \\r
        $(OBJS)\monolib_window.obj \\r
        $(OBJS)\monolib_helpchm.obj \\r
        $(OBJS)\monolib_helpwin.obj \\r
        $(OBJS)\monolib_automtn.obj \\r
        $(OBJS)\monolib_uuid.obj \\r
        $(OBJS)\monolib_uxtheme.obj \\r
        $(OBJS)\monolib_window.obj \\r
        $(OBJS)\monolib_helpchm.obj \\r
        $(OBJS)\monolib_helpwin.obj \\r
        $(OBJS)\monolib_automtn.obj \\r
        $(OBJS)\monolib_uuid.obj \\r

+       $(OBJS)\monolib_evtloop.obj \\r

        $(OBJS)\monolib_generic_accel.obj \\r
        $(OBJS)\monolib_clrpickerg.obj \\r
        $(OBJS)\monolib_collpaneg.obj \\r
        $(OBJS)\monolib_generic_accel.obj \\r
        $(OBJS)\monolib_clrpickerg.obj \\r
        $(OBJS)\monolib_collpaneg.obj \\r


@@ -2969,17 +3263,23 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_accelcmn.obj \\r
        $(OBJS)\monolib_accesscmn.obj \\r
        $(OBJS)\monolib_anidecod.obj \\r
        $(OBJS)\monolib_accelcmn.obj \\r
        $(OBJS)\monolib_accesscmn.obj \\r
        $(OBJS)\monolib_anidecod.obj \\r

+       $(OBJS)\monolib_affinematrix2d.obj \\r

        $(OBJS)\monolib_appcmn.obj \\r
        $(OBJS)\monolib_artprov.obj \\r
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_appcmn.obj \\r
        $(OBJS)\monolib_artprov.obj \\r
        $(OBJS)\monolib_artstd.obj \\r

+       $(OBJS)\monolib_arttango.obj \\r

        $(OBJS)\monolib_bmpbase.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r

+       $(OBJS)\monolib_bmpbtncmn.obj \\r

        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r

+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r

        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
        $(OBJS)\monolib_colourcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
        $(OBJS)\monolib_colourcmn.obj \\r

+       $(OBJS)\monolib_colourdata.obj \\r

        $(OBJS)\monolib_combocmn.obj \\r
        $(OBJS)\monolib_cmdproc.obj \\r
        $(OBJS)\monolib_cmndata.obj \\r
        $(OBJS)\monolib_combocmn.obj \\r
        $(OBJS)\monolib_cmdproc.obj \\r
        $(OBJS)\monolib_cmndata.obj \\r


@@ -2987,11 +3287,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_cshelp.obj \\r
        $(OBJS)\monolib_ctrlcmn.obj \\r
        $(OBJS)\monolib_ctrlsub.obj \\r
        $(OBJS)\monolib_cshelp.obj \\r
        $(OBJS)\monolib_ctrlcmn.obj \\r
        $(OBJS)\monolib_ctrlsub.obj \\r

-       $(OBJS)\monolib_datacmn.obj \\r

        $(OBJS)\monolib_dcbase.obj \\r
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
        $(OBJS)\monolib_dcbase.obj \\r
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r

+       $(OBJS)\monolib_dirctrlcmn.obj \\r

        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r


@@ -3007,6 +3307,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontpickercmn.obj \\r
        $(OBJS)\monolib_fldlgcmn.obj \\r
        $(OBJS)\monolib_fontcmn.obj \\r
        $(OBJS)\monolib_fontpickercmn.obj \\r
        $(OBJS)\monolib_fldlgcmn.obj \\r
        $(OBJS)\monolib_fontcmn.obj \\r

+       $(OBJS)\monolib_fontdata.obj \\r

        $(OBJS)\monolib_graphicc.obj \\r
        $(OBJS)\monolib_fontenumcmn.obj \\r
        $(OBJS)\monolib_fontmap.obj \\r
        $(OBJS)\monolib_graphicc.obj \\r
        $(OBJS)\monolib_fontenumcmn.obj \\r
        $(OBJS)\monolib_fontmap.obj \\r


@@ -3038,38 +3339,51 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_layout.obj \\r
        $(OBJS)\monolib_lboxcmn.obj \\r
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_layout.obj \\r
        $(OBJS)\monolib_lboxcmn.obj \\r
        $(OBJS)\monolib_listctrlcmn.obj \\r

+       $(OBJS)\monolib_markupparser.obj \\r

        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r

+       $(OBJS)\monolib_modalhook.obj \\r

        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r

+       $(OBJS)\monolib_panelcmn.obj \\r

        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r

+       $(OBJS)\monolib_preferencescmn.obj \\r

        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r

+       $(OBJS)\monolib_radiobtncmn.obj \\r

        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r

+       $(OBJS)\monolib_scrolbarcmn.obj \\r

        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r

+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r

        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r

+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r

        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r

+       $(OBJS)\monolib_textmeasurecmn.obj \\r

        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
        $(OBJS)\monolib_valgen.obj \\r
        $(OBJS)\monolib_validate.obj \\r
        $(OBJS)\monolib_valtext.obj \\r
        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
        $(OBJS)\monolib_valgen.obj \\r
        $(OBJS)\monolib_validate.obj \\r
        $(OBJS)\monolib_valtext.obj \\r

+       $(OBJS)\monolib_valnum.obj \\r

        $(OBJS)\monolib_wincmn.obj \\r
        $(OBJS)\monolib_windowid.obj \\r
        $(OBJS)\monolib_wrapsizer.obj \\r
        $(OBJS)\monolib_wincmn.obj \\r
        $(OBJS)\monolib_windowid.obj \\r
        $(OBJS)\monolib_wrapsizer.obj \\r


@@ -3087,10 +3401,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_infobar.obj \\r
        $(OBJS)\monolib_listbkg.obj \\r
        $(OBJS)\monolib_logg.obj \\r
        $(OBJS)\monolib_infobar.obj \\r
        $(OBJS)\monolib_listbkg.obj \\r
        $(OBJS)\monolib_logg.obj \\r

+       $(OBJS)\monolib_markuptext.obj \\r

        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r

-       $(OBJS)\monolib_panelg.obj \\r

        $(OBJS)\monolib_progdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r

+       $(OBJS)\monolib_preferencesg.obj \\r

        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r


@@ -3107,7 +3422,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r

-       $(OBJS)\monolib_vscroll.obj\r
+       $(OBJS)\monolib_vscroll.obj \\r
+       $(OBJS)\monolib_xmlreshandler.obj\r

 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r


@@ -3115,8 +3431,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bmpcboxcmn.obj \\r
        $(OBJS)\monolib_calctrlcmn.obj \\r
        $(OBJS)\monolib_datavcmn.obj \\r
        $(OBJS)\monolib_bmpcboxcmn.obj \\r
        $(OBJS)\monolib_calctrlcmn.obj \\r
        $(OBJS)\monolib_datavcmn.obj \\r

+       $(OBJS)\monolib_gridcmn.obj \\r

        $(OBJS)\monolib_hyperlnkcmn.obj \\r
        $(OBJS)\monolib_hyperlnkcmn.obj \\r

+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r

        $(OBJS)\monolib_aboutdlgg.obj \\r
        $(OBJS)\monolib_aboutdlgg.obj \\r

+       $(OBJS)\monolib_bannerwindow.obj \\r

        $(OBJS)\monolib_bmpcboxg.obj \\r
        $(OBJS)\monolib_calctrlg.obj \\r
        $(OBJS)\monolib_commandlinkbuttong.obj \\r
        $(OBJS)\monolib_bmpcboxg.obj \\r
        $(OBJS)\monolib_calctrlg.obj \\r
        $(OBJS)\monolib_commandlinkbuttong.obj \\r


@@ -3133,14 +3453,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notifmsgg.obj \\r
        $(OBJS)\monolib_odcombo.obj \\r
        $(OBJS)\monolib_propdlg.obj \\r
        $(OBJS)\monolib_notifmsgg.obj \\r
        $(OBJS)\monolib_odcombo.obj \\r
        $(OBJS)\monolib_propdlg.obj \\r

+       $(OBJS)\monolib_richtooltipg.obj \\r

        $(OBJS)\monolib_sashwin.obj \\r
        $(OBJS)\monolib_splash.obj \\r
        $(OBJS)\monolib_sashwin.obj \\r
        $(OBJS)\monolib_splash.obj \\r

+       $(OBJS)\monolib_timectrlg.obj \\r

        $(OBJS)\monolib_tipdlg.obj \\r
        $(OBJS)\monolib_tipdlg.obj \\r

+       $(OBJS)\monolib_treelist.obj \\r

        $(OBJS)\monolib_wizard.obj \\r
        $(OBJS)\monolib_taskbarcmn.obj \\r
        $(OBJS)\monolib_aboutdlg.obj \\r
        $(OBJS)\monolib_wizard.obj \\r
        $(OBJS)\monolib_taskbarcmn.obj \\r
        $(OBJS)\monolib_aboutdlg.obj \\r

-       $(OBJS)\monolib_hyperlink.obj \\r

        $(OBJS)\monolib_notifmsg.obj \\r
        $(OBJS)\monolib_notifmsg.obj \\r

+       $(OBJS)\monolib_richtooltip.obj \\r

        $(OBJS)\monolib_sound.obj \\r
        $(OBJS)\monolib_taskbar.obj \\r
        $(OBJS)\monolib_joystick.obj \\r
        $(OBJS)\monolib_sound.obj \\r
        $(OBJS)\monolib_taskbar.obj \\r
        $(OBJS)\monolib_joystick.obj \\r


@@ -3149,7 +3472,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_calctrl.obj \\r
        $(OBJS)\monolib_commandlinkbutton.obj \\r
        $(OBJS)\monolib_datecontrols.obj \\r
        $(OBJS)\monolib_calctrl.obj \\r
        $(OBJS)\monolib_commandlinkbutton.obj \\r
        $(OBJS)\monolib_datecontrols.obj \\r

-       $(OBJS)\monolib_datectrl.obj\r
+       $(OBJS)\monolib_datectrl.obj \\r
+       $(OBJS)\monolib_datetimectrl.obj \\r
+       $(OBJS)\monolib_hyperlink.obj \\r
+       $(OBJS)\monolib_timectrl.obj\r

 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r


@@ -3157,8 +3483,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bmpcboxcmn.obj \\r
        $(OBJS)\monolib_calctrlcmn.obj \\r
        $(OBJS)\monolib_datavcmn.obj \\r
        $(OBJS)\monolib_bmpcboxcmn.obj \\r
        $(OBJS)\monolib_calctrlcmn.obj \\r
        $(OBJS)\monolib_datavcmn.obj \\r

+       $(OBJS)\monolib_gridcmn.obj \\r

        $(OBJS)\monolib_hyperlnkcmn.obj \\r
        $(OBJS)\monolib_hyperlnkcmn.obj \\r

+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r

        $(OBJS)\monolib_aboutdlgg.obj \\r
        $(OBJS)\monolib_aboutdlgg.obj \\r

+       $(OBJS)\monolib_bannerwindow.obj \\r

        $(OBJS)\monolib_bmpcboxg.obj \\r
        $(OBJS)\monolib_calctrlg.obj \\r
        $(OBJS)\monolib_commandlinkbuttong.obj \\r
        $(OBJS)\monolib_bmpcboxg.obj \\r
        $(OBJS)\monolib_calctrlg.obj \\r
        $(OBJS)\monolib_commandlinkbuttong.obj \\r


@@ -3175,14 +3505,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notifmsgg.obj \\r
        $(OBJS)\monolib_odcombo.obj \\r
        $(OBJS)\monolib_propdlg.obj \\r
        $(OBJS)\monolib_notifmsgg.obj \\r
        $(OBJS)\monolib_odcombo.obj \\r
        $(OBJS)\monolib_propdlg.obj \\r

+       $(OBJS)\monolib_richtooltipg.obj \\r

        $(OBJS)\monolib_sashwin.obj \\r
        $(OBJS)\monolib_splash.obj \\r
        $(OBJS)\monolib_sashwin.obj \\r
        $(OBJS)\monolib_splash.obj \\r

+       $(OBJS)\monolib_timectrlg.obj \\r

        $(OBJS)\monolib_tipdlg.obj \\r
        $(OBJS)\monolib_tipdlg.obj \\r

+       $(OBJS)\monolib_treelist.obj \\r

        $(OBJS)\monolib_wizard.obj \\r
        $(OBJS)\monolib_taskbarcmn.obj \\r
        $(OBJS)\monolib_aboutdlg.obj \\r
        $(OBJS)\monolib_wizard.obj \\r
        $(OBJS)\monolib_taskbarcmn.obj \\r
        $(OBJS)\monolib_aboutdlg.obj \\r

-       $(OBJS)\monolib_hyperlink.obj \\r

        $(OBJS)\monolib_notifmsg.obj \\r
        $(OBJS)\monolib_notifmsg.obj \\r

+       $(OBJS)\monolib_richtooltip.obj \\r

        $(OBJS)\monolib_sound.obj \\r
        $(OBJS)\monolib_taskbar.obj \\r
        $(OBJS)\monolib_joystick.obj \\r
        $(OBJS)\monolib_sound.obj \\r
        $(OBJS)\monolib_taskbar.obj \\r
        $(OBJS)\monolib_joystick.obj \\r


@@ -3190,10 +3523,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 __basedll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 __basedll___depname = \\r

-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_11)\r

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


@@ -3202,7 +3535,7 @@ __DEBUGINFO_139 =
 __DEBUGINFO_139 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_139 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_147 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_147 = D\r


@@ -3228,10 +3561,10 @@ ____wxbase_namelib_DEP = $(__baselib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 __netdll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 __netdll___depname = \\r

-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_11)\r

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


@@ -3240,7 +3573,7 @@ __DEBUGINFO_170 =
 __DEBUGINFO_170 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_170 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_178 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_178 = D\r


@@ -3266,10 +3599,10 @@ ____wxnet_namelib_DEP = $(__netlib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 __coredll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 __coredll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_11)\r

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


@@ -3278,7 +3611,7 @@ __DEBUGINFO_201 =
 __DEBUGINFO_201 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_201 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_209 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_209 = D\r


@@ -3316,10 +3649,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \\r
        $(OBJS)\coredll_imaglist.obj \\r
        $(OBJS)\coredll_minifram.obj \\r
        $(OBJS)\coredll_icon.obj \\r
        $(OBJS)\coredll_imaglist.obj \\r
        $(OBJS)\coredll_minifram.obj \\r

+       $(OBJS)\coredll_nonownedwnd.obj \\r

        $(OBJS)\coredll_dataobj.obj \\r
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r
        $(OBJS)\coredll_dataobj.obj \\r
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r

+       $(OBJS)\coredll_safearray.obj \\r

        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r


@@ -3328,9 +3663,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r

+       $(OBJS)\coredll_textmeasure.obj \\r

        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r
        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r

+       $(OBJS)\coredll_uiaction.obj \\r

        $(OBJS)\coredll_utilsgui.obj \\r
        $(OBJS)\coredll_utilsgui.obj \\r

+       $(OBJS)\coredll_utilswin.obj \\r

        $(OBJS)\coredll_uxtheme.obj \\r
        $(OBJS)\coredll_window.obj \\r
        $(OBJS)\coredll_helpchm.obj \\r
        $(OBJS)\coredll_uxtheme.obj \\r
        $(OBJS)\coredll_window.obj \\r
        $(OBJS)\coredll_helpchm.obj \\r


@@ -3344,6 +3682,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_generic_statusbr.obj \\r
        $(OBJS)\coredll_prntdlgg.obj \\r
        $(OBJS)\coredll_msw_accel.obj \\r
        $(OBJS)\coredll_generic_statusbr.obj \\r
        $(OBJS)\coredll_prntdlgg.obj \\r
        $(OBJS)\coredll_msw_accel.obj \\r

+       $(OBJS)\coredll_anybutton.obj \\r

        $(OBJS)\coredll_artmsw.obj \\r
        $(OBJS)\coredll_msw_bmpbuttn.obj \\r
        $(OBJS)\coredll_msw_button.obj \\r
        $(OBJS)\coredll_artmsw.obj \\r
        $(OBJS)\coredll_msw_bmpbuttn.obj \\r
        $(OBJS)\coredll_msw_button.obj \\r


@@ -3356,6 +3695,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msw_dialog.obj \\r
        $(OBJS)\coredll_dirdlg.obj \\r
        $(OBJS)\coredll_dragimag.obj \\r
        $(OBJS)\coredll_msw_dialog.obj \\r
        $(OBJS)\coredll_dirdlg.obj \\r
        $(OBJS)\coredll_dragimag.obj \\r

+       $(OBJS)\coredll_evtloop.obj \\r

        $(OBJS)\coredll_filedlg.obj \\r
        $(OBJS)\coredll_frame.obj \\r
        $(OBJS)\coredll_msw_gauge.obj \\r
        $(OBJS)\coredll_filedlg.obj \\r
        $(OBJS)\coredll_frame.obj \\r
        $(OBJS)\coredll_msw_gauge.obj \\r


@@ -3373,6 +3713,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msw_notebook.obj \\r
        $(OBJS)\coredll_access.obj \\r
        $(OBJS)\coredll_ownerdrw.obj \\r
        $(OBJS)\coredll_msw_notebook.obj \\r
        $(OBJS)\coredll_access.obj \\r
        $(OBJS)\coredll_ownerdrw.obj \\r

+       $(OBJS)\coredll_panel.obj \\r

        $(OBJS)\coredll_progdlg.obj \\r
        $(OBJS)\coredll_msw_radiobox.obj \\r
        $(OBJS)\coredll_msw_radiobut.obj \\r
        $(OBJS)\coredll_progdlg.obj \\r
        $(OBJS)\coredll_msw_radiobox.obj \\r
        $(OBJS)\coredll_msw_radiobut.obj \\r


@@ -3391,24 +3732,29 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textentry.obj \\r
        $(OBJS)\coredll_msw_tglbtn.obj \\r
        $(OBJS)\coredll_treectrl.obj \\r
        $(OBJS)\coredll_textentry.obj \\r
        $(OBJS)\coredll_msw_tglbtn.obj \\r
        $(OBJS)\coredll_treectrl.obj \\r

-       $(OBJS)\coredll_uiaction.obj \\r

        $(OBJS)\coredll_msw_checklst.obj \\r
        $(OBJS)\coredll_msw_fdrepdlg.obj \\r
        $(OBJS)\coredll_fontdlg.obj \\r
        $(OBJS)\coredll_accelcmn.obj \\r
        $(OBJS)\coredll_accesscmn.obj \\r
        $(OBJS)\coredll_anidecod.obj \\r
        $(OBJS)\coredll_msw_checklst.obj \\r
        $(OBJS)\coredll_msw_fdrepdlg.obj \\r
        $(OBJS)\coredll_fontdlg.obj \\r
        $(OBJS)\coredll_accelcmn.obj \\r
        $(OBJS)\coredll_accesscmn.obj \\r
        $(OBJS)\coredll_anidecod.obj \\r

+       $(OBJS)\coredll_affinematrix2d.obj \\r

        $(OBJS)\coredll_appcmn.obj \\r
        $(OBJS)\coredll_artprov.obj \\r
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_appcmn.obj \\r
        $(OBJS)\coredll_artprov.obj \\r
        $(OBJS)\coredll_artstd.obj \\r

+       $(OBJS)\coredll_arttango.obj \\r

        $(OBJS)\coredll_bmpbase.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r

+       $(OBJS)\coredll_bmpbtncmn.obj \\r

        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r

+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r

        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
        $(OBJS)\coredll_colourcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
        $(OBJS)\coredll_colourcmn.obj \\r

+       $(OBJS)\coredll_colourdata.obj \\r

        $(OBJS)\coredll_combocmn.obj \\r
        $(OBJS)\coredll_cmdproc.obj \\r
        $(OBJS)\coredll_cmndata.obj \\r
        $(OBJS)\coredll_combocmn.obj \\r
        $(OBJS)\coredll_cmdproc.obj \\r
        $(OBJS)\coredll_cmndata.obj \\r


@@ -3416,11 +3762,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_cshelp.obj \\r
        $(OBJS)\coredll_ctrlcmn.obj \\r
        $(OBJS)\coredll_ctrlsub.obj \\r
        $(OBJS)\coredll_cshelp.obj \\r
        $(OBJS)\coredll_ctrlcmn.obj \\r
        $(OBJS)\coredll_ctrlsub.obj \\r

-       $(OBJS)\coredll_datacmn.obj \\r

        $(OBJS)\coredll_dcbase.obj \\r
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
        $(OBJS)\coredll_dcbase.obj \\r
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r

+       $(OBJS)\coredll_dirctrlcmn.obj \\r

        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r


@@ -3436,6 +3782,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontpickercmn.obj \\r
        $(OBJS)\coredll_fldlgcmn.obj \\r
        $(OBJS)\coredll_fontcmn.obj \\r
        $(OBJS)\coredll_fontpickercmn.obj \\r
        $(OBJS)\coredll_fldlgcmn.obj \\r
        $(OBJS)\coredll_fontcmn.obj \\r

+       $(OBJS)\coredll_fontdata.obj \\r

        $(OBJS)\coredll_graphicc.obj \\r
        $(OBJS)\coredll_fontenumcmn.obj \\r
        $(OBJS)\coredll_fontmap.obj \\r
        $(OBJS)\coredll_graphicc.obj \\r
        $(OBJS)\coredll_fontenumcmn.obj \\r
        $(OBJS)\coredll_fontmap.obj \\r


@@ -3467,38 +3814,51 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_layout.obj \\r
        $(OBJS)\coredll_lboxcmn.obj \\r
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_layout.obj \\r
        $(OBJS)\coredll_lboxcmn.obj \\r
        $(OBJS)\coredll_listctrlcmn.obj \\r

+       $(OBJS)\coredll_markupparser.obj \\r

        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r

+       $(OBJS)\coredll_modalhook.obj \\r

        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r

+       $(OBJS)\coredll_panelcmn.obj \\r

        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r

+       $(OBJS)\coredll_preferencescmn.obj \\r

        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r

+       $(OBJS)\coredll_radiobtncmn.obj \\r

        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r

+       $(OBJS)\coredll_scrolbarcmn.obj \\r

        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r

+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r

        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r

+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r

        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r

+       $(OBJS)\coredll_textmeasurecmn.obj \\r

        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
        $(OBJS)\coredll_valgen.obj \\r
        $(OBJS)\coredll_validate.obj \\r
        $(OBJS)\coredll_valtext.obj \\r
        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
        $(OBJS)\coredll_valgen.obj \\r
        $(OBJS)\coredll_validate.obj \\r
        $(OBJS)\coredll_valtext.obj \\r

+       $(OBJS)\coredll_valnum.obj \\r

        $(OBJS)\coredll_wincmn.obj \\r
        $(OBJS)\coredll_windowid.obj \\r
        $(OBJS)\coredll_wrapsizer.obj \\r
        $(OBJS)\coredll_wincmn.obj \\r
        $(OBJS)\coredll_windowid.obj \\r
        $(OBJS)\coredll_wrapsizer.obj \\r


@@ -3516,10 +3876,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_infobar.obj \\r
        $(OBJS)\coredll_listbkg.obj \\r
        $(OBJS)\coredll_logg.obj \\r
        $(OBJS)\coredll_infobar.obj \\r
        $(OBJS)\coredll_listbkg.obj \\r
        $(OBJS)\coredll_logg.obj \\r

+       $(OBJS)\coredll_markuptext.obj \\r

        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r

-       $(OBJS)\coredll_panelg.obj \\r

        $(OBJS)\coredll_progdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r

+       $(OBJS)\coredll_preferencesg.obj \\r

        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r


@@ -3536,7 +3897,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r

-       $(OBJS)\coredll_vscroll.obj\r
+       $(OBJS)\coredll_vscroll.obj \\r
+       $(OBJS)\coredll_xmlreshandler.obj\r

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


@@ -3568,10 +3930,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \\r
        $(OBJS)\coredll_imaglist.obj \\r
        $(OBJS)\coredll_minifram.obj \\r
        $(OBJS)\coredll_icon.obj \\r
        $(OBJS)\coredll_imaglist.obj \\r
        $(OBJS)\coredll_minifram.obj \\r

+       $(OBJS)\coredll_nonownedwnd.obj \\r

        $(OBJS)\coredll_dataobj.obj \\r
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r
        $(OBJS)\coredll_dataobj.obj \\r
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r

+       $(OBJS)\coredll_safearray.obj \\r

        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r


@@ -3580,15 +3944,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r

+       $(OBJS)\coredll_textmeasure.obj \\r

        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r
        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r

+       $(OBJS)\coredll_uiaction.obj \\r

        $(OBJS)\coredll_utilsgui.obj \\r
        $(OBJS)\coredll_utilsgui.obj \\r

+       $(OBJS)\coredll_utilswin.obj \\r

        $(OBJS)\coredll_uxtheme.obj \\r
        $(OBJS)\coredll_window.obj \\r
        $(OBJS)\coredll_helpchm.obj \\r
        $(OBJS)\coredll_helpwin.obj \\r
        $(OBJS)\coredll_automtn.obj \\r
        $(OBJS)\coredll_uuid.obj \\r
        $(OBJS)\coredll_uxtheme.obj \\r
        $(OBJS)\coredll_window.obj \\r
        $(OBJS)\coredll_helpchm.obj \\r
        $(OBJS)\coredll_helpwin.obj \\r
        $(OBJS)\coredll_automtn.obj \\r
        $(OBJS)\coredll_uuid.obj \\r

+       $(OBJS)\coredll_evtloop.obj \\r

        $(OBJS)\coredll_generic_accel.obj \\r
        $(OBJS)\coredll_clrpickerg.obj \\r
        $(OBJS)\coredll_collpaneg.obj \\r
        $(OBJS)\coredll_generic_accel.obj \\r
        $(OBJS)\coredll_clrpickerg.obj \\r
        $(OBJS)\coredll_collpaneg.obj \\r


@@ -3645,17 +4013,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_accelcmn.obj \\r
        $(OBJS)\coredll_accesscmn.obj \\r
        $(OBJS)\coredll_anidecod.obj \\r
        $(OBJS)\coredll_accelcmn.obj \\r
        $(OBJS)\coredll_accesscmn.obj \\r
        $(OBJS)\coredll_anidecod.obj \\r

+       $(OBJS)\coredll_affinematrix2d.obj \\r

        $(OBJS)\coredll_appcmn.obj \\r
        $(OBJS)\coredll_artprov.obj \\r
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_appcmn.obj \\r
        $(OBJS)\coredll_artprov.obj \\r
        $(OBJS)\coredll_artstd.obj \\r

+       $(OBJS)\coredll_arttango.obj \\r

        $(OBJS)\coredll_bmpbase.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r

+       $(OBJS)\coredll_bmpbtncmn.obj \\r

        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r

+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r

        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
        $(OBJS)\coredll_colourcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
        $(OBJS)\coredll_colourcmn.obj \\r

+       $(OBJS)\coredll_colourdata.obj \\r

        $(OBJS)\coredll_combocmn.obj \\r
        $(OBJS)\coredll_cmdproc.obj \\r
        $(OBJS)\coredll_cmndata.obj \\r
        $(OBJS)\coredll_combocmn.obj \\r
        $(OBJS)\coredll_cmdproc.obj \\r
        $(OBJS)\coredll_cmndata.obj \\r


@@ -3663,11 +4037,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_cshelp.obj \\r
        $(OBJS)\coredll_ctrlcmn.obj \\r
        $(OBJS)\coredll_ctrlsub.obj \\r
        $(OBJS)\coredll_cshelp.obj \\r
        $(OBJS)\coredll_ctrlcmn.obj \\r
        $(OBJS)\coredll_ctrlsub.obj \\r

-       $(OBJS)\coredll_datacmn.obj \\r

        $(OBJS)\coredll_dcbase.obj \\r
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
        $(OBJS)\coredll_dcbase.obj \\r
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r

+       $(OBJS)\coredll_dirctrlcmn.obj \\r

        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r


@@ -3683,6 +4057,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontpickercmn.obj \\r
        $(OBJS)\coredll_fldlgcmn.obj \\r
        $(OBJS)\coredll_fontcmn.obj \\r
        $(OBJS)\coredll_fontpickercmn.obj \\r
        $(OBJS)\coredll_fldlgcmn.obj \\r
        $(OBJS)\coredll_fontcmn.obj \\r

+       $(OBJS)\coredll_fontdata.obj \\r

        $(OBJS)\coredll_graphicc.obj \\r
        $(OBJS)\coredll_fontenumcmn.obj \\r
        $(OBJS)\coredll_fontmap.obj \\r
        $(OBJS)\coredll_graphicc.obj \\r
        $(OBJS)\coredll_fontenumcmn.obj \\r
        $(OBJS)\coredll_fontmap.obj \\r


@@ -3714,38 +4089,51 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_layout.obj \\r
        $(OBJS)\coredll_lboxcmn.obj \\r
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_layout.obj \\r
        $(OBJS)\coredll_lboxcmn.obj \\r
        $(OBJS)\coredll_listctrlcmn.obj \\r

+       $(OBJS)\coredll_markupparser.obj \\r

        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r

+       $(OBJS)\coredll_modalhook.obj \\r

        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r

+       $(OBJS)\coredll_panelcmn.obj \\r

        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r

+       $(OBJS)\coredll_preferencescmn.obj \\r

        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r

+       $(OBJS)\coredll_radiobtncmn.obj \\r

        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r

+       $(OBJS)\coredll_scrolbarcmn.obj \\r

        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r

+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r

        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r

+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r

        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r

+       $(OBJS)\coredll_textmeasurecmn.obj \\r

        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
        $(OBJS)\coredll_valgen.obj \\r
        $(OBJS)\coredll_validate.obj \\r
        $(OBJS)\coredll_valtext.obj \\r
        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
        $(OBJS)\coredll_valgen.obj \\r
        $(OBJS)\coredll_validate.obj \\r
        $(OBJS)\coredll_valtext.obj \\r

+       $(OBJS)\coredll_valnum.obj \\r

        $(OBJS)\coredll_wincmn.obj \\r
        $(OBJS)\coredll_windowid.obj \\r
        $(OBJS)\coredll_wrapsizer.obj \\r
        $(OBJS)\coredll_wincmn.obj \\r
        $(OBJS)\coredll_windowid.obj \\r
        $(OBJS)\coredll_wrapsizer.obj \\r


@@ -3763,10 +4151,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_infobar.obj \\r
        $(OBJS)\coredll_listbkg.obj \\r
        $(OBJS)\coredll_logg.obj \\r
        $(OBJS)\coredll_infobar.obj \\r
        $(OBJS)\coredll_listbkg.obj \\r
        $(OBJS)\coredll_logg.obj \\r

+       $(OBJS)\coredll_markuptext.obj \\r

        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r

-       $(OBJS)\coredll_panelg.obj \\r

        $(OBJS)\coredll_progdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r

+       $(OBJS)\coredll_preferencesg.obj \\r

        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r


@@ -3783,7 +4172,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r

-       $(OBJS)\coredll_vscroll.obj\r
+       $(OBJS)\coredll_vscroll.obj \\r
+       $(OBJS)\coredll_xmlreshandler.obj\r

 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
 __corelib___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
 __corelib___depname = \\r


@@ -3825,10 +4215,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \\r
        $(OBJS)\corelib_imaglist.obj \\r
        $(OBJS)\corelib_minifram.obj \\r
        $(OBJS)\corelib_icon.obj \\r
        $(OBJS)\corelib_imaglist.obj \\r
        $(OBJS)\corelib_minifram.obj \\r

+       $(OBJS)\corelib_nonownedwnd.obj \\r

        $(OBJS)\corelib_dataobj.obj \\r
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r
        $(OBJS)\corelib_dataobj.obj \\r
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r

+       $(OBJS)\corelib_safearray.obj \\r

        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r


@@ -3837,9 +4229,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r

+       $(OBJS)\corelib_textmeasure.obj \\r

        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r
        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r

+       $(OBJS)\corelib_uiaction.obj \\r

        $(OBJS)\corelib_utilsgui.obj \\r
        $(OBJS)\corelib_utilsgui.obj \\r

+       $(OBJS)\corelib_utilswin.obj \\r

        $(OBJS)\corelib_uxtheme.obj \\r
        $(OBJS)\corelib_window.obj \\r
        $(OBJS)\corelib_helpchm.obj \\r
        $(OBJS)\corelib_uxtheme.obj \\r
        $(OBJS)\corelib_window.obj \\r
        $(OBJS)\corelib_helpchm.obj \\r


@@ -3853,6 +4248,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_generic_statusbr.obj \\r
        $(OBJS)\corelib_prntdlgg.obj \\r
        $(OBJS)\corelib_msw_accel.obj \\r
        $(OBJS)\corelib_generic_statusbr.obj \\r
        $(OBJS)\corelib_prntdlgg.obj \\r
        $(OBJS)\corelib_msw_accel.obj \\r

+       $(OBJS)\corelib_anybutton.obj \\r

        $(OBJS)\corelib_artmsw.obj \\r
        $(OBJS)\corelib_msw_bmpbuttn.obj \\r
        $(OBJS)\corelib_msw_button.obj \\r
        $(OBJS)\corelib_artmsw.obj \\r
        $(OBJS)\corelib_msw_bmpbuttn.obj \\r
        $(OBJS)\corelib_msw_button.obj \\r


@@ -3865,6 +4261,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msw_dialog.obj \\r
        $(OBJS)\corelib_dirdlg.obj \\r
        $(OBJS)\corelib_dragimag.obj \\r
        $(OBJS)\corelib_msw_dialog.obj \\r
        $(OBJS)\corelib_dirdlg.obj \\r
        $(OBJS)\corelib_dragimag.obj \\r

+       $(OBJS)\corelib_evtloop.obj \\r

        $(OBJS)\corelib_filedlg.obj \\r
        $(OBJS)\corelib_frame.obj \\r
        $(OBJS)\corelib_msw_gauge.obj \\r
        $(OBJS)\corelib_filedlg.obj \\r
        $(OBJS)\corelib_frame.obj \\r
        $(OBJS)\corelib_msw_gauge.obj \\r


@@ -3882,6 +4279,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msw_notebook.obj \\r
        $(OBJS)\corelib_access.obj \\r
        $(OBJS)\corelib_ownerdrw.obj \\r
        $(OBJS)\corelib_msw_notebook.obj \\r
        $(OBJS)\corelib_access.obj \\r
        $(OBJS)\corelib_ownerdrw.obj \\r

+       $(OBJS)\corelib_panel.obj \\r

        $(OBJS)\corelib_progdlg.obj \\r
        $(OBJS)\corelib_msw_radiobox.obj \\r
        $(OBJS)\corelib_msw_radiobut.obj \\r
        $(OBJS)\corelib_progdlg.obj \\r
        $(OBJS)\corelib_msw_radiobox.obj \\r
        $(OBJS)\corelib_msw_radiobut.obj \\r


@@ -3900,24 +4298,29 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textentry.obj \\r
        $(OBJS)\corelib_msw_tglbtn.obj \\r
        $(OBJS)\corelib_treectrl.obj \\r
        $(OBJS)\corelib_textentry.obj \\r
        $(OBJS)\corelib_msw_tglbtn.obj \\r
        $(OBJS)\corelib_treectrl.obj \\r

-       $(OBJS)\corelib_uiaction.obj \\r

        $(OBJS)\corelib_msw_checklst.obj \\r
        $(OBJS)\corelib_msw_fdrepdlg.obj \\r
        $(OBJS)\corelib_fontdlg.obj \\r
        $(OBJS)\corelib_accelcmn.obj \\r
        $(OBJS)\corelib_accesscmn.obj \\r
        $(OBJS)\corelib_anidecod.obj \\r
        $(OBJS)\corelib_msw_checklst.obj \\r
        $(OBJS)\corelib_msw_fdrepdlg.obj \\r
        $(OBJS)\corelib_fontdlg.obj \\r
        $(OBJS)\corelib_accelcmn.obj \\r
        $(OBJS)\corelib_accesscmn.obj \\r
        $(OBJS)\corelib_anidecod.obj \\r

+       $(OBJS)\corelib_affinematrix2d.obj \\r

        $(OBJS)\corelib_appcmn.obj \\r
        $(OBJS)\corelib_artprov.obj \\r
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_appcmn.obj \\r
        $(OBJS)\corelib_artprov.obj \\r
        $(OBJS)\corelib_artstd.obj \\r

+       $(OBJS)\corelib_arttango.obj \\r

        $(OBJS)\corelib_bmpbase.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r

+       $(OBJS)\corelib_bmpbtncmn.obj \\r

        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r

+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r

        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
        $(OBJS)\corelib_colourcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
        $(OBJS)\corelib_colourcmn.obj \\r

+       $(OBJS)\corelib_colourdata.obj \\r

        $(OBJS)\corelib_combocmn.obj \\r
        $(OBJS)\corelib_cmdproc.obj \\r
        $(OBJS)\corelib_cmndata.obj \\r
        $(OBJS)\corelib_combocmn.obj \\r
        $(OBJS)\corelib_cmdproc.obj \\r
        $(OBJS)\corelib_cmndata.obj \\r


@@ -3925,11 +4328,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_cshelp.obj \\r
        $(OBJS)\corelib_ctrlcmn.obj \\r
        $(OBJS)\corelib_ctrlsub.obj \\r
        $(OBJS)\corelib_cshelp.obj \\r
        $(OBJS)\corelib_ctrlcmn.obj \\r
        $(OBJS)\corelib_ctrlsub.obj \\r

-       $(OBJS)\corelib_datacmn.obj \\r

        $(OBJS)\corelib_dcbase.obj \\r
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
        $(OBJS)\corelib_dcbase.obj \\r
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r

+       $(OBJS)\corelib_dirctrlcmn.obj \\r

        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r


@@ -3945,6 +4348,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontpickercmn.obj \\r
        $(OBJS)\corelib_fldlgcmn.obj \\r
        $(OBJS)\corelib_fontcmn.obj \\r
        $(OBJS)\corelib_fontpickercmn.obj \\r
        $(OBJS)\corelib_fldlgcmn.obj \\r
        $(OBJS)\corelib_fontcmn.obj \\r

+       $(OBJS)\corelib_fontdata.obj \\r

        $(OBJS)\corelib_graphicc.obj \\r
        $(OBJS)\corelib_fontenumcmn.obj \\r
        $(OBJS)\corelib_fontmap.obj \\r
        $(OBJS)\corelib_graphicc.obj \\r
        $(OBJS)\corelib_fontenumcmn.obj \\r
        $(OBJS)\corelib_fontmap.obj \\r


@@ -3976,38 +4380,51 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_layout.obj \\r
        $(OBJS)\corelib_lboxcmn.obj \\r
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_layout.obj \\r
        $(OBJS)\corelib_lboxcmn.obj \\r
        $(OBJS)\corelib_listctrlcmn.obj \\r

+       $(OBJS)\corelib_markupparser.obj \\r

        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r

+       $(OBJS)\corelib_modalhook.obj \\r

        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r

+       $(OBJS)\corelib_panelcmn.obj \\r

        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r

+       $(OBJS)\corelib_preferencescmn.obj \\r

        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r

+       $(OBJS)\corelib_radiobtncmn.obj \\r

        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r

+       $(OBJS)\corelib_scrolbarcmn.obj \\r

        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r

+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r

        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r

+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r

        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r

+       $(OBJS)\corelib_textmeasurecmn.obj \\r

        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
        $(OBJS)\corelib_valgen.obj \\r
        $(OBJS)\corelib_validate.obj \\r
        $(OBJS)\corelib_valtext.obj \\r
        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
        $(OBJS)\corelib_valgen.obj \\r
        $(OBJS)\corelib_validate.obj \\r
        $(OBJS)\corelib_valtext.obj \\r

+       $(OBJS)\corelib_valnum.obj \\r

        $(OBJS)\corelib_wincmn.obj \\r
        $(OBJS)\corelib_windowid.obj \\r
        $(OBJS)\corelib_wrapsizer.obj \\r
        $(OBJS)\corelib_wincmn.obj \\r
        $(OBJS)\corelib_windowid.obj \\r
        $(OBJS)\corelib_wrapsizer.obj \\r


@@ -4025,10 +4442,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_infobar.obj \\r
        $(OBJS)\corelib_listbkg.obj \\r
        $(OBJS)\corelib_logg.obj \\r
        $(OBJS)\corelib_infobar.obj \\r
        $(OBJS)\corelib_listbkg.obj \\r
        $(OBJS)\corelib_logg.obj \\r

+       $(OBJS)\corelib_markuptext.obj \\r

        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r

-       $(OBJS)\corelib_panelg.obj \\r

        $(OBJS)\corelib_progdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r

+       $(OBJS)\corelib_preferencesg.obj \\r

        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r


@@ -4045,7 +4463,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r

-       $(OBJS)\corelib_vscroll.obj\r
+       $(OBJS)\corelib_vscroll.obj \\r
+       $(OBJS)\corelib_xmlreshandler.obj\r

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


@@ -4077,10 +4496,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \\r
        $(OBJS)\corelib_imaglist.obj \\r
        $(OBJS)\corelib_minifram.obj \\r
        $(OBJS)\corelib_icon.obj \\r
        $(OBJS)\corelib_imaglist.obj \\r
        $(OBJS)\corelib_minifram.obj \\r

+       $(OBJS)\corelib_nonownedwnd.obj \\r

        $(OBJS)\corelib_dataobj.obj \\r
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r
        $(OBJS)\corelib_dataobj.obj \\r
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r

+       $(OBJS)\corelib_safearray.obj \\r

        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r


@@ -4089,15 +4510,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r

+       $(OBJS)\corelib_textmeasure.obj \\r

        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r
        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r

+       $(OBJS)\corelib_uiaction.obj \\r

        $(OBJS)\corelib_utilsgui.obj \\r
        $(OBJS)\corelib_utilsgui.obj \\r

+       $(OBJS)\corelib_utilswin.obj \\r

        $(OBJS)\corelib_uxtheme.obj \\r
        $(OBJS)\corelib_window.obj \\r
        $(OBJS)\corelib_helpchm.obj \\r
        $(OBJS)\corelib_helpwin.obj \\r
        $(OBJS)\corelib_automtn.obj \\r
        $(OBJS)\corelib_uuid.obj \\r
        $(OBJS)\corelib_uxtheme.obj \\r
        $(OBJS)\corelib_window.obj \\r
        $(OBJS)\corelib_helpchm.obj \\r
        $(OBJS)\corelib_helpwin.obj \\r
        $(OBJS)\corelib_automtn.obj \\r
        $(OBJS)\corelib_uuid.obj \\r

+       $(OBJS)\corelib_evtloop.obj \\r

        $(OBJS)\corelib_generic_accel.obj \\r
        $(OBJS)\corelib_clrpickerg.obj \\r
        $(OBJS)\corelib_collpaneg.obj \\r
        $(OBJS)\corelib_generic_accel.obj \\r
        $(OBJS)\corelib_clrpickerg.obj \\r
        $(OBJS)\corelib_collpaneg.obj \\r


@@ -4154,17 +4579,23 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_accelcmn.obj \\r
        $(OBJS)\corelib_accesscmn.obj \\r
        $(OBJS)\corelib_anidecod.obj \\r
        $(OBJS)\corelib_accelcmn.obj \\r
        $(OBJS)\corelib_accesscmn.obj \\r
        $(OBJS)\corelib_anidecod.obj \\r

+       $(OBJS)\corelib_affinematrix2d.obj \\r

        $(OBJS)\corelib_appcmn.obj \\r
        $(OBJS)\corelib_artprov.obj \\r
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_appcmn.obj \\r
        $(OBJS)\corelib_artprov.obj \\r
        $(OBJS)\corelib_artstd.obj \\r

+       $(OBJS)\corelib_arttango.obj \\r

        $(OBJS)\corelib_bmpbase.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r

+       $(OBJS)\corelib_bmpbtncmn.obj \\r

        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r

+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r

        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
        $(OBJS)\corelib_colourcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
        $(OBJS)\corelib_colourcmn.obj \\r

+       $(OBJS)\corelib_colourdata.obj \\r

        $(OBJS)\corelib_combocmn.obj \\r
        $(OBJS)\corelib_cmdproc.obj \\r
        $(OBJS)\corelib_cmndata.obj \\r
        $(OBJS)\corelib_combocmn.obj \\r
        $(OBJS)\corelib_cmdproc.obj \\r
        $(OBJS)\corelib_cmndata.obj \\r


@@ -4172,11 +4603,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_cshelp.obj \\r
        $(OBJS)\corelib_ctrlcmn.obj \\r
        $(OBJS)\corelib_ctrlsub.obj \\r
        $(OBJS)\corelib_cshelp.obj \\r
        $(OBJS)\corelib_ctrlcmn.obj \\r
        $(OBJS)\corelib_ctrlsub.obj \\r

-       $(OBJS)\corelib_datacmn.obj \\r

        $(OBJS)\corelib_dcbase.obj \\r
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
        $(OBJS)\corelib_dcbase.obj \\r
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r

+       $(OBJS)\corelib_dirctrlcmn.obj \\r

        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r


@@ -4192,6 +4623,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontpickercmn.obj \\r
        $(OBJS)\corelib_fldlgcmn.obj \\r
        $(OBJS)\corelib_fontcmn.obj \\r
        $(OBJS)\corelib_fontpickercmn.obj \\r
        $(OBJS)\corelib_fldlgcmn.obj \\r
        $(OBJS)\corelib_fontcmn.obj \\r

+       $(OBJS)\corelib_fontdata.obj \\r

        $(OBJS)\corelib_graphicc.obj \\r
        $(OBJS)\corelib_fontenumcmn.obj \\r
        $(OBJS)\corelib_fontmap.obj \\r
        $(OBJS)\corelib_graphicc.obj \\r
        $(OBJS)\corelib_fontenumcmn.obj \\r
        $(OBJS)\corelib_fontmap.obj \\r


@@ -4223,38 +4655,51 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_layout.obj \\r
        $(OBJS)\corelib_lboxcmn.obj \\r
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_layout.obj \\r
        $(OBJS)\corelib_lboxcmn.obj \\r
        $(OBJS)\corelib_listctrlcmn.obj \\r

+       $(OBJS)\corelib_markupparser.obj \\r

        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r

+       $(OBJS)\corelib_modalhook.obj \\r

        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r

+       $(OBJS)\corelib_panelcmn.obj \\r

        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r

+       $(OBJS)\corelib_preferencescmn.obj \\r

        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r

+       $(OBJS)\corelib_radiobtncmn.obj \\r

        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r

+       $(OBJS)\corelib_scrolbarcmn.obj \\r

        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r

+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r

        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r

+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r

        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r

+       $(OBJS)\corelib_textmeasurecmn.obj \\r

        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
        $(OBJS)\corelib_valgen.obj \\r
        $(OBJS)\corelib_validate.obj \\r
        $(OBJS)\corelib_valtext.obj \\r
        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
        $(OBJS)\corelib_valgen.obj \\r
        $(OBJS)\corelib_validate.obj \\r
        $(OBJS)\corelib_valtext.obj \\r

+       $(OBJS)\corelib_valnum.obj \\r

        $(OBJS)\corelib_wincmn.obj \\r
        $(OBJS)\corelib_windowid.obj \\r
        $(OBJS)\corelib_wrapsizer.obj \\r
        $(OBJS)\corelib_wincmn.obj \\r
        $(OBJS)\corelib_windowid.obj \\r
        $(OBJS)\corelib_wrapsizer.obj \\r


@@ -4272,10 +4717,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_infobar.obj \\r
        $(OBJS)\corelib_listbkg.obj \\r
        $(OBJS)\corelib_logg.obj \\r
        $(OBJS)\corelib_infobar.obj \\r
        $(OBJS)\corelib_listbkg.obj \\r
        $(OBJS)\corelib_logg.obj \\r

+       $(OBJS)\corelib_markuptext.obj \\r

        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r

-       $(OBJS)\corelib_panelg.obj \\r

        $(OBJS)\corelib_progdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r

+       $(OBJS)\corelib_preferencesg.obj \\r

        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r


@@ -4292,7 +4738,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r

-       $(OBJS)\corelib_vscroll.obj\r
+       $(OBJS)\corelib_vscroll.obj \\r
+       $(OBJS)\corelib_xmlreshandler.obj\r

 !endif\r
 !if "$(SHARED)" == "1"\r
 ____wxcore_namedll_DEP = $(__coredll___depname)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 ____wxcore_namedll_DEP = $(__coredll___depname)\r


@@ -4302,10 +4749,10 @@ ____wxcore_namelib_DEP = $(__corelib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 __advdll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 __advdll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_11)\r

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


@@ -4314,7 +4761,7 @@ __DEBUGINFO_232 =
 __DEBUGINFO_232 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_232 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_240 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_240 = D\r


@@ -4328,8 +4775,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_bmpcboxcmn.obj \\r
        $(OBJS)\advdll_calctrlcmn.obj \\r
        $(OBJS)\advdll_datavcmn.obj \\r
        $(OBJS)\advdll_bmpcboxcmn.obj \\r
        $(OBJS)\advdll_calctrlcmn.obj \\r
        $(OBJS)\advdll_datavcmn.obj \\r

+       $(OBJS)\advdll_gridcmn.obj \\r

        $(OBJS)\advdll_hyperlnkcmn.obj \\r
        $(OBJS)\advdll_hyperlnkcmn.obj \\r

+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r

        $(OBJS)\advdll_aboutdlgg.obj \\r
        $(OBJS)\advdll_aboutdlgg.obj \\r

+       $(OBJS)\advdll_bannerwindow.obj \\r

        $(OBJS)\advdll_bmpcboxg.obj \\r
        $(OBJS)\advdll_calctrlg.obj \\r
        $(OBJS)\advdll_commandlinkbuttong.obj \\r
        $(OBJS)\advdll_bmpcboxg.obj \\r
        $(OBJS)\advdll_calctrlg.obj \\r
        $(OBJS)\advdll_commandlinkbuttong.obj \\r


@@ -4346,14 +4797,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_notifmsgg.obj \\r
        $(OBJS)\advdll_odcombo.obj \\r
        $(OBJS)\advdll_propdlg.obj \\r
        $(OBJS)\advdll_notifmsgg.obj \\r
        $(OBJS)\advdll_odcombo.obj \\r
        $(OBJS)\advdll_propdlg.obj \\r

+       $(OBJS)\advdll_richtooltipg.obj \\r

        $(OBJS)\advdll_sashwin.obj \\r
        $(OBJS)\advdll_splash.obj \\r
        $(OBJS)\advdll_sashwin.obj \\r
        $(OBJS)\advdll_splash.obj \\r

+       $(OBJS)\advdll_timectrlg.obj \\r

        $(OBJS)\advdll_tipdlg.obj \\r
        $(OBJS)\advdll_tipdlg.obj \\r

+       $(OBJS)\advdll_treelist.obj \\r

        $(OBJS)\advdll_wizard.obj \\r
        $(OBJS)\advdll_taskbarcmn.obj \\r
        $(OBJS)\advdll_aboutdlg.obj \\r
        $(OBJS)\advdll_wizard.obj \\r
        $(OBJS)\advdll_taskbarcmn.obj \\r
        $(OBJS)\advdll_aboutdlg.obj \\r

-       $(OBJS)\advdll_hyperlink.obj \\r

        $(OBJS)\advdll_notifmsg.obj \\r
        $(OBJS)\advdll_notifmsg.obj \\r

+       $(OBJS)\advdll_richtooltip.obj \\r

        $(OBJS)\advdll_sound.obj \\r
        $(OBJS)\advdll_taskbar.obj \\r
        $(OBJS)\advdll_joystick.obj \\r
        $(OBJS)\advdll_sound.obj \\r
        $(OBJS)\advdll_taskbar.obj \\r
        $(OBJS)\advdll_joystick.obj \\r


@@ -4362,7 +4816,10 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_calctrl.obj \\r
        $(OBJS)\advdll_commandlinkbutton.obj \\r
        $(OBJS)\advdll_datecontrols.obj \\r
        $(OBJS)\advdll_calctrl.obj \\r
        $(OBJS)\advdll_commandlinkbutton.obj \\r
        $(OBJS)\advdll_datecontrols.obj \\r

-       $(OBJS)\advdll_datectrl.obj\r
+       $(OBJS)\advdll_datectrl.obj \\r
+       $(OBJS)\advdll_datetimectrl.obj \\r
+       $(OBJS)\advdll_hyperlink.obj \\r
+       $(OBJS)\advdll_timectrl.obj\r

 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r


@@ -4370,8 +4827,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_bmpcboxcmn.obj \\r
        $(OBJS)\advdll_calctrlcmn.obj \\r
        $(OBJS)\advdll_datavcmn.obj \\r
        $(OBJS)\advdll_bmpcboxcmn.obj \\r
        $(OBJS)\advdll_calctrlcmn.obj \\r
        $(OBJS)\advdll_datavcmn.obj \\r

+       $(OBJS)\advdll_gridcmn.obj \\r

        $(OBJS)\advdll_hyperlnkcmn.obj \\r
        $(OBJS)\advdll_hyperlnkcmn.obj \\r

+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r

        $(OBJS)\advdll_aboutdlgg.obj \\r
        $(OBJS)\advdll_aboutdlgg.obj \\r

+       $(OBJS)\advdll_bannerwindow.obj \\r

        $(OBJS)\advdll_bmpcboxg.obj \\r
        $(OBJS)\advdll_calctrlg.obj \\r
        $(OBJS)\advdll_commandlinkbuttong.obj \\r
        $(OBJS)\advdll_bmpcboxg.obj \\r
        $(OBJS)\advdll_calctrlg.obj \\r
        $(OBJS)\advdll_commandlinkbuttong.obj \\r


@@ -4388,14 +4849,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_notifmsgg.obj \\r
        $(OBJS)\advdll_odcombo.obj \\r
        $(OBJS)\advdll_propdlg.obj \\r
        $(OBJS)\advdll_notifmsgg.obj \\r
        $(OBJS)\advdll_odcombo.obj \\r
        $(OBJS)\advdll_propdlg.obj \\r

+       $(OBJS)\advdll_richtooltipg.obj \\r

        $(OBJS)\advdll_sashwin.obj \\r
        $(OBJS)\advdll_splash.obj \\r
        $(OBJS)\advdll_sashwin.obj \\r
        $(OBJS)\advdll_splash.obj \\r

+       $(OBJS)\advdll_timectrlg.obj \\r

        $(OBJS)\advdll_tipdlg.obj \\r
        $(OBJS)\advdll_tipdlg.obj \\r

+       $(OBJS)\advdll_treelist.obj \\r

        $(OBJS)\advdll_wizard.obj \\r
        $(OBJS)\advdll_taskbarcmn.obj \\r
        $(OBJS)\advdll_aboutdlg.obj \\r
        $(OBJS)\advdll_wizard.obj \\r
        $(OBJS)\advdll_taskbarcmn.obj \\r
        $(OBJS)\advdll_aboutdlg.obj \\r

-       $(OBJS)\advdll_hyperlink.obj \\r

        $(OBJS)\advdll_notifmsg.obj \\r
        $(OBJS)\advdll_notifmsg.obj \\r

+       $(OBJS)\advdll_richtooltip.obj \\r

        $(OBJS)\advdll_sound.obj \\r
        $(OBJS)\advdll_taskbar.obj \\r
        $(OBJS)\advdll_joystick.obj \\r
        $(OBJS)\advdll_sound.obj \\r
        $(OBJS)\advdll_taskbar.obj \\r
        $(OBJS)\advdll_joystick.obj \\r


@@ -4417,8 +4881,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_bmpcboxcmn.obj \\r
        $(OBJS)\advlib_calctrlcmn.obj \\r
        $(OBJS)\advlib_datavcmn.obj \\r
        $(OBJS)\advlib_bmpcboxcmn.obj \\r
        $(OBJS)\advlib_calctrlcmn.obj \\r
        $(OBJS)\advlib_datavcmn.obj \\r

+       $(OBJS)\advlib_gridcmn.obj \\r

        $(OBJS)\advlib_hyperlnkcmn.obj \\r
        $(OBJS)\advlib_hyperlnkcmn.obj \\r

+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r

        $(OBJS)\advlib_aboutdlgg.obj \\r
        $(OBJS)\advlib_aboutdlgg.obj \\r

+       $(OBJS)\advlib_bannerwindow.obj \\r

        $(OBJS)\advlib_bmpcboxg.obj \\r
        $(OBJS)\advlib_calctrlg.obj \\r
        $(OBJS)\advlib_commandlinkbuttong.obj \\r
        $(OBJS)\advlib_bmpcboxg.obj \\r
        $(OBJS)\advlib_calctrlg.obj \\r
        $(OBJS)\advlib_commandlinkbuttong.obj \\r


@@ -4435,14 +4903,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_notifmsgg.obj \\r
        $(OBJS)\advlib_odcombo.obj \\r
        $(OBJS)\advlib_propdlg.obj \\r
        $(OBJS)\advlib_notifmsgg.obj \\r
        $(OBJS)\advlib_odcombo.obj \\r
        $(OBJS)\advlib_propdlg.obj \\r

+       $(OBJS)\advlib_richtooltipg.obj \\r

        $(OBJS)\advlib_sashwin.obj \\r
        $(OBJS)\advlib_splash.obj \\r
        $(OBJS)\advlib_sashwin.obj \\r
        $(OBJS)\advlib_splash.obj \\r

+       $(OBJS)\advlib_timectrlg.obj \\r

        $(OBJS)\advlib_tipdlg.obj \\r
        $(OBJS)\advlib_tipdlg.obj \\r

+       $(OBJS)\advlib_treelist.obj \\r

        $(OBJS)\advlib_wizard.obj \\r
        $(OBJS)\advlib_taskbarcmn.obj \\r
        $(OBJS)\advlib_aboutdlg.obj \\r
        $(OBJS)\advlib_wizard.obj \\r
        $(OBJS)\advlib_taskbarcmn.obj \\r
        $(OBJS)\advlib_aboutdlg.obj \\r

-       $(OBJS)\advlib_hyperlink.obj \\r

        $(OBJS)\advlib_notifmsg.obj \\r
        $(OBJS)\advlib_notifmsg.obj \\r

+       $(OBJS)\advlib_richtooltip.obj \\r

        $(OBJS)\advlib_sound.obj \\r
        $(OBJS)\advlib_taskbar.obj \\r
        $(OBJS)\advlib_joystick.obj \\r
        $(OBJS)\advlib_sound.obj \\r
        $(OBJS)\advlib_taskbar.obj \\r
        $(OBJS)\advlib_joystick.obj \\r


@@ -4451,7 +4922,10 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_calctrl.obj \\r
        $(OBJS)\advlib_commandlinkbutton.obj \\r
        $(OBJS)\advlib_datecontrols.obj \\r
        $(OBJS)\advlib_calctrl.obj \\r
        $(OBJS)\advlib_commandlinkbutton.obj \\r
        $(OBJS)\advlib_datecontrols.obj \\r

-       $(OBJS)\advlib_datectrl.obj\r
+       $(OBJS)\advlib_datectrl.obj \\r
+       $(OBJS)\advlib_datetimectrl.obj \\r
+       $(OBJS)\advlib_hyperlink.obj \\r
+       $(OBJS)\advlib_timectrl.obj\r

 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
 !endif\r
 !if "$(WXUNIV)" == "1"\r
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r


@@ -4459,8 +4933,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_bmpcboxcmn.obj \\r
        $(OBJS)\advlib_calctrlcmn.obj \\r
        $(OBJS)\advlib_datavcmn.obj \\r
        $(OBJS)\advlib_bmpcboxcmn.obj \\r
        $(OBJS)\advlib_calctrlcmn.obj \\r
        $(OBJS)\advlib_datavcmn.obj \\r

+       $(OBJS)\advlib_gridcmn.obj \\r

        $(OBJS)\advlib_hyperlnkcmn.obj \\r
        $(OBJS)\advlib_hyperlnkcmn.obj \\r

+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r

        $(OBJS)\advlib_aboutdlgg.obj \\r
        $(OBJS)\advlib_aboutdlgg.obj \\r

+       $(OBJS)\advlib_bannerwindow.obj \\r

        $(OBJS)\advlib_bmpcboxg.obj \\r
        $(OBJS)\advlib_calctrlg.obj \\r
        $(OBJS)\advlib_commandlinkbuttong.obj \\r
        $(OBJS)\advlib_bmpcboxg.obj \\r
        $(OBJS)\advlib_calctrlg.obj \\r
        $(OBJS)\advlib_commandlinkbuttong.obj \\r


@@ -4477,14 +4955,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_notifmsgg.obj \\r
        $(OBJS)\advlib_odcombo.obj \\r
        $(OBJS)\advlib_propdlg.obj \\r
        $(OBJS)\advlib_notifmsgg.obj \\r
        $(OBJS)\advlib_odcombo.obj \\r
        $(OBJS)\advlib_propdlg.obj \\r

+       $(OBJS)\advlib_richtooltipg.obj \\r

        $(OBJS)\advlib_sashwin.obj \\r
        $(OBJS)\advlib_splash.obj \\r
        $(OBJS)\advlib_sashwin.obj \\r
        $(OBJS)\advlib_splash.obj \\r

+       $(OBJS)\advlib_timectrlg.obj \\r

        $(OBJS)\advlib_tipdlg.obj \\r
        $(OBJS)\advlib_tipdlg.obj \\r

+       $(OBJS)\advlib_treelist.obj \\r

        $(OBJS)\advlib_wizard.obj \\r
        $(OBJS)\advlib_taskbarcmn.obj \\r
        $(OBJS)\advlib_aboutdlg.obj \\r
        $(OBJS)\advlib_wizard.obj \\r
        $(OBJS)\advlib_taskbarcmn.obj \\r
        $(OBJS)\advlib_aboutdlg.obj \\r

-       $(OBJS)\advlib_hyperlink.obj \\r

        $(OBJS)\advlib_notifmsg.obj \\r
        $(OBJS)\advlib_notifmsg.obj \\r

+       $(OBJS)\advlib_richtooltip.obj \\r

        $(OBJS)\advlib_sound.obj \\r
        $(OBJS)\advlib_taskbar.obj \\r
        $(OBJS)\advlib_joystick.obj \\r
        $(OBJS)\advlib_sound.obj \\r
        $(OBJS)\advlib_taskbar.obj \\r
        $(OBJS)\advlib_joystick.obj \\r


@@ -4498,10 +4979,10 @@ ____wxadv_namelib_DEP = $(__advlib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"\r
 __mediadll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"\r
 __mediadll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_11)\r

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


@@ -4510,7 +4991,7 @@ __DEBUGINFO_263 =
 __DEBUGINFO_263 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_263 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_271 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_271 = D\r


@@ -4536,10 +5017,10 @@ ____wxmedia_namelib_DEP = $(__medialib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"\r
 __htmldll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"\r
 __htmldll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_11)\r

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


@@ -4548,7 +5029,7 @@ __DEBUGINFO_294 =
 __DEBUGINFO_294 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_294 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_302 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_302 = D\r


@@ -4572,12 +5053,12 @@ ____wxhtml_namedll_DEP = $(__htmldll___depname)
 !if "$(SHARED)" == "0"\r
 ____wxhtml_namelib_DEP = $(__htmllib___depname)\r
 !endif\r
 !if "$(SHARED)" == "0"\r
 ____wxhtml_namelib_DEP = $(__htmllib___depname)\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
-__qadll___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"\r
+__webviewdll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_11)\r

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


@@ -4586,7 +5067,7 @@ __DEBUGINFO_325 =
 __DEBUGINFO_325 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_325 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_333 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_333 = D\r


@@ -4594,9 +5075,9 @@ __RUNTIME_LIBS_333 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_333 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_333 = $(__THREADSFLAG)\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
-__qalib___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"\r
+__webviewlib___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_348 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_348 = D\r


@@ -4605,17 +5086,17 @@ __RUNTIME_LIBS_348 = D
 __RUNTIME_LIBS_348 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __RUNTIME_LIBS_348 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r

-____wxqa_namedll_DEP = $(__qadll___depname)\r
+____wxwebview_namedll_DEP = $(__webviewdll___depname)\r

 !endif\r
 !if "$(SHARED)" == "0"\r
 !endif\r
 !if "$(SHARED)" == "0"\r

-____wxqa_namelib_DEP = $(__qalib___depname)\r
+____wxwebview_namelib_DEP = $(__webviewlib___depname)\r

 !endif\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
-__xmldll___depname = \\r
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
+__qadll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_11)\r

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


@@ -4624,7 +5105,7 @@ __DEBUGINFO_356 =
 __DEBUGINFO_356 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_356 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_364 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_364 = D\r


@@ -4632,9 +5113,9 @@ __RUNTIME_LIBS_364 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_364 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_364 = $(__THREADSFLAG)\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"\r
-__xmllib___depname = \\r
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
+__qalib___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_379 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_379 = D\r


@@ -4643,17 +5124,17 @@ __RUNTIME_LIBS_379 = D
 __RUNTIME_LIBS_379 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __RUNTIME_LIBS_379 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r

-____wxxml_namedll_DEP = $(__xmldll___depname)\r
+____wxqa_namedll_DEP = $(__qadll___depname)\r

 !endif\r
 !if "$(SHARED)" == "0"\r
 !endif\r
 !if "$(SHARED)" == "0"\r

-____wxxml_namelib_DEP = $(__xmllib___depname)\r
+____wxqa_namelib_DEP = $(__qalib___depname)\r

 !endif\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"\r
-__xrcdll___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+__xmldll___depname = \\r
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_11)\r

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


@@ -4662,7 +5143,7 @@ __DEBUGINFO_387 =
 __DEBUGINFO_387 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_387 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_395 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_395 = D\r


@@ -4670,9 +5151,9 @@ __RUNTIME_LIBS_395 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_395 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_395 = $(__THREADSFLAG)\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"\r
-__xrclib___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"\r
+__xmllib___depname = \\r
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_410 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_410 = D\r


@@ -4681,17 +5162,17 @@ __RUNTIME_LIBS_410 = D
 __RUNTIME_LIBS_410 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __RUNTIME_LIBS_410 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r

-____wxxrc_namedll_DEP = $(__xrcdll___depname)\r
+____wxxml_namedll_DEP = $(__xmldll___depname)\r

 !endif\r
 !if "$(SHARED)" == "0"\r
 !endif\r
 !if "$(SHARED)" == "0"\r

-____wxxrc_namelib_DEP = $(__xrclib___depname)\r
+____wxxml_namelib_DEP = $(__xmllib___depname)\r

 !endif\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"\r
-__auidll___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"\r
+__xrcdll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_11)\r

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


@@ -4700,7 +5181,7 @@ __DEBUGINFO_418 =
 __DEBUGINFO_418 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_418 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_426 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_426 = D\r


@@ -4708,9 +5189,9 @@ __RUNTIME_LIBS_426 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_426 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_426 = $(__THREADSFLAG)\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"\r
-__auilib___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"\r
+__xrclib___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_441 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_441 = D\r


@@ -4719,17 +5200,17 @@ __RUNTIME_LIBS_441 = D
 __RUNTIME_LIBS_441 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __RUNTIME_LIBS_441 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(SHARED)" == "1"\r

-____wxaui_namedll_DEP = $(__auidll___depname)\r
+____wxxrc_namedll_DEP = $(__xrcdll___depname)\r

 !endif\r
 !if "$(SHARED)" == "0"\r
 !endif\r
 !if "$(SHARED)" == "0"\r

-____wxaui_namelib_DEP = $(__auilib___depname)\r
+____wxxrc_namelib_DEP = $(__xrclib___depname)\r

 !endif\r
 !endif\r

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"\r
-__ribbondll___depname = \\r
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"\r
+__auidll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_11)\r

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


@@ -4738,7 +5219,7 @@ __DEBUGINFO_449 =
 __DEBUGINFO_449 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r
 __DEBUGINFO_449 = \r
 !endif\r
 !if "$(DEBUG_INFO)" == "1"\r

-__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_11)\r

 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_457 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_457 = D\r


@@ -4746,15 +5227,53 @@ __RUNTIME_LIBS_457 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_457 = $(__THREADSFLAG)\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_457 = $(__THREADSFLAG)\r
 !endif\r

+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"\r
+__auilib___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_472 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_472 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+____wxaui_namedll_DEP = $(__auidll___depname)\r
+!endif\r
+!if "$(SHARED)" == "0"\r
+____wxaui_namelib_DEP = $(__auilib___depname)\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"\r
+__ribbondll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_11)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_480 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_480 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_11)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_488 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_488 = $(__THREADSFLAG)\r
+!endif\r

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"\r
 __ribbonlib___depname = \\r
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"\r
 __ribbonlib___depname = \\r
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r

-__RUNTIME_LIBS_472 = D\r
+__RUNTIME_LIBS_503 = D\r

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

-__RUNTIME_LIBS_472 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_503 = $(__THREADSFLAG)\r

 !endif\r
 !if "$(SHARED)" == "1"\r
 ____wxribbon_namedll_DEP = $(__ribbondll___depname)\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 ____wxribbon_namedll_DEP = $(__ribbondll___depname)\r


@@ -4764,35 +5283,35 @@ ____wxribbon_namelib_DEP = $(__ribbonlib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"\r
 __propgriddll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"\r
 __propgriddll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_11)\r

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

-__DEBUGINFO_480 = \r
+__DEBUGINFO_511 = \r

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

-__DEBUGINFO_480 = \r
+__DEBUGINFO_511 = \r

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

-__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_11)\r

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

-__RUNTIME_LIBS_488 = D\r
+__RUNTIME_LIBS_519 = D\r

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

-__RUNTIME_LIBS_488 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_519 = $(__THREADSFLAG)\r

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

-__RUNTIME_LIBS_503 = D\r
+__RUNTIME_LIBS_534 = D\r

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

-__RUNTIME_LIBS_503 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_534 = $(__THREADSFLAG)\r

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


@@ -4802,35 +5321,35 @@ ____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"\r
 __richtextdll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"\r
 __richtextdll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_11)\r

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

-__DEBUGINFO_511 = \r
+__DEBUGINFO_542 = \r

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

-__DEBUGINFO_511 = \r
+__DEBUGINFO_542 = \r

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

-__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_11)\r

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

-__RUNTIME_LIBS_519 = D\r
+__RUNTIME_LIBS_550 = D\r

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

-__RUNTIME_LIBS_519 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_550 = $(__THREADSFLAG)\r

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

-__RUNTIME_LIBS_534 = D\r
+__RUNTIME_LIBS_565 = D\r

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

-__RUNTIME_LIBS_534 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_565 = $(__THREADSFLAG)\r

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


@@ -4840,35 +5359,35 @@ ____wxrichtext_namelib_DEP = $(__richtextlib___depname)
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"\r
 __stcdll___depname = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"\r
 __stcdll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_11)\r

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

-__DEBUGINFO_542 = \r
+__DEBUGINFO_573 = \r

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

-__DEBUGINFO_542 = \r
+__DEBUGINFO_573 = \r

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

-__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_11)\r

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

-__RUNTIME_LIBS_550 = D\r
+__RUNTIME_LIBS_581 = D\r

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

-__RUNTIME_LIBS_550 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_581 = $(__THREADSFLAG)\r

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

-__RUNTIME_LIBS_565 = D\r
+__RUNTIME_LIBS_596 = D\r

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

-__RUNTIME_LIBS_565 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_596 = $(__THREADSFLAG)\r

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


@@ -4878,25 +5397,25 @@ ____wxstc_namelib_DEP = $(__stclib___depname)
 !endif\r
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"\r
 __gldll___depname = \\r
 !endif\r
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"\r
 __gldll___depname = \\r

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_604 = $(__DEBUGRUNTIME_11)\r

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

-__DEBUGINFO_573 = \r
+__DEBUGINFO_604 = \r

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

-__DEBUGINFO_573 = \r
+__DEBUGINFO_604 = \r

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

-__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)\r
+__DEBUGINFO_604 = $(__DEBUGRUNTIME_11)\r

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

-__RUNTIME_LIBS_581 = D\r
+__RUNTIME_LIBS_612 = D\r

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

-__RUNTIME_LIBS_581 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_612 = $(__THREADSFLAG)\r

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


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

-__RUNTIME_LIBS_596 = D\r
+__RUNTIME_LIBS_627 = D\r

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

-__RUNTIME_LIBS_596 = $(__THREADSFLAG)\r
+__RUNTIME_LIBS_627 = $(__THREADSFLAG)\r

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


@@ -4937,76 +5456,76 @@ __htmldll_library_link_LIBR = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r

-__DEBUGINFO_5 = /DEBUG\r
+__DEBUGINFO_6 = /DEBUG\r

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

-__DEBUGINFO_5 = \r
+__DEBUGINFO_6 = \r

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

-__DEBUGINFO_5 = \r
+__DEBUGINFO_6 = \r

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

-__DEBUGINFO_5 = /DEBUG\r
+__DEBUGINFO_6 = /DEBUG\r

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

-____DEBUGRUNTIME_5 = /d _DEBUG\r
+____DEBUGRUNTIME_6 = /d _DEBUG\r

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

-____DEBUGRUNTIME_5 = \r
+____DEBUGRUNTIME_6 = \r

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

-____DEBUGRUNTIME_5 = \r
+____DEBUGRUNTIME_6 = \r

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

-____DEBUGRUNTIME_5 = /d _DEBUG\r
+____DEBUGRUNTIME_6 = /d _DEBUG\r

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

-__DEBUGRUNTIME_10 = \r
+__DEBUGRUNTIME_11 = \r

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

-__DEBUGRUNTIME_10 = /opt:ref /opt:icf\r
+__DEBUGRUNTIME_11 = /opt:ref /opt:icf\r

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

-__DEBUGRUNTIME_10 = /opt:ref /opt:icf\r
+__DEBUGRUNTIME_11 = /opt:ref /opt:icf\r

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

-__DEBUGRUNTIME_10 = \r
+__DEBUGRUNTIME_11 = \r

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

-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__\r
+__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__\r

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

-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__\r
+__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__\r

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

-__WXUNIV_DEFINE_p_63 = /d __WXUNIVERSAL__\r
+__WXUNIV_DEFINE_p_67 = /d __WXUNIVERSAL__\r

 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r
 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r

-__DEBUG_DEFINE_p_62 = /d wxDEBUG_LEVEL=0\r
+__DEBUG_DEFINE_p_66 = /d wxDEBUG_LEVEL=0\r

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

-__NDEBUG_DEFINE_p_61 = /d NDEBUG\r
+__NDEBUG_DEFINE_p_65 = /d NDEBUG\r

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

-__NDEBUG_DEFINE_p_61 = /d NDEBUG\r
+__NDEBUG_DEFINE_p_65 = /d NDEBUG\r

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

-__EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS\r
+__EXCEPTIONS_DEFINE_p_65 = /d wxNO_EXCEPTIONS\r

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

-__RTTI_DEFINE_p_61 = /d wxNO_RTTI\r
+__RTTI_DEFINE_p_65 = /d wxNO_RTTI\r

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

-__THREAD_DEFINE_p_61 = /d wxNO_THREADS\r
+__THREAD_DEFINE_p_65 = /d wxNO_THREADS\r

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

-__UNICODE_DEFINE_p_63 = /d wxUSE_UNICODE=0\r
+__UNICODE_DEFINE_p_67 = /d wxUSE_UNICODE=0\r

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

-__UNICODE_DEFINE_p_63 = /d _UNICODE\r
+__UNICODE_DEFINE_p_67 = /d _UNICODE\r

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

-__MSLU_DEFINE_p_61 = /d wxUSE_UNICODE_MSLU=1\r
+__MSLU_DEFINE_p_65 = /d wxUSE_UNICODE_MSLU=1\r

 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_4 = /i $(CAIRO_ROOT)\include\cairo\r
 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_4 = /i $(CAIRO_ROOT)\include\cairo\r


@@ -5142,7 +5661,7 @@ $(OBJS):
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-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\r
+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) $(__webviewdll___depname) $(__webviewlib___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\r

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


@@ -5155,84 +5674,89 @@ clean:
        -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
        -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib\r
        -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib\r
        -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
        -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib\r
        -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib\r

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

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r

-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r

-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r

-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
        -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk\r
-       -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\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb\r

        -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\r
        -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\r
        -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\r
        -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\r

-       -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\r
-       -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\r
-       -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\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb\r

        -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\r
        -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\r
        -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\r
        -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\r

-       -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\r
-       -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\r
-       -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\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk\r
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb\r

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
        cd ..\..\samples\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
        cd ..\..\samples\r


@@ -5292,9 +5816,9 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5307,8 +5831,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r

-$(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\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(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\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_139)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r

        $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r
        $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r


@@ -5326,8 +5850,8 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_170)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r

        $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r
        $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r


@@ -5345,9 +5869,9 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5364,9 +5888,9 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5383,9 +5907,9 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5402,9 +5926,9 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5420,10 +5944,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)\r
 !endif\r
 \r
 wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)\r
 !endif\r
 \r

+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj  $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_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) $(__CAIRO_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)_webview.lib\r
+<<\r
+!endif\r
+\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib: $(OBJS)\webviewlib_dummy.obj  $(WEBVIEWLIB_OBJECTS)\r
+       if exist $@ del $@\r
+       link /LIB /NOLOGO /OUT:$@ @<<\r
+       $(WEBVIEWLIB_OBJECTS)\r
+<<\r
+!endif\r
+\r
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
+wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)\r
+!endif\r
+\r

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5440,8 +5983,8 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_387)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r

        $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r
        $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 !endif\r


@@ -5459,9 +6002,9 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5478,9 +6021,9 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5497,9 +6040,9 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5516,9 +6059,9 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5535,9 +6078,9 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5554,9 +6097,9 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"\r
 !endif\r
 \r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5573,9 +6116,9 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !endif\r
 \r
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"\r
 !endif\r
 \r
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"\r

-$(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)\r
-       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) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(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) $(__CAIRO_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\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(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)\r
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_604)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r

 <<\r
 !endif\r
 \r
 <<\r
 !endif\r
 \r


@@ -5620,11 +6163,13 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
 build_cfg_file: $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r

-       @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)\r

        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
        @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
        @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)\r

+       @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE)\r
+       @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)\r

        @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)\r
        @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)\r
        @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)\r
        @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)\r
        @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)\r
        @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)\r


@@ -5634,13 +6179,22 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r

+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r

        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r

+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r

        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r

+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r

        @echo COMPILER=vc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=vc >>$(BUILD_CFG_FILE)\r

+       @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r

        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)\r
        @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)\r
        @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)\r


@@ -5930,12 +6484,21 @@ $(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c\r
 \r
 $(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c\r
 \r

+$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c\r
+\r

 $(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c\r
 \r
 $(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c\r
 \r

+$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c\r
+\r

 $(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c\r
 \r
 $(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c\r
 \r

+$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c\r
+\r

 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c\r
 \r
 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c\r
 \r


@@ -5996,278 +6559,329 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
 $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c\r
 \r
 $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c\r
 \r

-$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx\r
+$(OBJS)\wxscintilla_LexA68k.obj: ..\..\src\stc\scintilla\lexers\LexA68k.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexA68k.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx\r
+$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CellBuffer.cxx\r
+$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\lexers\LexAda.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAda.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CharClassify.cxx\r
+$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\lexers\LexAPDL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAPDL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx\r
+$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\lexers\LexAsm.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsm.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx\r
+$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\lexers\LexAsn1.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsn1.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Document.cxx\r
+$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\lexers\LexASY.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexASY.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_DocumentAccessor.obj: ..\..\src\stc\scintilla\src\DocumentAccessor.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\DocumentAccessor.cxx\r
+$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\lexers\LexAU3.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAU3.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx\r
+$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\lexers\LexAVE.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVE.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx\r
+$(OBJS)\wxscintilla_LexAVS.obj: ..\..\src\stc\scintilla\lexers\LexAVS.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVS.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Indicator.cxx\r
+$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\lexers\LexBaan.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBaan.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyMap.cxx\r
+$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\lexers\LexBash.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBash.cxx\r
+\r
+$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\lexers\LexBasic.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBasic.cxx\r
+\r
+$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\lexers\LexBullant.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBullant.cxx\r
+\r
+$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\lexers\LexCaml.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCaml.cxx\r
+\r
+$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\lexers\LexCLW.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCLW.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_KeyWords.obj: ..\..\src\stc\scintilla\src\KeyWords.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyWords.cxx\r
+$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\lexers\LexCmake.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCmake.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\src\LexAPDL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAPDL.cxx\r
+$(OBJS)\wxscintilla_LexCOBOL.obj: ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\src\LexASY.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexASY.cxx\r
+$(OBJS)\wxscintilla_LexCoffeeScript.obj: ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\src\LexAU3.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAU3.cxx\r
+$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\lexers\LexConf.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexConf.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\src\LexAVE.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAVE.cxx\r
+$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\lexers\LexCPP.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCPP.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\src\LexAbaqus.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAbaqus.cxx\r
+$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\lexers\LexCrontab.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCrontab.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\src\LexAda.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAda.cxx\r
+$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\lexers\LexCsound.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCsound.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\src\LexAsm.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAsm.cxx\r
+$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\lexers\LexCSS.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCSS.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\src\LexAsn1.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAsn1.cxx\r
+$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\lexers\LexD.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexD.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\src\LexBaan.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBaan.cxx\r
+$(OBJS)\wxscintilla_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\src\LexBash.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBash.cxx\r
+$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\src\LexBasic.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBasic.cxx\r
+$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\lexers\LexErlang.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexErlang.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\src\LexBullant.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBullant.cxx\r
+$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\lexers\LexEScript.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEScript.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\src\LexCLW.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCLW.cxx\r
+$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\lexers\LexFlagship.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFlagship.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCOBOL.obj: ..\..\src\stc\scintilla\src\LexCOBOL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCOBOL.cxx\r
+$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\lexers\LexForth.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexForth.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\src\LexCPP.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCPP.cxx\r
+$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\lexers\LexFortran.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFortran.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\src\LexCSS.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCSS.cxx\r
+$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\lexers\LexGAP.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGAP.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\src\LexCaml.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCaml.cxx\r
+$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\src\LexCmake.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCmake.cxx\r
+$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\lexers\LexHaskell.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHaskell.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\src\LexConf.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexConf.cxx\r
+$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHTML.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\src\LexCrontab.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCrontab.cxx\r
+$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\src\LexCsound.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCsound.cxx\r
+$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\src\LexD.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexD.cxx\r
+$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\lexers\LexLisp.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLisp.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\src\LexEScript.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexEScript.cxx\r
+$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\lexers\LexLout.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLout.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\src\LexEiffel.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexEiffel.cxx\r
+$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\lexers\LexLua.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLua.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\src\LexErlang.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexErlang.cxx\r
+$(OBJS)\wxscintilla_LexMagik.obj: ..\..\src\stc\scintilla\lexers\LexMagik.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMagik.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\src\LexFlagship.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexFlagship.cxx\r
+$(OBJS)\wxscintilla_LexMarkdown.obj: ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\src\LexForth.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexForth.cxx\r
+$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\lexers\LexMatlab.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMatlab.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\src\LexFortran.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexFortran.cxx\r
+$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\lexers\LexMetapost.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMetapost.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\src\LexGAP.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexGAP.cxx\r
+$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\src\LexGui4Cli.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexGui4Cli.cxx\r
+$(OBJS)\wxscintilla_LexModula.obj: ..\..\src\stc\scintilla\lexers\LexModula.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexModula.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\src\LexHTML.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexHTML.cxx\r
+$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\lexers\LexMPT.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMPT.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\src\LexHaskell.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexHaskell.cxx\r
+$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\src\LexInno.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexInno.cxx\r
+$(OBJS)\wxscintilla_LexMySQL.obj: ..\..\src\stc\scintilla\lexers\LexMySQL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMySQL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\src\LexKix.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexKix.cxx\r
+$(OBJS)\wxscintilla_LexNimrod.obj: ..\..\src\stc\scintilla\lexers\LexNimrod.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNimrod.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\src\LexLisp.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLisp.cxx\r
+$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\lexers\LexNsis.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNsis.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\src\LexLout.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLout.cxx\r
+$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\lexers\LexOpal.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOpal.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\src\LexLua.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLua.cxx\r
+$(OBJS)\wxscintilla_LexOScript.obj: ..\..\src\stc\scintilla\lexers\LexOScript.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOScript.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\src\LexMMIXAL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMMIXAL.cxx\r
+$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\lexers\LexOthers.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOthers.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\src\LexMPT.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMPT.cxx\r
+$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\lexers\LexPascal.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPascal.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\src\LexMSSQL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMSSQL.cxx\r
+$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\lexers\LexPB.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPB.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMagik.obj: ..\..\src\stc\scintilla\src\LexMagik.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMagik.cxx\r
+$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\lexers\LexPerl.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPerl.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMarkdown.obj: ..\..\src\stc\scintilla\src\LexMarkdown.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMarkdown.cxx\r
+$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\lexers\LexPLM.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPLM.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\src\LexMatlab.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMatlab.cxx\r
+$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\lexers\LexPOV.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPOV.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\src\LexMetapost.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMetapost.cxx\r
+$(OBJS)\wxscintilla_LexPowerPro.obj: ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexMySQL.obj: ..\..\src\stc\scintilla\src\LexMySQL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMySQL.cxx\r
+$(OBJS)\wxscintilla_LexPowerShell.obj: ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexNimrod.obj: ..\..\src\stc\scintilla\src\LexNimrod.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexNimrod.cxx\r
+$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\lexers\LexProgress.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexProgress.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\src\LexNsis.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexNsis.cxx\r
+$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\lexers\LexPS.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPS.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\src\LexOpal.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexOpal.cxx\r
+$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\lexers\LexPython.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPython.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\src\LexOthers.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexOthers.cxx\r
+$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\lexers\LexR.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexR.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\src\LexPB.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPB.cxx\r
+$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\lexers\LexRebol.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRebol.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\src\LexPLM.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPLM.cxx\r
+$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\lexers\LexRuby.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRuby.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\src\LexPOV.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPOV.cxx\r
+$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\lexers\LexScriptol.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexScriptol.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\src\LexPS.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPS.cxx\r
+$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\src\LexPascal.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPascal.cxx\r
+$(OBJS)\wxscintilla_LexSML.obj: ..\..\src\stc\scintilla\lexers\LexSML.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSML.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\src\LexPerl.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPerl.cxx\r
+$(OBJS)\wxscintilla_LexSorcus.obj: ..\..\src\stc\scintilla\lexers\LexSorcus.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSorcus.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPowerPro.obj: ..\..\src\stc\scintilla\src\LexPowerPro.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPowerPro.cxx\r
+$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\lexers\LexSpecman.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpecman.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPowerShell.obj: ..\..\src\stc\scintilla\src\LexPowerShell.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPowerShell.cxx\r
+$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\lexers\LexSpice.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpice.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\src\LexProgress.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexProgress.cxx\r
+$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\lexers\LexSQL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSQL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\src\LexPython.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPython.cxx\r
+$(OBJS)\wxscintilla_LexTACL.obj: ..\..\src\stc\scintilla\lexers\LexTACL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTACL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\src\LexR.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexR.cxx\r
+$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\lexers\LexTADS3.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTADS3.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\src\LexRebol.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexRebol.cxx\r
+$(OBJS)\wxscintilla_LexTAL.obj: ..\..\src\stc\scintilla\lexers\LexTAL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTAL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\src\LexRuby.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexRuby.cxx\r
+$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\lexers\LexTCL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSML.obj: ..\..\src\stc\scintilla\src\LexSML.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSML.cxx\r
+$(OBJS)\wxscintilla_LexTCMD.obj: ..\..\src\stc\scintilla\lexers\LexTCMD.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCMD.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\src\LexSQL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSQL.cxx\r
+$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\lexers\LexTeX.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTeX.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\src\LexScriptol.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexScriptol.cxx\r
+$(OBJS)\wxscintilla_LexTxt2tags.obj: ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\src\LexSmalltalk.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSmalltalk.cxx\r
+$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\lexers\LexVB.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVB.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSorcus.obj: ..\..\src\stc\scintilla\src\LexSorcus.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSorcus.cxx\r
+$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\lexers\LexVerilog.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVerilog.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\src\LexSpecman.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSpecman.cxx\r
+$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\lexers\LexVHDL.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVHDL.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\src\LexSpice.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSpice.cxx\r
+$(OBJS)\wxscintilla_LexVisualProlog.obj: ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexTACL.obj: ..\..\src\stc\scintilla\src\LexTACL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTACL.cxx\r
+$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\lexers\LexYAML.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexYAML.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\src\LexTADS3.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTADS3.cxx\r
+$(OBJS)\wxscintilla_Accessor.obj: ..\..\src\stc\scintilla\lexlib\Accessor.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\Accessor.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexTAL.obj: ..\..\src\stc\scintilla\src\LexTAL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTAL.cxx\r
+$(OBJS)\wxscintilla_CharacterSet.obj: ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\src\LexTCL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTCL.cxx\r
+$(OBJS)\wxscintilla_LexerBase.obj: ..\..\src\stc\scintilla\lexlib\LexerBase.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerBase.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\src\LexTeX.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTeX.cxx\r
+$(OBJS)\wxscintilla_LexerModule.obj: ..\..\src\stc\scintilla\lexlib\LexerModule.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerModule.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\src\LexVB.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVB.cxx\r
+$(OBJS)\wxscintilla_LexerNoExceptions.obj: ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\src\LexVHDL.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVHDL.cxx\r
+$(OBJS)\wxscintilla_LexerSimple.obj: ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\src\LexVerilog.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVerilog.cxx\r
+$(OBJS)\wxscintilla_PropSetSimple.obj: ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx\r

 \r
 \r

-$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\src\LexYAML.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexYAML.cxx\r
+$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\lexlib\StyleContext.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\StyleContext.cxx\r
+\r
+$(OBJS)\wxscintilla_WordList.obj: ..\..\src\stc\scintilla\lexlib\WordList.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\WordList.cxx\r
+\r
+$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx\r
+\r
+$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx\r
+\r
+$(OBJS)\wxscintilla_Catalogue.obj: ..\..\src\stc\scintilla\src\Catalogue.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Catalogue.cxx\r
+\r
+$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CellBuffer.cxx\r
+\r
+$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CharClassify.cxx\r
+\r
+$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx\r
+\r
+$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx\r
+\r
+$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Document.cxx\r
+\r
+$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx\r
+\r
+$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx\r
+\r
+$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Indicator.cxx\r
+\r
+$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyMap.cxx\r

 \r
 $(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx\r
 \r
 $(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx\r


@@ -6278,9 +6892,6 @@ $(OBJS)\wxscintilla_PerLine.obj: ..\..\src\stc\scintilla\src\PerLine.cxx
 $(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PositionCache.cxx\r
 \r
 $(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PositionCache.cxx\r
 \r

-$(OBJS)\wxscintilla_PropSet.obj: ..\..\src\stc\scintilla\src\PropSet.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PropSet.cxx\r
-\r

 $(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RESearch.cxx\r
 \r
 $(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RESearch.cxx\r
 \r


@@ -6296,18 +6907,12 @@ $(OBJS)\wxscintilla_Selection.obj: ..\..\src\stc\scintilla\src\Selection.cxx
 $(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Style.cxx\r
 \r
 $(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Style.cxx\r
 \r

-$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\src\StyleContext.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\StyleContext.cxx\r
-\r

 $(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx\r
 \r
 $(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx\r
 \r
 $(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx\r
 \r
 $(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx\r
 \r

-$(OBJS)\wxscintilla_WindowAccessor.obj: ..\..\src\stc\scintilla\src\WindowAccessor.cxx\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\WindowAccessor.cxx\r
-\r

 $(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\XPM.cxx\r
 \r
 $(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx\r
        $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\XPM.cxx\r
 \r


@@ -6452,6 +7057,9 @@ $(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r

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

 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r


@@ -6509,6 +7117,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r

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

 $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
 $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r


@@ -6584,6 +7195,9 @@ $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r

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

 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r
 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r


@@ -6632,9 +7246,6 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -6686,6 +7297,9 @@ $(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r
 $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r

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

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


@@ -6773,6 +7387,9 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r

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

 $(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r
 $(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r


@@ -6827,9 +7444,6 @@ $(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r

-$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
-\r

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


@@ -6998,6 +7612,15 @@ $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r

+$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r

 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
 \r
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
 \r


@@ -7088,6 +7711,18 @@ $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r

+$(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r

 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r


@@ -7097,6 +7732,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r

+$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r

 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r


@@ -7256,6 +7894,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r

+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r

 $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
 $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r


@@ -7301,6 +7942,12 @@ $(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r

+$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r

 $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r
 $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r


@@ -7349,41 +7996,47 @@ $(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
 \r
 $(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
 \r

-$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp\r
+$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp\r

        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
 \r
 $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
 \r
 $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r

-$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
+$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r

 \r
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
 \r
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r

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

 \r
 \r

-$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r

 \r
 $(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r
 \r
 $(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r

-$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r

 \r
 \r

-$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r

 \r
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r
 \r
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r

-$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r

 \r
 \r

-$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r

 \r
 $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
 \r
 $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r


@@ -7540,6 +8193,11 @@ $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r


@@ -7560,6 +8218,11 @@ $(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r


@@ -7600,6 +8263,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r


@@ -7610,11 +8278,21 @@ $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r


@@ -7670,6 +8348,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r


@@ -7685,6 +8368,11 @@ $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp\r


@@ -7700,11 +8388,21 @@ $(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_arttango.obj: ..\..\src\common\arttango.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arttango.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r


@@ -7720,6 +8418,16 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r


@@ -7740,6 +8448,11 @@ $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r


@@ -7775,11 +8488,6 @@ $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r

-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp\r
-!endif\r
-\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp\r


@@ -7800,6 +8508,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r


@@ -7875,6 +8588,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r

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


@@ -8030,6 +8748,11 @@ $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp\r


@@ -8040,6 +8763,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r


@@ -8065,6 +8793,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp\r


@@ -8080,6 +8813,11 @@ $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r


@@ -8090,6 +8828,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r


@@ -8110,6 +8853,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r


@@ -8120,6 +8868,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r


@@ -8135,6 +8893,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r


@@ -8160,6 +8933,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r


@@ -8190,6 +8968,11 @@ $(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_valnum.obj: ..\..\src\common\valnum.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valnum.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp\r


@@ -8275,6 +9058,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r

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

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


@@ -8286,13 +9074,13 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp\r
+$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r

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

-$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
+$(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r

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


@@ -8380,6 +9168,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r


@@ -8400,16 +9193,36 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r

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

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

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


@@ -8490,6 +9303,11 @@ $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 !endif\r
 \r

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

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


@@ -8500,11 +9318,21 @@ $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 !endif\r
 \r

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

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

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

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


@@ -8521,13 +9349,13 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r

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

-$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r

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


@@ -8551,7 +9379,7 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
 !endif\r
 \r
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc\r
 !endif\r
 \r
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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 /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(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\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc\r

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


@@ -8694,6 +9522,9 @@ $(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r
 $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r

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

 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r


@@ -8751,6 +9582,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r

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

 $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
 $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r


@@ -8826,6 +9660,9 @@ $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r
 $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r

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

 $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r
 $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r


@@ -8874,9 +9711,6 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -8928,6 +9762,9 @@ $(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r
 $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r

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

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


@@ -9015,6 +9852,9 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r

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

 $(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r
 $(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r


@@ -9069,9 +9909,6 @@ $(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r

-$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
-\r

 $(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r
 $(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r


@@ -9240,6 +10077,15 @@ $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r

+$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r

 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
 \r
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
 \r


@@ -9330,6 +10176,18 @@ $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r

+$(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r

 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r


@@ -9339,6 +10197,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r

+$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r

 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r


@@ -9498,6 +10359,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r

+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r

 $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
 $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r


@@ -9543,6 +10407,12 @@ $(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r

+$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r

 $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r
 $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r


@@ -9591,41 +10461,47 @@ $(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
 \r
 $(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
 \r

-$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp\r
+$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp\r

        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
 \r
 $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
 \r
 $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r

-$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
+$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r

 \r
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
 \r
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r

-$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r

 \r
 \r

-$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r

 \r
 $(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r
 \r
 $(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r

-$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r

 \r
 \r

-$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r

 \r
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r
 \r
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r

-$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r

 \r
 \r

-$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r

 \r
 $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r
 \r
 $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r


@@ -9782,6 +10658,11 @@ $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r


@@ -9802,6 +10683,11 @@ $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r


@@ -9842,6 +10728,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r


@@ -9852,11 +10743,21 @@ $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r


@@ -9912,6 +10813,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r


@@ -9927,6 +10833,11 @@ $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp\r


@@ -9942,11 +10853,21 @@ $(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_arttango.obj: ..\..\src\common\arttango.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arttango.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r


@@ -9962,6 +10883,16 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r


@@ -9982,6 +10913,11 @@ $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r


@@ -10017,11 +10953,6 @@ $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r

-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp\r
-!endif\r
-\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp\r


@@ -10042,6 +10973,11 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r


@@ -10117,6 +11053,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r


@@ -10272,6 +11213,11 @@ $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp\r


@@ -10282,6 +11228,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r


@@ -10307,6 +11258,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp\r


@@ -10322,6 +11278,11 @@ $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r


@@ -10332,6 +11293,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r


@@ -10352,6 +11318,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r


@@ -10362,6 +11333,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r


@@ -10377,6 +11358,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r


@@ -10402,6 +11398,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r


@@ -10432,6 +11433,11 @@ $(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_valnum.obj: ..\..\src\common\valnum.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valnum.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp\r


@@ -10517,6 +11523,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r


@@ -10528,13 +11539,13 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp\r
+$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r

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

-$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
+$(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r

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


@@ -10622,6 +11633,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r


@@ -10642,16 +11658,36 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r


@@ -10732,6 +11768,11 @@ $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r


@@ -10742,11 +11783,21 @@ $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r


@@ -10763,13 +11814,13 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r

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

-$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r

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


@@ -10796,7 +11847,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp\r
 \r
 $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp\r


@@ -10936,6 +11987,9 @@ $(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r
 $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r

+$(OBJS)\basedll_numformatter.obj: ..\..\src\common\numformatter.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\numformatter.cpp\r
+\r

 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r


@@ -10993,6 +12047,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r

+$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r

 $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
 $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r


@@ -11068,6 +12125,9 @@ $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r
 $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r

+$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp\r
+\r

 $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r
 $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r


@@ -11116,9 +12176,6 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -11269,6 +12326,9 @@ $(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r
 $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp\r
 \r

+$(OBJS)\baselib_numformatter.obj: ..\..\src\common\numformatter.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\numformatter.cpp\r
+\r

 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp\r
 \r


@@ -11326,6 +12386,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
 \r

+$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r

 $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
 $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r


@@ -11401,6 +12464,9 @@ $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r
 $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp\r
 \r

+$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp\r
+\r

 $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r
 $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp\r
 \r


@@ -11449,9 +12515,6 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -11465,7 +12528,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp\r
 \r
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp\r


@@ -11546,7 +12609,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp\r
 \r
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp\r


@@ -11560,9 +12623,6 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -11578,6 +12638,9 @@ $(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r
 $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r

+$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp\r
+\r

 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp\r
 \r
 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp\r
 \r


@@ -11665,6 +12728,9 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r

+$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp\r
+\r

 $(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r
 $(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r


@@ -11719,9 +12785,6 @@ $(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r

-$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
-\r

 $(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r
 $(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r


@@ -12015,6 +13078,11 @@ $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r


@@ -12035,6 +13103,11 @@ $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r


@@ -12075,6 +13148,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r


@@ -12085,11 +13163,21 @@ $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r


@@ -12145,6 +13233,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r


@@ -12160,6 +13253,11 @@ $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp\r


@@ -12175,11 +13273,21 @@ $(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_arttango.obj: ..\..\src\common\arttango.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\arttango.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r


@@ -12195,6 +13303,16 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r


@@ -12215,6 +13333,11 @@ $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp\r


@@ -12250,11 +13373,6 @@ $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r

-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp\r
-!endif\r
-\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp\r


@@ -12275,6 +13393,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r


@@ -12350,6 +13473,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r


@@ -12505,6 +13633,11 @@ $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp\r


@@ -12515,6 +13648,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r


@@ -12540,6 +13678,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp\r


@@ -12555,6 +13698,11 @@ $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r


@@ -12565,6 +13713,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r


@@ -12585,6 +13738,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r


@@ -12595,6 +13753,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r


@@ -12610,6 +13778,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r


@@ -12635,6 +13818,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r


@@ -12665,6 +13853,11 @@ $(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_valnum.obj: ..\..\src\common\valnum.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valnum.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp\r


@@ -12750,6 +13943,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r


@@ -12761,13 +13959,13 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp\r
+$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r

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

-$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
+$(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r

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


@@ -12855,6 +14053,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r

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


@@ -12870,9 +14073,6 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r
 $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp\r
 \r

-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
-\r

 $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r
 $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp\r
 \r


@@ -12888,6 +14088,9 @@ $(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r
 $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp\r
 \r

+$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp\r
+\r

 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp\r
 \r
 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp\r
 \r


@@ -12975,6 +14178,9 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
 \r

+$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp\r
+\r

 $(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r
 $(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
 \r


@@ -13029,9 +14235,6 @@ $(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
 \r

-$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
-\r

 $(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r
 $(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp\r
 \r


@@ -13325,6 +14528,11 @@ $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r


@@ -13345,6 +14553,11 @@ $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r


@@ -13385,6 +14598,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r


@@ -13395,11 +14613,21 @@ $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp\r


@@ -13455,6 +14683,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r


@@ -13470,6 +14703,11 @@ $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp\r


@@ -13485,11 +14723,21 @@ $(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_arttango.obj: ..\..\src\common\arttango.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\arttango.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r


@@ -13505,6 +14753,16 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r


@@ -13525,6 +14783,11 @@ $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp\r


@@ -13560,11 +14823,6 @@ $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp\r
 !endif\r
 \r

-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp\r
-!endif\r
-\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp\r


@@ -13585,6 +14843,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r


@@ -13660,6 +14923,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp\r


@@ -13815,6 +15083,11 @@ $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp\r


@@ -13825,6 +15098,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r


@@ -13850,6 +15128,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp\r


@@ -13865,6 +15148,11 @@ $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r


@@ -13875,6 +15163,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r


@@ -13895,6 +15188,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r


@@ -13905,6 +15203,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r


@@ -13920,6 +15228,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r


@@ -13945,6 +15268,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r


@@ -13975,6 +15303,11 @@ $(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_valnum.obj: ..\..\src\common\valnum.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valnum.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp\r


@@ -14060,6 +15393,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp\r
+!endif\r
+\r

 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp\r


@@ -14071,13 +15409,13 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp\r
+$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r

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

-$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
+$(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r

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


@@ -14165,11 +15503,16 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r

+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r

 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc\r
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp\r
 \r
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp\r


@@ -14186,6 +15529,15 @@ $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r

+$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r

 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 \r
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 \r


@@ -14198,12 +15550,24 @@ $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 \r
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 \r

+$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+\r

 $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 \r
 $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 \r

+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r

 $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 \r
 $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 \r

+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r

 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r


@@ -14252,15 +15616,24 @@ $(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
 $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 \r
 $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 \r

+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r

 $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
 \r
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 \r
 $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
 \r
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 \r

+$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp\r
+\r

 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 \r
 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 \r

+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r

 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
 \r
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
 \r


@@ -14270,12 +15643,12 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
 \r
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
 \r

-$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r

 $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
 \r
 $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
 \r

+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r

 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
 \r
 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
 \r


@@ -14306,6 +15679,15 @@ $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
 \r

+$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r

 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 \r
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
 \r


@@ -14318,12 +15700,24 @@ $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 \r
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
 \r

+$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+\r

 $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 \r
 $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
 \r

+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r

 $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 \r
 $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
 \r

+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r

 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r


@@ -14372,15 +15766,24 @@ $(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
 $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 \r
 $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
 \r

+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r

 $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
 \r
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 \r
 $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
 \r
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
 \r

+$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp\r
+\r

 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 \r
 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
 \r

+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r

 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
 \r
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
 \r


@@ -14390,12 +15793,12 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
 \r
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
 \r

-$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r

 $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
 \r
 $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
 \r

+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r

 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
 \r
 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
 \r


@@ -14412,7 +15815,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
 \r
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r


@@ -14445,7 +15848,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp\r
 \r
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp\r


@@ -14606,11 +16009,44 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r
 $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
 \r

+$(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(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_WEBVIEW ..\..\src\msw\version.rc\r
+\r
+$(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
+$(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r

 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc\r
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r


@@ -14631,7 +16067,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp\r
 \r
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp\r


@@ -14652,11 +16088,14 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r
 \r
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r

+$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r

 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r


@@ -14816,6 +16255,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r

+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r

 $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
 $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r


@@ -14849,6 +16291,9 @@ $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
 \r

+$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r

 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
 \r


@@ -15008,6 +16453,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r

+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r

 $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
 $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r


@@ -15039,7 +16487,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp\r
 \r
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp\r


@@ -15059,6 +16507,12 @@ $(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r

+$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r

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


@@ -15080,11 +16534,17 @@ $(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
 \r

+$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r

 $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc\r
 $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp\r
 \r
 $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp\r


@@ -15116,6 +16576,9 @@ $(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
 $(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r

+$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r

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


@@ -15149,11 +16612,14 @@ $(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
 $(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r

+$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r

 $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc\r
 $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r


@@ -15210,76 +16676,82 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
-\r
-$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
 \r
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r

-$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r

 \r
 \r

-$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r

 \r
 $(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r
 \r
 $(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r

-$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r

 \r
 \r

-$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r

 \r
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r
 \r
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r

-$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r

 \r
 \r

-$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r

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

-$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
-\r

 $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
 $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r

-$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r

 \r
 \r

-$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r

 \r
 $(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r
 \r
 $(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
 \r

-$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r

 \r
 \r

-$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r

 \r
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r
 \r
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
 \r

-$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r

 \r
 \r

-$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r

 \r
 $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc\r
 \r
 $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(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\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc\r

 \r
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
 \r
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r


@@ -15306,7 +16778,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc\r
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc\r

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /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\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(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\r

 \r
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp\r
 \r
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp\r