Allow creating wxSingleInstanceChecker with default name.

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

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

-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

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


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

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

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


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

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

 OBJS = \
 OBJS = \

-       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = ..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \


@@ -134,7 +137,7 @@ WXJPEG_OBJECTS =  \
 WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
 WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \

-       $(CPPFLAGS) $(CFLAGS)
+       /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)

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


@@ -151,20 +154,21 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_extension.obj \
        $(OBJS)\wxtiff_tif_fax3.obj \
        $(OBJS)\wxtiff_tif_fax3sm.obj \
        $(OBJS)\wxtiff_tif_extension.obj \
        $(OBJS)\wxtiff_tif_fax3.obj \
        $(OBJS)\wxtiff_tif_fax3sm.obj \

+       $(OBJS)\wxtiff_tif_flush.obj \

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

-       $(OBJS)\wxtiff_tif_flush.obj \
-       $(OBJS)\wxtiff_tif_lzw.obj \

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

+       $(OBJS)\wxtiff_tif_lzw.obj \

        $(OBJS)\wxtiff_tif_next.obj \
        $(OBJS)\wxtiff_tif_next.obj \

+       $(OBJS)\wxtiff_tif_ojpeg.obj \

        $(OBJS)\wxtiff_tif_open.obj \
        $(OBJS)\wxtiff_tif_packbits.obj \
        $(OBJS)\wxtiff_tif_pixarlog.obj \
        $(OBJS)\wxtiff_tif_predict.obj \
        $(OBJS)\wxtiff_tif_print.obj \
        $(OBJS)\wxtiff_tif_read.obj \
        $(OBJS)\wxtiff_tif_open.obj \
        $(OBJS)\wxtiff_tif_packbits.obj \
        $(OBJS)\wxtiff_tif_pixarlog.obj \
        $(OBJS)\wxtiff_tif_predict.obj \
        $(OBJS)\wxtiff_tif_print.obj \
        $(OBJS)\wxtiff_tif_read.obj \

-       $(OBJS)\wxtiff_tif_swab.obj \

        $(OBJS)\wxtiff_tif_strip.obj \
        $(OBJS)\wxtiff_tif_strip.obj \

+       $(OBJS)\wxtiff_tif_swab.obj \

        $(OBJS)\wxtiff_tif_thunder.obj \
        $(OBJS)\wxtiff_tif_tile.obj \
        $(OBJS)\wxtiff_tif_version.obj \
        $(OBJS)\wxtiff_tif_thunder.obj \
        $(OBJS)\wxtiff_tif_tile.obj \
        $(OBJS)\wxtiff_tif_version.obj \


@@ -179,45 +183,151 @@ WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj

-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
+WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
+       $(CXXFLAGS)
+WXSCINTILLA_OBJECTS =  \
+       $(OBJS)\wxscintilla_AutoComplete.obj \
+       $(OBJS)\wxscintilla_CallTip.obj \
+       $(OBJS)\wxscintilla_CellBuffer.obj \
+       $(OBJS)\wxscintilla_CharClassify.obj \
+       $(OBJS)\wxscintilla_ContractionState.obj \
+       $(OBJS)\wxscintilla_Decoration.obj \
+       $(OBJS)\wxscintilla_Document.obj \
+       $(OBJS)\wxscintilla_DocumentAccessor.obj \
+       $(OBJS)\wxscintilla_Editor.obj \
+       $(OBJS)\wxscintilla_ExternalLexer.obj \
+       $(OBJS)\wxscintilla_Indicator.obj \
+       $(OBJS)\wxscintilla_KeyMap.obj \
+       $(OBJS)\wxscintilla_KeyWords.obj \
+       $(OBJS)\wxscintilla_LexAPDL.obj \
+       $(OBJS)\wxscintilla_LexAU3.obj \
+       $(OBJS)\wxscintilla_LexASY.obj \
+       $(OBJS)\wxscintilla_LexAVE.obj \
+       $(OBJS)\wxscintilla_LexAbaqus.obj \
+       $(OBJS)\wxscintilla_LexAda.obj \
+       $(OBJS)\wxscintilla_LexAsm.obj \
+       $(OBJS)\wxscintilla_LexAsn1.obj \
+       $(OBJS)\wxscintilla_LexBaan.obj \
+       $(OBJS)\wxscintilla_LexBash.obj \
+       $(OBJS)\wxscintilla_LexBasic.obj \
+       $(OBJS)\wxscintilla_LexBullant.obj \
+       $(OBJS)\wxscintilla_LexCLW.obj \
+       $(OBJS)\wxscintilla_LexCmake.obj \
+       $(OBJS)\wxscintilla_LexCPP.obj \
+       $(OBJS)\wxscintilla_LexCSS.obj \
+       $(OBJS)\wxscintilla_LexCaml.obj \
+       $(OBJS)\wxscintilla_LexCsound.obj \
+       $(OBJS)\wxscintilla_LexConf.obj \
+       $(OBJS)\wxscintilla_LexCrontab.obj \
+       $(OBJS)\wxscintilla_LexD.obj \
+       $(OBJS)\wxscintilla_LexEScript.obj \
+       $(OBJS)\wxscintilla_LexEiffel.obj \
+       $(OBJS)\wxscintilla_LexErlang.obj \
+       $(OBJS)\wxscintilla_LexFlagship.obj \
+       $(OBJS)\wxscintilla_LexForth.obj \
+       $(OBJS)\wxscintilla_LexFortran.obj \
+       $(OBJS)\wxscintilla_LexGAP.obj \
+       $(OBJS)\wxscintilla_LexGui4Cli.obj \
+       $(OBJS)\wxscintilla_LexHTML.obj \
+       $(OBJS)\wxscintilla_LexHaskell.obj \
+       $(OBJS)\wxscintilla_LexInno.obj \
+       $(OBJS)\wxscintilla_LexKix.obj \
+       $(OBJS)\wxscintilla_LexLisp.obj \
+       $(OBJS)\wxscintilla_LexLout.obj \
+       $(OBJS)\wxscintilla_LexLua.obj \
+       $(OBJS)\wxscintilla_LexMMIXAL.obj \
+       $(OBJS)\wxscintilla_LexMPT.obj \
+       $(OBJS)\wxscintilla_LexMSSQL.obj \
+       $(OBJS)\wxscintilla_LexMatlab.obj \
+       $(OBJS)\wxscintilla_LexMetapost.obj \
+       $(OBJS)\wxscintilla_LexNsis.obj \
+       $(OBJS)\wxscintilla_LexOpal.obj \
+       $(OBJS)\wxscintilla_LexOthers.obj \
+       $(OBJS)\wxscintilla_LexPB.obj \
+       $(OBJS)\wxscintilla_LexPLM.obj \
+       $(OBJS)\wxscintilla_LexPOV.obj \
+       $(OBJS)\wxscintilla_LexProgress.obj \
+       $(OBJS)\wxscintilla_LexPS.obj \
+       $(OBJS)\wxscintilla_LexPascal.obj \
+       $(OBJS)\wxscintilla_LexPerl.obj \
+       $(OBJS)\wxscintilla_LexPython.obj \
+       $(OBJS)\wxscintilla_LexR.obj \
+       $(OBJS)\wxscintilla_LexRebol.obj \
+       $(OBJS)\wxscintilla_LexRuby.obj \
+       $(OBJS)\wxscintilla_LexSQL.obj \
+       $(OBJS)\wxscintilla_LexSmalltalk.obj \
+       $(OBJS)\wxscintilla_LexTADS3.obj \
+       $(OBJS)\wxscintilla_LexScriptol.obj \
+       $(OBJS)\wxscintilla_LexSpecman.obj \
+       $(OBJS)\wxscintilla_LexSpice.obj \
+       $(OBJS)\wxscintilla_LexTCL.obj \
+       $(OBJS)\wxscintilla_LexTeX.obj \
+       $(OBJS)\wxscintilla_LexVB.obj \
+       $(OBJS)\wxscintilla_LexVHDL.obj \
+       $(OBJS)\wxscintilla_LexVerilog.obj \
+       $(OBJS)\wxscintilla_LexYAML.obj \
+       $(OBJS)\wxscintilla_LineMarker.obj \
+       $(OBJS)\wxscintilla_PositionCache.obj \
+       $(OBJS)\wxscintilla_PropSet.obj \
+       $(OBJS)\wxscintilla_RESearch.obj \
+       $(OBJS)\wxscintilla_RunStyles.obj \
+       $(OBJS)\wxscintilla_ScintillaBase.obj \
+       $(OBJS)\wxscintilla_Style.obj \
+       $(OBJS)\wxscintilla_StyleContext.obj \
+       $(OBJS)\wxscintilla_UniConversion.obj \
+       $(OBJS)\wxscintilla_ViewStyle.obj \
+       $(OBJS)\wxscintilla_WindowAccessor.obj \
+       $(OBJS)\wxscintilla_XPM.obj
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
-       $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
+       /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
+       $(CFLAGS)
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
+       /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \

        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \

-       $(OBJS)\monodll_version.res \

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

+       $(OBJS)\monodll_arrstr.obj \
+       $(OBJS)\monodll_base64.obj \

        $(OBJS)\monodll_clntdata.obj \
        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_convauto.obj \
        $(OBJS)\monodll_datetime.obj \
        $(OBJS)\monodll_clntdata.obj \
        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_convauto.obj \
        $(OBJS)\monodll_datetime.obj \

+       $(OBJS)\monodll_datetimefmt.obj \

        $(OBJS)\monodll_datstrm.obj \
        $(OBJS)\monodll_dircmn.obj \
        $(OBJS)\monodll_dynarray.obj \
        $(OBJS)\monodll_dynlib.obj \
        $(OBJS)\monodll_dynload.obj \
        $(OBJS)\monodll_encconv.obj \
        $(OBJS)\monodll_datstrm.obj \
        $(OBJS)\monodll_dircmn.obj \
        $(OBJS)\monodll_dynarray.obj \
        $(OBJS)\monodll_dynlib.obj \
        $(OBJS)\monodll_dynload.obj \
        $(OBJS)\monodll_encconv.obj \

+       $(OBJS)\monodll_evtloopcmn.obj \

        $(OBJS)\monodll_extended.obj \
        $(OBJS)\monodll_ffile.obj \
        $(OBJS)\monodll_file.obj \
        $(OBJS)\monodll_extended.obj \
        $(OBJS)\monodll_ffile.obj \
        $(OBJS)\monodll_file.obj \


@@ -250,20 +360,30 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_regex.obj \
        $(OBJS)\monodll_stdpbase.obj \
        $(OBJS)\monodll_sstream.obj \
        $(OBJS)\monodll_regex.obj \
        $(OBJS)\monodll_stdpbase.obj \
        $(OBJS)\monodll_sstream.obj \

+       $(OBJS)\monodll_stdstream.obj \

        $(OBJS)\monodll_stopwatch.obj \
        $(OBJS)\monodll_strconv.obj \
        $(OBJS)\monodll_stream.obj \
        $(OBJS)\monodll_string.obj \
        $(OBJS)\monodll_stopwatch.obj \
        $(OBJS)\monodll_strconv.obj \
        $(OBJS)\monodll_stream.obj \
        $(OBJS)\monodll_string.obj \

+       $(OBJS)\monodll_stringimpl.obj \
+       $(OBJS)\monodll_stringops.obj \
+       $(OBJS)\monodll_strvararg.obj \

        $(OBJS)\monodll_sysopt.obj \
        $(OBJS)\monodll_tarstrm.obj \
        $(OBJS)\monodll_textbuf.obj \
        $(OBJS)\monodll_textfile.obj \
        $(OBJS)\monodll_sysopt.obj \
        $(OBJS)\monodll_tarstrm.obj \
        $(OBJS)\monodll_textbuf.obj \
        $(OBJS)\monodll_textfile.obj \

+       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_timerimpl.obj \

        $(OBJS)\monodll_tokenzr.obj \
        $(OBJS)\monodll_txtstrm.obj \
        $(OBJS)\monodll_tokenzr.obj \
        $(OBJS)\monodll_txtstrm.obj \

+       $(OBJS)\monodll_unichar.obj \

        $(OBJS)\monodll_uri.obj \
        $(OBJS)\monodll_uri.obj \

+       $(OBJS)\monodll_ustring.obj \

        $(OBJS)\monodll_variant.obj \
        $(OBJS)\monodll_wfstream.obj \
        $(OBJS)\monodll_variant.obj \
        $(OBJS)\monodll_wfstream.obj \

-       $(OBJS)\monodll_wxchar.obj \
+       $(OBJS)\monodll_wxcrt.obj \
+       $(OBJS)\monodll_wxprintf.obj \
+       $(OBJS)\monodll_xlocale.obj \

        $(OBJS)\monodll_xti.obj \
        $(OBJS)\monodll_xtistrm.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_xti.obj \
        $(OBJS)\monodll_xtistrm.obj \
        $(OBJS)\monodll_zipstrm.obj \


@@ -282,12 +402,14 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_stackwalk.obj \
        $(OBJS)\monodll_stdpaths.obj \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_stackwalk.obj \
        $(OBJS)\monodll_stdpaths.obj \
        $(OBJS)\monodll_thread.obj \

+       $(OBJS)\monodll_timer.obj \

        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
        $(OBJS)\monodll_utilscmn.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
        $(OBJS)\monodll_utilscmn.obj \

+       $(OBJS)\monodll_evtloop.obj \

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


@@ -301,48 +423,56 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_url.obj \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_url.obj \

-       $(OBJS)\monodll_gsocket.obj \
+       $(OBJS)\monodll_sockmsw.obj \

        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \
        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \

-       $(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+       $(OBJS)\monodll_xtixml.obj \
+       $(OBJS)\monodll_version.res
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)

 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \
        $(OBJS)\monolib_arcall.obj \
        $(OBJS)\monolib_arcfind.obj \
        $(OBJS)\monolib_archive.obj \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \
        $(OBJS)\monolib_arcall.obj \
        $(OBJS)\monolib_arcfind.obj \
        $(OBJS)\monolib_archive.obj \

+       $(OBJS)\monolib_arrstr.obj \
+       $(OBJS)\monolib_base64.obj \

        $(OBJS)\monolib_clntdata.obj \
        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_convauto.obj \
        $(OBJS)\monolib_datetime.obj \
        $(OBJS)\monolib_clntdata.obj \
        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_convauto.obj \
        $(OBJS)\monolib_datetime.obj \

+       $(OBJS)\monolib_datetimefmt.obj \

        $(OBJS)\monolib_datstrm.obj \
        $(OBJS)\monolib_dircmn.obj \
        $(OBJS)\monolib_dynarray.obj \
        $(OBJS)\monolib_dynlib.obj \
        $(OBJS)\monolib_dynload.obj \
        $(OBJS)\monolib_encconv.obj \
        $(OBJS)\monolib_datstrm.obj \
        $(OBJS)\monolib_dircmn.obj \
        $(OBJS)\monolib_dynarray.obj \
        $(OBJS)\monolib_dynlib.obj \
        $(OBJS)\monolib_dynload.obj \
        $(OBJS)\monolib_encconv.obj \

+       $(OBJS)\monolib_evtloopcmn.obj \

        $(OBJS)\monolib_extended.obj \
        $(OBJS)\monolib_ffile.obj \
        $(OBJS)\monolib_file.obj \
        $(OBJS)\monolib_extended.obj \
        $(OBJS)\monolib_ffile.obj \
        $(OBJS)\monolib_file.obj \


@@ -375,20 +505,30 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_regex.obj \
        $(OBJS)\monolib_stdpbase.obj \
        $(OBJS)\monolib_sstream.obj \
        $(OBJS)\monolib_regex.obj \
        $(OBJS)\monolib_stdpbase.obj \
        $(OBJS)\monolib_sstream.obj \

+       $(OBJS)\monolib_stdstream.obj \

        $(OBJS)\monolib_stopwatch.obj \
        $(OBJS)\monolib_strconv.obj \
        $(OBJS)\monolib_stream.obj \
        $(OBJS)\monolib_string.obj \
        $(OBJS)\monolib_stopwatch.obj \
        $(OBJS)\monolib_strconv.obj \
        $(OBJS)\monolib_stream.obj \
        $(OBJS)\monolib_string.obj \

+       $(OBJS)\monolib_stringimpl.obj \
+       $(OBJS)\monolib_stringops.obj \
+       $(OBJS)\monolib_strvararg.obj \

        $(OBJS)\monolib_sysopt.obj \
        $(OBJS)\monolib_tarstrm.obj \
        $(OBJS)\monolib_textbuf.obj \
        $(OBJS)\monolib_textfile.obj \
        $(OBJS)\monolib_sysopt.obj \
        $(OBJS)\monolib_tarstrm.obj \
        $(OBJS)\monolib_textbuf.obj \
        $(OBJS)\monolib_textfile.obj \

+       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_timerimpl.obj \

        $(OBJS)\monolib_tokenzr.obj \
        $(OBJS)\monolib_txtstrm.obj \
        $(OBJS)\monolib_tokenzr.obj \
        $(OBJS)\monolib_txtstrm.obj \

+       $(OBJS)\monolib_unichar.obj \

        $(OBJS)\monolib_uri.obj \
        $(OBJS)\monolib_uri.obj \

+       $(OBJS)\monolib_ustring.obj \

        $(OBJS)\monolib_variant.obj \
        $(OBJS)\monolib_wfstream.obj \
        $(OBJS)\monolib_variant.obj \
        $(OBJS)\monolib_wfstream.obj \

-       $(OBJS)\monolib_wxchar.obj \
+       $(OBJS)\monolib_wxcrt.obj \
+       $(OBJS)\monolib_wxprintf.obj \
+       $(OBJS)\monolib_xlocale.obj \

        $(OBJS)\monolib_xti.obj \
        $(OBJS)\monolib_xtistrm.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_xti.obj \
        $(OBJS)\monolib_xtistrm.obj \
        $(OBJS)\monolib_zipstrm.obj \


@@ -407,12 +547,14 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_stackwalk.obj \
        $(OBJS)\monolib_stdpaths.obj \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_stackwalk.obj \
        $(OBJS)\monolib_stdpaths.obj \
        $(OBJS)\monolib_thread.obj \

+       $(OBJS)\monolib_timer.obj \

        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
        $(OBJS)\monolib_utilscmn.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
        $(OBJS)\monolib_utilscmn.obj \

+       $(OBJS)\monolib_evtloop.obj \

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


@@ -426,32 +568,32 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_url.obj \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_url.obj \

-       $(OBJS)\monolib_gsocket.obj \
+       $(OBJS)\monolib_sockmsw.obj \

        $(OBJS)\monolib_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_xtixml.obj
        $(OBJS)\monolib_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_xtixml.obj

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
-       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
-       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)

 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_version.res \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_version.res \


@@ -459,17 +601,21 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_arcall.obj \
        $(OBJS)\basedll_arcfind.obj \
        $(OBJS)\basedll_archive.obj \
        $(OBJS)\basedll_arcall.obj \
        $(OBJS)\basedll_arcfind.obj \
        $(OBJS)\basedll_archive.obj \

+       $(OBJS)\basedll_arrstr.obj \
+       $(OBJS)\basedll_base64.obj \

        $(OBJS)\basedll_clntdata.obj \
        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_convauto.obj \
        $(OBJS)\basedll_datetime.obj \
        $(OBJS)\basedll_clntdata.obj \
        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_convauto.obj \
        $(OBJS)\basedll_datetime.obj \

+       $(OBJS)\basedll_datetimefmt.obj \

        $(OBJS)\basedll_datstrm.obj \
        $(OBJS)\basedll_dircmn.obj \
        $(OBJS)\basedll_dynarray.obj \
        $(OBJS)\basedll_dynlib.obj \
        $(OBJS)\basedll_dynload.obj \
        $(OBJS)\basedll_encconv.obj \
        $(OBJS)\basedll_datstrm.obj \
        $(OBJS)\basedll_dircmn.obj \
        $(OBJS)\basedll_dynarray.obj \
        $(OBJS)\basedll_dynlib.obj \
        $(OBJS)\basedll_dynload.obj \
        $(OBJS)\basedll_encconv.obj \

+       $(OBJS)\basedll_evtloopcmn.obj \

        $(OBJS)\basedll_extended.obj \
        $(OBJS)\basedll_ffile.obj \
        $(OBJS)\basedll_file.obj \
        $(OBJS)\basedll_extended.obj \
        $(OBJS)\basedll_ffile.obj \
        $(OBJS)\basedll_file.obj \


@@ -502,20 +648,30 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_regex.obj \
        $(OBJS)\basedll_stdpbase.obj \
        $(OBJS)\basedll_sstream.obj \
        $(OBJS)\basedll_regex.obj \
        $(OBJS)\basedll_stdpbase.obj \
        $(OBJS)\basedll_sstream.obj \

+       $(OBJS)\basedll_stdstream.obj \

        $(OBJS)\basedll_stopwatch.obj \
        $(OBJS)\basedll_strconv.obj \
        $(OBJS)\basedll_stream.obj \
        $(OBJS)\basedll_string.obj \
        $(OBJS)\basedll_stopwatch.obj \
        $(OBJS)\basedll_strconv.obj \
        $(OBJS)\basedll_stream.obj \
        $(OBJS)\basedll_string.obj \

+       $(OBJS)\basedll_stringimpl.obj \
+       $(OBJS)\basedll_stringops.obj \
+       $(OBJS)\basedll_strvararg.obj \

        $(OBJS)\basedll_sysopt.obj \
        $(OBJS)\basedll_tarstrm.obj \
        $(OBJS)\basedll_textbuf.obj \
        $(OBJS)\basedll_textfile.obj \
        $(OBJS)\basedll_sysopt.obj \
        $(OBJS)\basedll_tarstrm.obj \
        $(OBJS)\basedll_textbuf.obj \
        $(OBJS)\basedll_textfile.obj \

+       $(OBJS)\basedll_timercmn.obj \
+       $(OBJS)\basedll_timerimpl.obj \

        $(OBJS)\basedll_tokenzr.obj \
        $(OBJS)\basedll_txtstrm.obj \
        $(OBJS)\basedll_tokenzr.obj \
        $(OBJS)\basedll_txtstrm.obj \

+       $(OBJS)\basedll_unichar.obj \

        $(OBJS)\basedll_uri.obj \
        $(OBJS)\basedll_uri.obj \

+       $(OBJS)\basedll_ustring.obj \

        $(OBJS)\basedll_variant.obj \
        $(OBJS)\basedll_wfstream.obj \
        $(OBJS)\basedll_variant.obj \
        $(OBJS)\basedll_wfstream.obj \

-       $(OBJS)\basedll_wxchar.obj \
+       $(OBJS)\basedll_wxcrt.obj \
+       $(OBJS)\basedll_wxprintf.obj \
+       $(OBJS)\basedll_xlocale.obj \

        $(OBJS)\basedll_xti.obj \
        $(OBJS)\basedll_xtistrm.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_xti.obj \
        $(OBJS)\basedll_xtistrm.obj \
        $(OBJS)\basedll_zipstrm.obj \


@@ -534,35 +690,37 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_stackwalk.obj \
        $(OBJS)\basedll_stdpaths.obj \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_stackwalk.obj \
        $(OBJS)\basedll_stdpaths.obj \
        $(OBJS)\basedll_thread.obj \

+       $(OBJS)\basedll_timer.obj \

        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
        $(OBJS)\basedll_utilscmn.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
        $(OBJS)\basedll_utilscmn.obj \

+       $(OBJS)\basedll_evtloop.obj \

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

-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
-       $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \


@@ -570,17 +728,21 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_arcall.obj \
        $(OBJS)\baselib_arcfind.obj \
        $(OBJS)\baselib_archive.obj \
        $(OBJS)\baselib_arcall.obj \
        $(OBJS)\baselib_arcfind.obj \
        $(OBJS)\baselib_archive.obj \

+       $(OBJS)\baselib_arrstr.obj \
+       $(OBJS)\baselib_base64.obj \

        $(OBJS)\baselib_clntdata.obj \
        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_convauto.obj \
        $(OBJS)\baselib_datetime.obj \
        $(OBJS)\baselib_clntdata.obj \
        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_convauto.obj \
        $(OBJS)\baselib_datetime.obj \

+       $(OBJS)\baselib_datetimefmt.obj \

        $(OBJS)\baselib_datstrm.obj \
        $(OBJS)\baselib_dircmn.obj \
        $(OBJS)\baselib_dynarray.obj \
        $(OBJS)\baselib_dynlib.obj \
        $(OBJS)\baselib_dynload.obj \
        $(OBJS)\baselib_encconv.obj \
        $(OBJS)\baselib_datstrm.obj \
        $(OBJS)\baselib_dircmn.obj \
        $(OBJS)\baselib_dynarray.obj \
        $(OBJS)\baselib_dynlib.obj \
        $(OBJS)\baselib_dynload.obj \
        $(OBJS)\baselib_encconv.obj \

+       $(OBJS)\baselib_evtloopcmn.obj \

        $(OBJS)\baselib_extended.obj \
        $(OBJS)\baselib_ffile.obj \
        $(OBJS)\baselib_file.obj \
        $(OBJS)\baselib_extended.obj \
        $(OBJS)\baselib_ffile.obj \
        $(OBJS)\baselib_file.obj \


@@ -613,20 +775,30 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_regex.obj \
        $(OBJS)\baselib_stdpbase.obj \
        $(OBJS)\baselib_sstream.obj \
        $(OBJS)\baselib_regex.obj \
        $(OBJS)\baselib_stdpbase.obj \
        $(OBJS)\baselib_sstream.obj \

+       $(OBJS)\baselib_stdstream.obj \

        $(OBJS)\baselib_stopwatch.obj \
        $(OBJS)\baselib_strconv.obj \
        $(OBJS)\baselib_stream.obj \
        $(OBJS)\baselib_string.obj \
        $(OBJS)\baselib_stopwatch.obj \
        $(OBJS)\baselib_strconv.obj \
        $(OBJS)\baselib_stream.obj \
        $(OBJS)\baselib_string.obj \

+       $(OBJS)\baselib_stringimpl.obj \
+       $(OBJS)\baselib_stringops.obj \
+       $(OBJS)\baselib_strvararg.obj \

        $(OBJS)\baselib_sysopt.obj \
        $(OBJS)\baselib_tarstrm.obj \
        $(OBJS)\baselib_textbuf.obj \
        $(OBJS)\baselib_textfile.obj \
        $(OBJS)\baselib_sysopt.obj \
        $(OBJS)\baselib_tarstrm.obj \
        $(OBJS)\baselib_textbuf.obj \
        $(OBJS)\baselib_textfile.obj \

+       $(OBJS)\baselib_timercmn.obj \
+       $(OBJS)\baselib_timerimpl.obj \

        $(OBJS)\baselib_tokenzr.obj \
        $(OBJS)\baselib_txtstrm.obj \
        $(OBJS)\baselib_tokenzr.obj \
        $(OBJS)\baselib_txtstrm.obj \

+       $(OBJS)\baselib_unichar.obj \

        $(OBJS)\baselib_uri.obj \
        $(OBJS)\baselib_uri.obj \

+       $(OBJS)\baselib_ustring.obj \

        $(OBJS)\baselib_variant.obj \
        $(OBJS)\baselib_wfstream.obj \
        $(OBJS)\baselib_variant.obj \
        $(OBJS)\baselib_wfstream.obj \

-       $(OBJS)\baselib_wxchar.obj \
+       $(OBJS)\baselib_wxcrt.obj \
+       $(OBJS)\baselib_wxprintf.obj \
+       $(OBJS)\baselib_xlocale.obj \

        $(OBJS)\baselib_xti.obj \
        $(OBJS)\baselib_xtistrm.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_xti.obj \
        $(OBJS)\baselib_xtistrm.obj \
        $(OBJS)\baselib_zipstrm.obj \


@@ -645,26 +817,28 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_stackwalk.obj \
        $(OBJS)\baselib_stdpaths.obj \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_stackwalk.obj \
        $(OBJS)\baselib_stdpaths.obj \
        $(OBJS)\baselib_thread.obj \

+       $(OBJS)\baselib_timer.obj \

        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
        $(OBJS)\baselib_utilscmn.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
        $(OBJS)\baselib_utilscmn.obj \

+       $(OBJS)\baselib_evtloop.obj \

        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_version.res \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_version.res \


@@ -678,19 +852,19 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_url.obj \

-       $(OBJS)\netdll_gsocket.obj \
+       $(OBJS)\netdll_sockmsw.obj \

        $(OBJS)\netdll_urlmsw.obj
        $(OBJS)\netdll_urlmsw.obj

-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)

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


@@ -703,19 +877,19 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_url.obj \

-       $(OBJS)\netlib_gsocket.obj \
+       $(OBJS)\netlib_sockmsw.obj \

        $(OBJS)\netlib_urlmsw.obj
        $(OBJS)\netlib_urlmsw.obj

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE \
-       /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)

 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_version.res \
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_version.res \


@@ -723,69 +897,72 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \
        $(OBJS)\coredll_utilscmn.obj \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \
        $(OBJS)\coredll_utilscmn.obj \

+       $(OBJS)\coredll_evtloop.obj \

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

-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_194)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)

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

+       $(OBJS)\corelib_evtloop.obj \

        $(OBJS)\corelib_main.obj \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_main.obj \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
        $(OBJS)\advdll_version.res \
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
        /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
        $(OBJS)\advdll_version.res \
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)

-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_dummy.obj \
        /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_dummy.obj \


@@ -793,94 +970,34 @@ MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \
        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \

-       $(OBJS)\mediadll_mediactrl_qt.obj \
-       $(OBJS)\mediadll_activex.obj
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
+       $(OBJS)\mediadll_mediactrl_qt.obj
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

 MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_dummy.obj \
        $(OBJS)\medialib_mediactrlcmn.obj \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
 MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_dummy.obj \
        $(OBJS)\medialib_mediactrlcmn.obj \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \

-       $(OBJS)\medialib_mediactrl_qt.obj \
-       $(OBJS)\medialib_activex.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_ODBC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_odbcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  \
-       $(OBJS)\odbcdll_dummy.obj \
-       $(OBJS)\odbcdll_version.res \
-       $(OBJS)\odbcdll_db.obj \
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  \
-       $(OBJS)\odbclib_dummy.obj \
-       $(OBJS)\odbclib_db.obj \
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_DBGRID \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  \
-       $(OBJS)\dbgriddll_dummy.obj \
-       $(OBJS)\dbgriddll_version.res \
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  \
-       $(OBJS)\dbgridlib_dummy.obj \
-       $(OBJS)\dbgridlib_dbgrid.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME) /DWIN32 \
+       $(OBJS)\medialib_mediactrl_qt.obj
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \


@@ -909,16 +1026,17 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj
        $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj

-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

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


@@ -945,77 +1063,78 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(OBJS)\qadll_dummy.obj \
        $(OBJS)\qadll_version.res \
        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj
        /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(OBJS)\qadll_dummy.obj \
        $(OBJS)\qadll_version.res \
        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj

-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

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

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)

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

-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)

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

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \


@@ -1033,13 +1152,15 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \

+       $(OBJS)\xrcdll_xh_comboctrl.obj \

        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \

-       $(OBJS)\xrcdll_xh_frame.obj \
-       $(OBJS)\xrcdll_xh_mdi.obj \
+       $(OBJS)\xrcdll_xh_editlbox.obj \
+       $(OBJS)\xrcdll_xh_filectrl.obj \

        $(OBJS)\xrcdll_xh_filepicker.obj \
        $(OBJS)\xrcdll_xh_fontpicker.obj \
        $(OBJS)\xrcdll_xh_filepicker.obj \
        $(OBJS)\xrcdll_xh_fontpicker.obj \

+       $(OBJS)\xrcdll_xh_frame.obj \

        $(OBJS)\xrcdll_xh_gauge.obj \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_grid.obj \
        $(OBJS)\xrcdll_xh_gauge.obj \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_grid.obj \


@@ -1048,10 +1169,12 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_listb.obj \
        $(OBJS)\xrcdll_xh_listbk.obj \
        $(OBJS)\xrcdll_xh_listc.obj \
        $(OBJS)\xrcdll_xh_listb.obj \
        $(OBJS)\xrcdll_xh_listbk.obj \
        $(OBJS)\xrcdll_xh_listc.obj \

+       $(OBJS)\xrcdll_xh_mdi.obj \

        $(OBJS)\xrcdll_xh_menu.obj \
        $(OBJS)\xrcdll_xh_notbk.obj \
        $(OBJS)\xrcdll_xh_odcombo.obj \
        $(OBJS)\xrcdll_xh_panel.obj \
        $(OBJS)\xrcdll_xh_menu.obj \
        $(OBJS)\xrcdll_xh_notbk.obj \
        $(OBJS)\xrcdll_xh_odcombo.obj \
        $(OBJS)\xrcdll_xh_panel.obj \

+       $(OBJS)\xrcdll_xh_propdlg.obj \

        $(OBJS)\xrcdll_xh_radbt.obj \
        $(OBJS)\xrcdll_xh_radbx.obj \
        $(OBJS)\xrcdll_xh_scrol.obj \
        $(OBJS)\xrcdll_xh_radbt.obj \
        $(OBJS)\xrcdll_xh_radbx.obj \
        $(OBJS)\xrcdll_xh_scrol.obj \


@@ -1061,6 +1184,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_slidr.obj \
        $(OBJS)\xrcdll_xh_spin.obj \
        $(OBJS)\xrcdll_xh_split.obj \
        $(OBJS)\xrcdll_xh_slidr.obj \
        $(OBJS)\xrcdll_xh_spin.obj \
        $(OBJS)\xrcdll_xh_split.obj \

+       $(OBJS)\xrcdll_xh_srchctrl.obj \

        $(OBJS)\xrcdll_xh_statbar.obj \
        $(OBJS)\xrcdll_xh_stbmp.obj \
        $(OBJS)\xrcdll_xh_stbox.obj \
        $(OBJS)\xrcdll_xh_statbar.obj \
        $(OBJS)\xrcdll_xh_stbmp.obj \
        $(OBJS)\xrcdll_xh_stbox.obj \


@@ -1074,17 +1198,19 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_unkwn.obj \
        $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlres.obj \
        $(OBJS)\xrcdll_xh_unkwn.obj \
        $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlres.obj \

+       $(OBJS)\xrcdll_xmladv.obj \

        $(OBJS)\xrcdll_xmlrsall.obj
        $(OBJS)\xrcdll_xmlrsall.obj

-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

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


@@ -1100,13 +1226,15 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \

+       $(OBJS)\xrclib_xh_comboctrl.obj \

        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \

-       $(OBJS)\xrclib_xh_frame.obj \
-       $(OBJS)\xrclib_xh_mdi.obj \
+       $(OBJS)\xrclib_xh_editlbox.obj \
+       $(OBJS)\xrclib_xh_filectrl.obj \

        $(OBJS)\xrclib_xh_filepicker.obj \
        $(OBJS)\xrclib_xh_fontpicker.obj \
        $(OBJS)\xrclib_xh_filepicker.obj \
        $(OBJS)\xrclib_xh_fontpicker.obj \

+       $(OBJS)\xrclib_xh_frame.obj \

        $(OBJS)\xrclib_xh_gauge.obj \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_grid.obj \
        $(OBJS)\xrclib_xh_gauge.obj \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_grid.obj \


@@ -1115,10 +1243,12 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_listb.obj \
        $(OBJS)\xrclib_xh_listbk.obj \
        $(OBJS)\xrclib_xh_listc.obj \
        $(OBJS)\xrclib_xh_listb.obj \
        $(OBJS)\xrclib_xh_listbk.obj \
        $(OBJS)\xrclib_xh_listc.obj \

+       $(OBJS)\xrclib_xh_mdi.obj \

        $(OBJS)\xrclib_xh_menu.obj \
        $(OBJS)\xrclib_xh_notbk.obj \
        $(OBJS)\xrclib_xh_odcombo.obj \
        $(OBJS)\xrclib_xh_panel.obj \
        $(OBJS)\xrclib_xh_menu.obj \
        $(OBJS)\xrclib_xh_notbk.obj \
        $(OBJS)\xrclib_xh_odcombo.obj \
        $(OBJS)\xrclib_xh_panel.obj \

+       $(OBJS)\xrclib_xh_propdlg.obj \

        $(OBJS)\xrclib_xh_radbt.obj \
        $(OBJS)\xrclib_xh_radbx.obj \
        $(OBJS)\xrclib_xh_scrol.obj \
        $(OBJS)\xrclib_xh_radbt.obj \
        $(OBJS)\xrclib_xh_radbx.obj \
        $(OBJS)\xrclib_xh_scrol.obj \


@@ -1128,6 +1258,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_slidr.obj \
        $(OBJS)\xrclib_xh_spin.obj \
        $(OBJS)\xrclib_xh_split.obj \
        $(OBJS)\xrclib_xh_slidr.obj \
        $(OBJS)\xrclib_xh_spin.obj \
        $(OBJS)\xrclib_xh_split.obj \

+       $(OBJS)\xrclib_xh_srchctrl.obj \

        $(OBJS)\xrclib_xh_statbar.obj \
        $(OBJS)\xrclib_xh_stbmp.obj \
        $(OBJS)\xrclib_xh_stbox.obj \
        $(OBJS)\xrclib_xh_statbar.obj \
        $(OBJS)\xrclib_xh_stbmp.obj \
        $(OBJS)\xrclib_xh_stbox.obj \


@@ -1141,17 +1272,18 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_unkwn.obj \
        $(OBJS)\xrclib_xh_wizrd.obj \
        $(OBJS)\xrclib_xmlres.obj \
        $(OBJS)\xrclib_xh_unkwn.obj \
        $(OBJS)\xrclib_xh_wizrd.obj \
        $(OBJS)\xrclib_xmlres.obj \

+       $(OBJS)\xrclib_xmladv.obj \

        $(OBJS)\xrclib_xmlrsall.obj
        $(OBJS)\xrclib_xmlrsall.obj

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

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dummy.obj \
        /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dummy.obj \


@@ -1160,34 +1292,127 @@ AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dockart.obj \
        $(OBJS)\auidll_floatpane.obj \
        $(OBJS)\auidll_auibook.obj \
        $(OBJS)\auidll_dockart.obj \
        $(OBJS)\auidll_floatpane.obj \
        $(OBJS)\auidll_auibook.obj \

+       $(OBJS)\auidll_auibar.obj \

        $(OBJS)\auidll_tabmdi.obj
        $(OBJS)\auidll_tabmdi.obj

-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

 AUILIB_OBJECTS =  \
        $(OBJS)\auilib_dummy.obj \
        $(OBJS)\auilib_framemanager.obj \
        $(OBJS)\auilib_dockart.obj \
        $(OBJS)\auilib_floatpane.obj \
        $(OBJS)\auilib_auibook.obj \
 AUILIB_OBJECTS =  \
        $(OBJS)\auilib_dummy.obj \
        $(OBJS)\auilib_framemanager.obj \
        $(OBJS)\auilib_dockart.obj \
        $(OBJS)\auilib_floatpane.obj \
        $(OBJS)\auilib_auibook.obj \

+       $(OBJS)\auilib_auibar.obj \

        $(OBJS)\auilib_tabmdi.obj
        $(OBJS)\auilib_tabmdi.obj

-RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_438)$(__DEBUGRUNTIME) /DWIN32 \
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)
+RIBBONDLL_OBJECTS =  \
+       $(OBJS)\ribbondll_dummy.obj \
+       $(OBJS)\ribbondll_version.res \
+       $(OBJS)\ribbondll_art_internal.obj \
+       $(OBJS)\ribbondll_art_msw.obj \
+       $(OBJS)\ribbondll_art_aui.obj \
+       $(OBJS)\ribbondll_bar.obj \
+       $(OBJS)\ribbondll_buttonbar.obj \
+       $(OBJS)\ribbondll_control.obj \
+       $(OBJS)\ribbondll_gallery.obj \
+       $(OBJS)\ribbondll_page.obj \
+       $(OBJS)\ribbondll_panel.obj \
+       $(OBJS)\ribbondll_toolbar.obj
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+RIBBONLIB_OBJECTS =  \
+       $(OBJS)\ribbonlib_dummy.obj \
+       $(OBJS)\ribbonlib_art_internal.obj \
+       $(OBJS)\ribbonlib_art_msw.obj \
+       $(OBJS)\ribbonlib_art_aui.obj \
+       $(OBJS)\ribbonlib_bar.obj \
+       $(OBJS)\ribbonlib_buttonbar.obj \
+       $(OBJS)\ribbonlib_control.obj \
+       $(OBJS)\ribbonlib_gallery.obj \
+       $(OBJS)\ribbonlib_page.obj \
+       $(OBJS)\ribbonlib_panel.obj \
+       $(OBJS)\ribbonlib_toolbar.obj
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDDLL_OBJECTS =  \
+       $(OBJS)\propgriddll_dummy.obj \
+       $(OBJS)\propgriddll_version.res \
+       $(OBJS)\propgriddll_advprops.obj \
+       $(OBJS)\propgriddll_editors.obj \
+       $(OBJS)\propgriddll_manager.obj \
+       $(OBJS)\propgriddll_property.obj \
+       $(OBJS)\propgriddll_propgrid.obj \
+       $(OBJS)\propgriddll_propgridiface.obj \
+       $(OBJS)\propgriddll_propgridpagestate.obj \
+       $(OBJS)\propgriddll_props.obj
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDLIB_OBJECTS =  \
+       $(OBJS)\propgridlib_dummy.obj \
+       $(OBJS)\propgridlib_advprops.obj \
+       $(OBJS)\propgridlib_editors.obj \
+       $(OBJS)\propgridlib_manager.obj \
+       $(OBJS)\propgridlib_property.obj \
+       $(OBJS)\propgridlib_propgrid.obj \
+       $(OBJS)\propgridlib_propgridiface.obj \
+       $(OBJS)\propgridlib_propgridpagestate.obj \
+       $(OBJS)\propgridlib_props.obj
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_dummy.obj \


@@ -1201,17 +1426,17 @@ RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_richtextsymboldlg.obj \
        $(OBJS)\richtextdll_richtextstyledlg.obj \
        $(OBJS)\richtextdll_richtextprint.obj
        $(OBJS)\richtextdll_richtextsymboldlg.obj \
        $(OBJS)\richtextdll_richtextstyledlg.obj \
        $(OBJS)\richtextdll_richtextprint.obj

-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) \
-       $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

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


@@ -1223,33 +1448,72 @@ RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj

-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_465)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+STCDLL_OBJECTS =  \
+       $(OBJS)\stcdll_dummy.obj \
+       $(OBJS)\stcdll_version.res \
+       $(OBJS)\stcdll_stc.obj \
+       $(OBJS)\stcdll_PlatWX.obj \
+       $(OBJS)\stcdll_ScintillaWX.obj
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_491)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+STCLIB_OBJECTS =  \
+       $(OBJS)\stclib_dummy.obj \
+       $(OBJS)\stclib_stc.obj \
+       $(OBJS)\stclib_PlatWX.obj \
+       $(OBJS)\stclib_ScintillaWX.obj
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_505)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_version.res \
        /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_version.res \

+       $(OBJS)\gldll_glcmn.obj \

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

-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_518)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \

-       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

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

+       $(OBJS)\gllib_glcmn.obj \

        $(OBJS)\gllib_glcanvas.obj
 BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 
        $(OBJS)\gllib_glcanvas.obj
 BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 


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

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

 WXDEBUGFLAG = d
 !endif
 WXDEBUGFLAG = d
 !endif

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

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


@@ -1279,18 +1543,18 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"

 DIR_SUFFIX_CPU = _amd64
 !endif
 DIR_SUFFIX_CPU = _amd64
 !endif

+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif

 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
 DIR_SUFFIX_CPU = _ia64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
 DIR_SUFFIX_CPU = _ia64
 !endif

-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif

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


@@ -1300,18 +1564,18 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif

-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"

 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif

+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif

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

-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif

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


@@ -1357,6 +1621,12 @@ __RUNTIME_LIBS_73 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_73 = $(__THREADSFLAG)
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_73 = $(__THREADSFLAG)
 !endif

+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_86 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_86 = $(__THREADSFLAG)
+!endif

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


@@ -1368,10 +1638,10 @@ __monodll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_87 = D
+__RUNTIME_LIBS_100 = D

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

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

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


@@ -1381,7 +1651,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_mediactrl_am.obj \
        $(OBJS)\monodll_mediactrl_wmp10.obj \
        $(OBJS)\monodll_mediactrl_qt.obj \
        $(OBJS)\monodll_mediactrl_am.obj \
        $(OBJS)\monodll_mediactrl_wmp10.obj \
        $(OBJS)\monodll_mediactrl_qt.obj \

-       $(OBJS)\monodll_activex.obj \

        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monodll_helpctrl.obj \
        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monodll_helpctrl.obj \
        $(OBJS)\monodll_helpdata.obj \


@@ -1406,11 +1675,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_tables.obj \
        $(OBJS)\monodll_winpars.obj \
        $(OBJS)\monodll_htmllbox.obj \
        $(OBJS)\monodll_m_tables.obj \
        $(OBJS)\monodll_winpars.obj \
        $(OBJS)\monodll_htmllbox.obj \

-       $(OBJS)\monodll_db.obj \
-       $(OBJS)\monodll_dbtable.obj \

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

-       $(OBJS)\monodll_dbgrid.obj \

        $(OBJS)\monodll_xh_animatctrl.obj \
        $(OBJS)\monodll_xh_bmp.obj \
        $(OBJS)\monodll_xh_bmpcbox.obj \
        $(OBJS)\monodll_xh_animatctrl.obj \
        $(OBJS)\monodll_xh_bmp.obj \
        $(OBJS)\monodll_xh_bmpcbox.obj \


@@ -1424,13 +1690,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \

+       $(OBJS)\monodll_xh_comboctrl.obj \

        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \

-       $(OBJS)\monodll_xh_frame.obj \
-       $(OBJS)\monodll_xh_mdi.obj \
+       $(OBJS)\monodll_xh_editlbox.obj \
+       $(OBJS)\monodll_xh_filectrl.obj \

        $(OBJS)\monodll_xh_filepicker.obj \
        $(OBJS)\monodll_xh_fontpicker.obj \
        $(OBJS)\monodll_xh_filepicker.obj \
        $(OBJS)\monodll_xh_fontpicker.obj \

+       $(OBJS)\monodll_xh_frame.obj \

        $(OBJS)\monodll_xh_gauge.obj \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_grid.obj \
        $(OBJS)\monodll_xh_gauge.obj \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_grid.obj \


@@ -1439,10 +1707,12 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_listb.obj \
        $(OBJS)\monodll_xh_listbk.obj \
        $(OBJS)\monodll_xh_listc.obj \
        $(OBJS)\monodll_xh_listb.obj \
        $(OBJS)\monodll_xh_listbk.obj \
        $(OBJS)\monodll_xh_listc.obj \

+       $(OBJS)\monodll_xh_mdi.obj \

        $(OBJS)\monodll_xh_menu.obj \
        $(OBJS)\monodll_xh_notbk.obj \
        $(OBJS)\monodll_xh_odcombo.obj \
        $(OBJS)\monodll_xh_panel.obj \
        $(OBJS)\monodll_xh_menu.obj \
        $(OBJS)\monodll_xh_notbk.obj \
        $(OBJS)\monodll_xh_odcombo.obj \
        $(OBJS)\monodll_xh_panel.obj \

+       $(OBJS)\monodll_xh_propdlg.obj \

        $(OBJS)\monodll_xh_radbt.obj \
        $(OBJS)\monodll_xh_radbx.obj \
        $(OBJS)\monodll_xh_scrol.obj \
        $(OBJS)\monodll_xh_radbt.obj \
        $(OBJS)\monodll_xh_radbx.obj \
        $(OBJS)\monodll_xh_scrol.obj \


@@ -1452,6 +1722,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_slidr.obj \
        $(OBJS)\monodll_xh_spin.obj \
        $(OBJS)\monodll_xh_split.obj \
        $(OBJS)\monodll_xh_slidr.obj \
        $(OBJS)\monodll_xh_spin.obj \
        $(OBJS)\monodll_xh_split.obj \

+       $(OBJS)\monodll_xh_srchctrl.obj \

        $(OBJS)\monodll_xh_statbar.obj \
        $(OBJS)\monodll_xh_stbmp.obj \
        $(OBJS)\monodll_xh_stbox.obj \
        $(OBJS)\monodll_xh_statbar.obj \
        $(OBJS)\monodll_xh_stbmp.obj \
        $(OBJS)\monodll_xh_stbox.obj \


@@ -1465,12 +1736,22 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_unkwn.obj \
        $(OBJS)\monodll_xh_wizrd.obj \
        $(OBJS)\monodll_xmlres.obj \
        $(OBJS)\monodll_xh_unkwn.obj \
        $(OBJS)\monodll_xh_wizrd.obj \
        $(OBJS)\monodll_xmlres.obj \

+       $(OBJS)\monodll_xmladv.obj \

        $(OBJS)\monodll_xmlrsall.obj \
        $(OBJS)\monodll_framemanager.obj \
        $(OBJS)\monodll_dockart.obj \
        $(OBJS)\monodll_floatpane.obj \
        $(OBJS)\monodll_auibook.obj \
        $(OBJS)\monodll_xmlrsall.obj \
        $(OBJS)\monodll_framemanager.obj \
        $(OBJS)\monodll_dockart.obj \
        $(OBJS)\monodll_floatpane.obj \
        $(OBJS)\monodll_auibook.obj \

+       $(OBJS)\monodll_auibar.obj \

        $(OBJS)\monodll_tabmdi.obj \
        $(OBJS)\monodll_tabmdi.obj \

+       $(OBJS)\monodll_advprops.obj \
+       $(OBJS)\monodll_editors.obj \
+       $(OBJS)\monodll_manager.obj \
+       $(OBJS)\monodll_property.obj \
+       $(OBJS)\monodll_propgrid.obj \
+       $(OBJS)\monodll_propgridiface.obj \
+       $(OBJS)\monodll_propgridpagestate.obj \
+       $(OBJS)\monodll_props.obj \

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


@@ -1479,10 +1760,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_richtextformatdlg.obj \
        $(OBJS)\monodll_richtextsymboldlg.obj \
        $(OBJS)\monodll_richtextstyledlg.obj \
        $(OBJS)\monodll_richtextformatdlg.obj \
        $(OBJS)\monodll_richtextsymboldlg.obj \
        $(OBJS)\monodll_richtextstyledlg.obj \

-       $(OBJS)\monodll_richtextprint.obj
+       $(OBJS)\monodll_richtextprint.obj \
+       $(OBJS)\monodll_stc.obj \
+       $(OBJS)\monodll_PlatWX.obj \
+       $(OBJS)\monodll_ScintillaWX.obj

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

+       $(OBJS)\monodll_activex.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -1500,14 +1785,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dib.obj \
        $(OBJS)\monodll_display.obj \
        $(OBJS)\monodll_enhmeta.obj \
        $(OBJS)\monodll_dib.obj \
        $(OBJS)\monodll_display.obj \
        $(OBJS)\monodll_enhmeta.obj \

-       $(OBJS)\monodll_evtloop.obj \

        $(OBJS)\monodll_font.obj \
        $(OBJS)\monodll_fontenum.obj \
        $(OBJS)\monodll_fontutil.obj \
        $(OBJS)\monodll_gdiimage.obj \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_font.obj \
        $(OBJS)\monodll_fontenum.obj \
        $(OBJS)\monodll_fontutil.obj \
        $(OBJS)\monodll_gdiimage.obj \
        $(OBJS)\monodll_gdiobj.obj \

+       $(OBJS)\monodll_gdiplus.obj \

        $(OBJS)\monodll_graphics.obj \
        $(OBJS)\monodll_graphics.obj \

-       $(OBJS)\monodll_gsockmsw.obj \

        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \


@@ -1523,7 +1807,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_timer.obj \

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


@@ -1533,9 +1816,14 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \

+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \

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

+       $(OBJS)\monodll_artmsw.obj \

        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \


@@ -1549,7 +1837,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dragimag.obj \
        $(OBJS)\monodll_filedlg.obj \
        $(OBJS)\monodll_frame.obj \
        $(OBJS)\monodll_dragimag.obj \
        $(OBJS)\monodll_filedlg.obj \
        $(OBJS)\monodll_frame.obj \

-       $(OBJS)\monodll_gauge95.obj \
+       $(OBJS)\monodll_gauge.obj \
+       $(OBJS)\monodll_headerctrl.obj \

        $(OBJS)\monodll_iniconf.obj \
        $(OBJS)\monodll_listbox.obj \
        $(OBJS)\monodll_listctrl.obj \
        $(OBJS)\monodll_iniconf.obj \
        $(OBJS)\monodll_listbox.obj \
        $(OBJS)\monodll_listctrl.obj \


@@ -1559,28 +1848,30 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_metafile.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_metafile.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \

+       $(OBJS)\monodll_nativewin.obj \

        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
        $(OBJS)\monodll_scrolbar.obj \

-       $(OBJS)\monodll_slider95.obj \
+       $(OBJS)\monodll_slider.obj \

        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_spinctrl.obj \
        $(OBJS)\monodll_statbmp.obj \
        $(OBJS)\monodll_statbox.obj \
        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_spinctrl.obj \
        $(OBJS)\monodll_statbmp.obj \
        $(OBJS)\monodll_statbox.obj \

-       $(OBJS)\monodll_statbr95.obj \
+       $(OBJS)\monodll_statusbar.obj \

        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \

-       $(OBJS)\monodll_tabctrl.obj \
-       $(OBJS)\monodll_tbar95.obj \
+       $(OBJS)\monodll_toolbar.obj \

        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_textctrl.obj \

+       $(OBJS)\monodll_textentry.obj \

        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_checklst.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
        $(OBJS)\monodll_fontdlg.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_checklst.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
        $(OBJS)\monodll_fontdlg.obj \

+       $(OBJS)\monodll_accelcmn.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_anidecod.obj \
        $(OBJS)\monodll_appcmn.obj \
        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_anidecod.obj \
        $(OBJS)\monodll_appcmn.obj \


@@ -1588,6 +1879,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_bookctrl.obj \

+       $(OBJS)\monodll_btncmn.obj \
+       $(OBJS)\monodll_cairo.obj \

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


@@ -1603,6 +1896,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dcbufcmn.obj \
        $(OBJS)\monodll_dcgraph.obj \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dcbufcmn.obj \
        $(OBJS)\monodll_dcgraph.obj \

+       $(OBJS)\monodll_dcsvg.obj \

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


@@ -1611,8 +1905,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dpycmn.obj \
        $(OBJS)\monodll_dseldlg.obj \
        $(OBJS)\monodll_effects.obj \
        $(OBJS)\monodll_dpycmn.obj \
        $(OBJS)\monodll_dseldlg.obj \
        $(OBJS)\monodll_effects.obj \

-       $(OBJS)\monodll_evtloopcmn.obj \

        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \

+       $(OBJS)\monodll_filectrlcmn.obj \

        $(OBJS)\monodll_filepickercmn.obj \
        $(OBJS)\monodll_fontpickercmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_filepickercmn.obj \
        $(OBJS)\monodll_fontpickercmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \


@@ -1627,6 +1921,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
        $(OBJS)\monodll_graphcmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
        $(OBJS)\monodll_graphcmn.obj \

+       $(OBJS)\monodll_headercolcmn.obj \
+       $(OBJS)\monodll_headerctrlcmn.obj \

        $(OBJS)\monodll_helpbase.obj \
        $(OBJS)\monodll_iconbndl.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_helpbase.obj \
        $(OBJS)\monodll_iconbndl.obj \
        $(OBJS)\monodll_imagall.obj \


@@ -1647,43 +1943,48 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \

+       $(OBJS)\monodll_mousemanager.obj \

        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \
        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \

+       $(OBJS)\monodll_persist.obj \

        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
        $(OBJS)\monodll_quantize.obj \
        $(OBJS)\monodll_radiocmn.obj \
        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
        $(OBJS)\monodll_quantize.obj \
        $(OBJS)\monodll_radiocmn.obj \

+       $(OBJS)\monodll_rearrangectrl.obj \

        $(OBJS)\monodll_rendcmn.obj \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \
        $(OBJS)\monodll_rendcmn.obj \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \

+       $(OBJS)\monodll_spinctrlcmn.obj \

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

+       $(OBJS)\monodll_stattextcmn.obj \

        $(OBJS)\monodll_stockitem.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_stockitem.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_textentrycmn.obj \

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

+       $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \

        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \

-       $(OBJS)\monodll_clrpickerg.obj \
-       $(OBJS)\monodll_collpaneg.obj \

        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \
        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \

-       $(OBJS)\monodll_filepickerg.obj \
-       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_filectrlg.obj \
+       $(OBJS)\monodll_headerctrlg.obj \

        $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \
        $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \


@@ -1696,6 +1997,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
        $(OBJS)\monodll_srchctlg.obj \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
        $(OBJS)\monodll_srchctlg.obj \

+       $(OBJS)\monodll_statbmpg.obj \
+       $(OBJS)\monodll_stattextg.obj \

        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_toolbkg.obj \
        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_toolbkg.obj \


@@ -1706,6 +2009,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_activex.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -1723,14 +2027,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dib.obj \
        $(OBJS)\monodll_display.obj \
        $(OBJS)\monodll_enhmeta.obj \
        $(OBJS)\monodll_dib.obj \
        $(OBJS)\monodll_display.obj \
        $(OBJS)\monodll_enhmeta.obj \

-       $(OBJS)\monodll_evtloop.obj \

        $(OBJS)\monodll_font.obj \
        $(OBJS)\monodll_fontenum.obj \
        $(OBJS)\monodll_fontutil.obj \
        $(OBJS)\monodll_gdiimage.obj \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_font.obj \
        $(OBJS)\monodll_fontenum.obj \
        $(OBJS)\monodll_fontutil.obj \
        $(OBJS)\monodll_gdiimage.obj \
        $(OBJS)\monodll_gdiobj.obj \

+       $(OBJS)\monodll_gdiplus.obj \

        $(OBJS)\monodll_graphics.obj \
        $(OBJS)\monodll_graphics.obj \

-       $(OBJS)\monodll_gsockmsw.obj \

        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \


@@ -1746,7 +2049,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_timer.obj \

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


@@ -1757,22 +2059,24 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_accel.obj \

+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \

        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
        $(OBJS)\monodll_filedlgg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
        $(OBJS)\monodll_filedlgg.obj \

+       $(OBJS)\monodll_filepickerg.obj \

        $(OBJS)\monodll_fontdlgg.obj \
        $(OBJS)\monodll_fontdlgg.obj \

+       $(OBJS)\monodll_fontpickerg.obj \

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

-       $(OBJS)\monodll_tabg.obj \

        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_checklst.obj \
        $(OBJS)\monodll_choice.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_checklst.obj \
        $(OBJS)\monodll_choice.obj \

-       $(OBJS)\monodll_colschem.obj \

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


@@ -1789,6 +2093,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_scrthumb.obj \
        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_scrthumb.obj \

+       $(OBJS)\monodll_settingsuniv.obj \

        $(OBJS)\monodll_slider.obj \
        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_statbmp.obj \
        $(OBJS)\monodll_slider.obj \
        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_statbmp.obj \


@@ -1807,6 +2112,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_metal.obj \
        $(OBJS)\monodll_mono.obj \
        $(OBJS)\monodll_win32.obj \
        $(OBJS)\monodll_metal.obj \
        $(OBJS)\monodll_mono.obj \
        $(OBJS)\monodll_win32.obj \

+       $(OBJS)\monodll_accelcmn.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_anidecod.obj \
        $(OBJS)\monodll_appcmn.obj \
        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_anidecod.obj \
        $(OBJS)\monodll_appcmn.obj \


@@ -1814,6 +2120,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_bookctrl.obj \

+       $(OBJS)\monodll_btncmn.obj \
+       $(OBJS)\monodll_cairo.obj \

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


@@ -1829,6 +2137,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dcbufcmn.obj \
        $(OBJS)\monodll_dcgraph.obj \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dcbufcmn.obj \
        $(OBJS)\monodll_dcgraph.obj \

+       $(OBJS)\monodll_dcsvg.obj \

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


@@ -1837,8 +2146,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dpycmn.obj \
        $(OBJS)\monodll_dseldlg.obj \
        $(OBJS)\monodll_effects.obj \
        $(OBJS)\monodll_dpycmn.obj \
        $(OBJS)\monodll_dseldlg.obj \
        $(OBJS)\monodll_effects.obj \

-       $(OBJS)\monodll_evtloopcmn.obj \

        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \

+       $(OBJS)\monodll_filectrlcmn.obj \

        $(OBJS)\monodll_filepickercmn.obj \
        $(OBJS)\monodll_fontpickercmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_filepickercmn.obj \
        $(OBJS)\monodll_fontpickercmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \


@@ -1853,6 +2162,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
        $(OBJS)\monodll_graphcmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
        $(OBJS)\monodll_graphcmn.obj \

+       $(OBJS)\monodll_headercolcmn.obj \
+       $(OBJS)\monodll_headerctrlcmn.obj \

        $(OBJS)\monodll_helpbase.obj \
        $(OBJS)\monodll_iconbndl.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_helpbase.obj \
        $(OBJS)\monodll_iconbndl.obj \
        $(OBJS)\monodll_imagall.obj \


@@ -1873,43 +2184,48 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \

+       $(OBJS)\monodll_mousemanager.obj \

        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \
        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \

+       $(OBJS)\monodll_persist.obj \

        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
        $(OBJS)\monodll_quantize.obj \
        $(OBJS)\monodll_radiocmn.obj \
        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
        $(OBJS)\monodll_quantize.obj \
        $(OBJS)\monodll_radiocmn.obj \

+       $(OBJS)\monodll_rearrangectrl.obj \

        $(OBJS)\monodll_rendcmn.obj \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \
        $(OBJS)\monodll_rendcmn.obj \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \

+       $(OBJS)\monodll_spinctrlcmn.obj \

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

+       $(OBJS)\monodll_stattextcmn.obj \

        $(OBJS)\monodll_stockitem.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_stockitem.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_textentrycmn.obj \

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

+       $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \

        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
        $(OBJS)\monodll_choicdgg.obj \
        $(OBJS)\monodll_choicbkg.obj \

-       $(OBJS)\monodll_clrpickerg.obj \
-       $(OBJS)\monodll_collpaneg.obj \

        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \
        $(OBJS)\monodll_combog.obj \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \

-       $(OBJS)\monodll_filepickerg.obj \
-       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_filectrlg.obj \
+       $(OBJS)\monodll_headerctrlg.obj \

        $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \
        $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \


@@ -1922,6 +2238,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
        $(OBJS)\monodll_srchctlg.obj \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
        $(OBJS)\monodll_srchctlg.obj \

+       $(OBJS)\monodll_statbmpg.obj \
+       $(OBJS)\monodll_stattextg.obj \

        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_toolbkg.obj \
        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_toolbkg.obj \


@@ -1933,19 +2251,24 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \

+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \

        $(OBJS)\monodll_datavcmn.obj \
        $(OBJS)\monodll_datavcmn.obj \

+       $(OBJS)\monodll_hyperlnkcmn.obj \

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

-       $(OBJS)\monodll_animateg.obj \

        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \

-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \

        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \

+       $(OBJS)\monodll_editlbox.obj \

        $(OBJS)\monodll_grid.obj \
        $(OBJS)\monodll_gridctrl.obj \
        $(OBJS)\monodll_grid.obj \
        $(OBJS)\monodll_gridctrl.obj \

+       $(OBJS)\monodll_grideditors.obj \

        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \

-       $(OBJS)\monodll_hyperlink.obj \
+       $(OBJS)\monodll_hyperlinkg.obj \

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

+       $(OBJS)\monodll_notifmsgg.obj \

        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
        $(OBJS)\monodll_sashwin.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
        $(OBJS)\monodll_sashwin.obj \


@@ -1954,27 +2277,37 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \

+       $(OBJS)\monodll_notifmsg.obj \

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

+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_bmpcbox.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datecontrols.obj \

        $(OBJS)\monodll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \
        $(OBJS)\monodll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \

+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \

        $(OBJS)\monodll_datavcmn.obj \
        $(OBJS)\monodll_datavcmn.obj \

+       $(OBJS)\monodll_hyperlnkcmn.obj \

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

-       $(OBJS)\monodll_animateg.obj \

        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \

-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \

        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \

+       $(OBJS)\monodll_editlbox.obj \

        $(OBJS)\monodll_grid.obj \
        $(OBJS)\monodll_gridctrl.obj \
        $(OBJS)\monodll_grid.obj \
        $(OBJS)\monodll_gridctrl.obj \

+       $(OBJS)\monodll_grideditors.obj \

        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \

-       $(OBJS)\monodll_hyperlink.obj \
+       $(OBJS)\monodll_hyperlinkg.obj \

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

+       $(OBJS)\monodll_notifmsgg.obj \

        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
        $(OBJS)\monodll_sashwin.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
        $(OBJS)\monodll_sashwin.obj \


@@ -1983,19 +2316,24 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \

+       $(OBJS)\monodll_notifmsg.obj \

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

-       $(OBJS)\monodll_joystick.obj
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_animateg.obj
+!endif
+!if "$(USE_STC)" == "1"
+__wxscintilla_library_link_DEP = $(__wxscintilla)

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

-__RUNTIME_LIBS_100 = D
+__RUNTIME_LIBS_113 = D

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

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

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


@@ -2005,7 +2343,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_mediactrl_am.obj \
        $(OBJS)\monolib_mediactrl_wmp10.obj \
        $(OBJS)\monolib_mediactrl_qt.obj \
        $(OBJS)\monolib_mediactrl_am.obj \
        $(OBJS)\monolib_mediactrl_wmp10.obj \
        $(OBJS)\monolib_mediactrl_qt.obj \

-       $(OBJS)\monolib_activex.obj \

        $(OBJS)\monolib_helpbest.obj \
        $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpbest.obj \
        $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_helpdata.obj \


@@ -2030,11 +2367,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_tables.obj \
        $(OBJS)\monolib_winpars.obj \
        $(OBJS)\monolib_htmllbox.obj \
        $(OBJS)\monolib_m_tables.obj \
        $(OBJS)\monolib_winpars.obj \
        $(OBJS)\monolib_htmllbox.obj \

-       $(OBJS)\monolib_db.obj \
-       $(OBJS)\monolib_dbtable.obj \

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

-       $(OBJS)\monolib_dbgrid.obj \

        $(OBJS)\monolib_xh_animatctrl.obj \
        $(OBJS)\monolib_xh_bmp.obj \
        $(OBJS)\monolib_xh_bmpcbox.obj \
        $(OBJS)\monolib_xh_animatctrl.obj \
        $(OBJS)\monolib_xh_bmp.obj \
        $(OBJS)\monolib_xh_bmpcbox.obj \


@@ -2048,13 +2382,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \

+       $(OBJS)\monolib_xh_comboctrl.obj \

        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \

-       $(OBJS)\monolib_xh_frame.obj \
-       $(OBJS)\monolib_xh_mdi.obj \
+       $(OBJS)\monolib_xh_editlbox.obj \
+       $(OBJS)\monolib_xh_filectrl.obj \

        $(OBJS)\monolib_xh_filepicker.obj \
        $(OBJS)\monolib_xh_fontpicker.obj \
        $(OBJS)\monolib_xh_filepicker.obj \
        $(OBJS)\monolib_xh_fontpicker.obj \

+       $(OBJS)\monolib_xh_frame.obj \

        $(OBJS)\monolib_xh_gauge.obj \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_grid.obj \
        $(OBJS)\monolib_xh_gauge.obj \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_grid.obj \


@@ -2063,10 +2399,12 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_listb.obj \
        $(OBJS)\monolib_xh_listbk.obj \
        $(OBJS)\monolib_xh_listc.obj \
        $(OBJS)\monolib_xh_listb.obj \
        $(OBJS)\monolib_xh_listbk.obj \
        $(OBJS)\monolib_xh_listc.obj \

+       $(OBJS)\monolib_xh_mdi.obj \

        $(OBJS)\monolib_xh_menu.obj \
        $(OBJS)\monolib_xh_notbk.obj \
        $(OBJS)\monolib_xh_odcombo.obj \
        $(OBJS)\monolib_xh_panel.obj \
        $(OBJS)\monolib_xh_menu.obj \
        $(OBJS)\monolib_xh_notbk.obj \
        $(OBJS)\monolib_xh_odcombo.obj \
        $(OBJS)\monolib_xh_panel.obj \

+       $(OBJS)\monolib_xh_propdlg.obj \

        $(OBJS)\monolib_xh_radbt.obj \
        $(OBJS)\monolib_xh_radbx.obj \
        $(OBJS)\monolib_xh_scrol.obj \
        $(OBJS)\monolib_xh_radbt.obj \
        $(OBJS)\monolib_xh_radbx.obj \
        $(OBJS)\monolib_xh_scrol.obj \


@@ -2076,6 +2414,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_slidr.obj \
        $(OBJS)\monolib_xh_spin.obj \
        $(OBJS)\monolib_xh_split.obj \
        $(OBJS)\monolib_xh_slidr.obj \
        $(OBJS)\monolib_xh_spin.obj \
        $(OBJS)\monolib_xh_split.obj \

+       $(OBJS)\monolib_xh_srchctrl.obj \

        $(OBJS)\monolib_xh_statbar.obj \
        $(OBJS)\monolib_xh_stbmp.obj \
        $(OBJS)\monolib_xh_stbox.obj \
        $(OBJS)\monolib_xh_statbar.obj \
        $(OBJS)\monolib_xh_stbmp.obj \
        $(OBJS)\monolib_xh_stbox.obj \


@@ -2089,12 +2428,22 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_unkwn.obj \
        $(OBJS)\monolib_xh_wizrd.obj \
        $(OBJS)\monolib_xmlres.obj \
        $(OBJS)\monolib_xh_unkwn.obj \
        $(OBJS)\monolib_xh_wizrd.obj \
        $(OBJS)\monolib_xmlres.obj \

+       $(OBJS)\monolib_xmladv.obj \

        $(OBJS)\monolib_xmlrsall.obj \
        $(OBJS)\monolib_framemanager.obj \
        $(OBJS)\monolib_dockart.obj \
        $(OBJS)\monolib_floatpane.obj \
        $(OBJS)\monolib_auibook.obj \
        $(OBJS)\monolib_xmlrsall.obj \
        $(OBJS)\monolib_framemanager.obj \
        $(OBJS)\monolib_dockart.obj \
        $(OBJS)\monolib_floatpane.obj \
        $(OBJS)\monolib_auibook.obj \

+       $(OBJS)\monolib_auibar.obj \

        $(OBJS)\monolib_tabmdi.obj \
        $(OBJS)\monolib_tabmdi.obj \

+       $(OBJS)\monolib_advprops.obj \
+       $(OBJS)\monolib_editors.obj \
+       $(OBJS)\monolib_manager.obj \
+       $(OBJS)\monolib_property.obj \
+       $(OBJS)\monolib_propgrid.obj \
+       $(OBJS)\monolib_propgridiface.obj \
+       $(OBJS)\monolib_propgridpagestate.obj \
+       $(OBJS)\monolib_props.obj \

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


@@ -2103,10 +2452,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_richtextformatdlg.obj \
        $(OBJS)\monolib_richtextsymboldlg.obj \
        $(OBJS)\monolib_richtextstyledlg.obj \
        $(OBJS)\monolib_richtextformatdlg.obj \
        $(OBJS)\monolib_richtextsymboldlg.obj \
        $(OBJS)\monolib_richtextstyledlg.obj \

-       $(OBJS)\monolib_richtextprint.obj
+       $(OBJS)\monolib_richtextprint.obj \
+       $(OBJS)\monolib_stc.obj \
+       $(OBJS)\monolib_PlatWX.obj \
+       $(OBJS)\monolib_ScintillaWX.obj

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

+       $(OBJS)\monolib_activex.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -2124,14 +2477,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dib.obj \
        $(OBJS)\monolib_display.obj \
        $(OBJS)\monolib_enhmeta.obj \
        $(OBJS)\monolib_dib.obj \
        $(OBJS)\monolib_display.obj \
        $(OBJS)\monolib_enhmeta.obj \

-       $(OBJS)\monolib_evtloop.obj \

        $(OBJS)\monolib_font.obj \
        $(OBJS)\monolib_fontenum.obj \
        $(OBJS)\monolib_fontutil.obj \
        $(OBJS)\monolib_gdiimage.obj \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_font.obj \
        $(OBJS)\monolib_fontenum.obj \
        $(OBJS)\monolib_fontutil.obj \
        $(OBJS)\monolib_gdiimage.obj \
        $(OBJS)\monolib_gdiobj.obj \

+       $(OBJS)\monolib_gdiplus.obj \

        $(OBJS)\monolib_graphics.obj \
        $(OBJS)\monolib_graphics.obj \

-       $(OBJS)\monolib_gsockmsw.obj \

        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \


@@ -2147,7 +2499,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_timer.obj \

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


@@ -2157,9 +2508,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \

+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \

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

+       $(OBJS)\monolib_artmsw.obj \

        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \


@@ -2173,7 +2529,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dragimag.obj \
        $(OBJS)\monolib_filedlg.obj \
        $(OBJS)\monolib_frame.obj \
        $(OBJS)\monolib_dragimag.obj \
        $(OBJS)\monolib_filedlg.obj \
        $(OBJS)\monolib_frame.obj \

-       $(OBJS)\monolib_gauge95.obj \
+       $(OBJS)\monolib_gauge.obj \
+       $(OBJS)\monolib_headerctrl.obj \

        $(OBJS)\monolib_iniconf.obj \
        $(OBJS)\monolib_listbox.obj \
        $(OBJS)\monolib_listctrl.obj \
        $(OBJS)\monolib_iniconf.obj \
        $(OBJS)\monolib_listbox.obj \
        $(OBJS)\monolib_listctrl.obj \


@@ -2183,28 +2540,30 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_metafile.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_metafile.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \

+       $(OBJS)\monolib_nativewin.obj \

        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
        $(OBJS)\monolib_scrolbar.obj \

-       $(OBJS)\monolib_slider95.obj \
+       $(OBJS)\monolib_slider.obj \

        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_spinctrl.obj \
        $(OBJS)\monolib_statbmp.obj \
        $(OBJS)\monolib_statbox.obj \
        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_spinctrl.obj \
        $(OBJS)\monolib_statbmp.obj \
        $(OBJS)\monolib_statbox.obj \

-       $(OBJS)\monolib_statbr95.obj \
+       $(OBJS)\monolib_statusbar.obj \

        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \

-       $(OBJS)\monolib_tabctrl.obj \
-       $(OBJS)\monolib_tbar95.obj \
+       $(OBJS)\monolib_toolbar.obj \

        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_textctrl.obj \

+       $(OBJS)\monolib_textentry.obj \

        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
        $(OBJS)\monolib_checklst.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
        $(OBJS)\monolib_fontdlg.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
        $(OBJS)\monolib_checklst.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
        $(OBJS)\monolib_fontdlg.obj \

+       $(OBJS)\monolib_accelcmn.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
        $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
        $(OBJS)\monolib_appcmn.obj \


@@ -2212,6 +2571,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_bookctrl.obj \

+       $(OBJS)\monolib_btncmn.obj \
+       $(OBJS)\monolib_cairo.obj \

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


@@ -2227,6 +2588,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dcbufcmn.obj \
        $(OBJS)\monolib_dcgraph.obj \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dcbufcmn.obj \
        $(OBJS)\monolib_dcgraph.obj \

+       $(OBJS)\monolib_dcsvg.obj \

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


@@ -2235,8 +2597,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dpycmn.obj \
        $(OBJS)\monolib_dseldlg.obj \
        $(OBJS)\monolib_effects.obj \
        $(OBJS)\monolib_dpycmn.obj \
        $(OBJS)\monolib_dseldlg.obj \
        $(OBJS)\monolib_effects.obj \

-       $(OBJS)\monolib_evtloopcmn.obj \

        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \

+       $(OBJS)\monolib_filectrlcmn.obj \

        $(OBJS)\monolib_filepickercmn.obj \
        $(OBJS)\monolib_fontpickercmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_filepickercmn.obj \
        $(OBJS)\monolib_fontpickercmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \


@@ -2251,6 +2613,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
        $(OBJS)\monolib_graphcmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
        $(OBJS)\monolib_graphcmn.obj \

+       $(OBJS)\monolib_headercolcmn.obj \
+       $(OBJS)\monolib_headerctrlcmn.obj \

        $(OBJS)\monolib_helpbase.obj \
        $(OBJS)\monolib_iconbndl.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_helpbase.obj \
        $(OBJS)\monolib_iconbndl.obj \
        $(OBJS)\monolib_imagall.obj \


@@ -2271,43 +2635,48 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \

+       $(OBJS)\monolib_mousemanager.obj \

        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \
        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \

+       $(OBJS)\monolib_persist.obj \

        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
        $(OBJS)\monolib_quantize.obj \
        $(OBJS)\monolib_radiocmn.obj \
        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
        $(OBJS)\monolib_quantize.obj \
        $(OBJS)\monolib_radiocmn.obj \

+       $(OBJS)\monolib_rearrangectrl.obj \

        $(OBJS)\monolib_rendcmn.obj \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \
        $(OBJS)\monolib_rendcmn.obj \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \

+       $(OBJS)\monolib_spinctrlcmn.obj \

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

+       $(OBJS)\monolib_stattextcmn.obj \

        $(OBJS)\monolib_stockitem.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_stockitem.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_textentrycmn.obj \

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

+       $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \

        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \

-       $(OBJS)\monolib_clrpickerg.obj \
-       $(OBJS)\monolib_collpaneg.obj \

        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \
        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \

-       $(OBJS)\monolib_filepickerg.obj \
-       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_filectrlg.obj \
+       $(OBJS)\monolib_headerctrlg.obj \

        $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \
        $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \


@@ -2320,6 +2689,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
        $(OBJS)\monolib_srchctlg.obj \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
        $(OBJS)\monolib_srchctlg.obj \

+       $(OBJS)\monolib_statbmpg.obj \
+       $(OBJS)\monolib_stattextg.obj \

        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_toolbkg.obj \
        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_toolbkg.obj \


@@ -2330,6 +2701,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_activex.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -2347,14 +2719,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dib.obj \
        $(OBJS)\monolib_display.obj \
        $(OBJS)\monolib_enhmeta.obj \
        $(OBJS)\monolib_dib.obj \
        $(OBJS)\monolib_display.obj \
        $(OBJS)\monolib_enhmeta.obj \

-       $(OBJS)\monolib_evtloop.obj \

        $(OBJS)\monolib_font.obj \
        $(OBJS)\monolib_fontenum.obj \
        $(OBJS)\monolib_fontutil.obj \
        $(OBJS)\monolib_gdiimage.obj \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_font.obj \
        $(OBJS)\monolib_fontenum.obj \
        $(OBJS)\monolib_fontutil.obj \
        $(OBJS)\monolib_gdiimage.obj \
        $(OBJS)\monolib_gdiobj.obj \

+       $(OBJS)\monolib_gdiplus.obj \

        $(OBJS)\monolib_graphics.obj \
        $(OBJS)\monolib_graphics.obj \

-       $(OBJS)\monolib_gsockmsw.obj \

        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \


@@ -2370,7 +2741,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_timer.obj \

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


@@ -2381,22 +2751,24 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_accel.obj \

+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \

        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
        $(OBJS)\monolib_filedlgg.obj \
        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
        $(OBJS)\monolib_filedlgg.obj \

+       $(OBJS)\monolib_filepickerg.obj \

        $(OBJS)\monolib_fontdlgg.obj \
        $(OBJS)\monolib_fontdlgg.obj \

+       $(OBJS)\monolib_fontpickerg.obj \

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

-       $(OBJS)\monolib_tabg.obj \

        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_checklst.obj \
        $(OBJS)\monolib_choice.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_checklst.obj \
        $(OBJS)\monolib_choice.obj \

-       $(OBJS)\monolib_colschem.obj \

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


@@ -2413,6 +2785,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_scrthumb.obj \
        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_scrthumb.obj \

+       $(OBJS)\monolib_settingsuniv.obj \

        $(OBJS)\monolib_slider.obj \
        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_statbmp.obj \
        $(OBJS)\monolib_slider.obj \
        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_statbmp.obj \


@@ -2431,6 +2804,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_metal.obj \
        $(OBJS)\monolib_mono.obj \
        $(OBJS)\monolib_win32.obj \
        $(OBJS)\monolib_metal.obj \
        $(OBJS)\monolib_mono.obj \
        $(OBJS)\monolib_win32.obj \

+       $(OBJS)\monolib_accelcmn.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
        $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
        $(OBJS)\monolib_appcmn.obj \


@@ -2438,6 +2812,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_bookctrl.obj \

+       $(OBJS)\monolib_btncmn.obj \
+       $(OBJS)\monolib_cairo.obj \

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


@@ -2453,6 +2829,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dcbufcmn.obj \
        $(OBJS)\monolib_dcgraph.obj \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dcbufcmn.obj \
        $(OBJS)\monolib_dcgraph.obj \

+       $(OBJS)\monolib_dcsvg.obj \

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


@@ -2461,8 +2838,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dpycmn.obj \
        $(OBJS)\monolib_dseldlg.obj \
        $(OBJS)\monolib_effects.obj \
        $(OBJS)\monolib_dpycmn.obj \
        $(OBJS)\monolib_dseldlg.obj \
        $(OBJS)\monolib_effects.obj \

-       $(OBJS)\monolib_evtloopcmn.obj \

        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \

+       $(OBJS)\monolib_filectrlcmn.obj \

        $(OBJS)\monolib_filepickercmn.obj \
        $(OBJS)\monolib_fontpickercmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_filepickercmn.obj \
        $(OBJS)\monolib_fontpickercmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \


@@ -2477,6 +2854,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
        $(OBJS)\monolib_graphcmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
        $(OBJS)\monolib_graphcmn.obj \

+       $(OBJS)\monolib_headercolcmn.obj \
+       $(OBJS)\monolib_headerctrlcmn.obj \

        $(OBJS)\monolib_helpbase.obj \
        $(OBJS)\monolib_iconbndl.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_helpbase.obj \
        $(OBJS)\monolib_iconbndl.obj \
        $(OBJS)\monolib_imagall.obj \


@@ -2497,43 +2876,48 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \

+       $(OBJS)\monolib_mousemanager.obj \

        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \
        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \

+       $(OBJS)\monolib_persist.obj \

        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
        $(OBJS)\monolib_quantize.obj \
        $(OBJS)\monolib_radiocmn.obj \
        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
        $(OBJS)\monolib_quantize.obj \
        $(OBJS)\monolib_radiocmn.obj \

+       $(OBJS)\monolib_rearrangectrl.obj \

        $(OBJS)\monolib_rendcmn.obj \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \
        $(OBJS)\monolib_rendcmn.obj \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \

+       $(OBJS)\monolib_spinctrlcmn.obj \

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

+       $(OBJS)\monolib_stattextcmn.obj \

        $(OBJS)\monolib_stockitem.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_stockitem.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_textentrycmn.obj \

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

+       $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \

        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
        $(OBJS)\monolib_choicdgg.obj \
        $(OBJS)\monolib_choicbkg.obj \

-       $(OBJS)\monolib_clrpickerg.obj \
-       $(OBJS)\monolib_collpaneg.obj \

        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \
        $(OBJS)\monolib_combog.obj \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \

-       $(OBJS)\monolib_filepickerg.obj \
-       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_filectrlg.obj \
+       $(OBJS)\monolib_headerctrlg.obj \

        $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \
        $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \


@@ -2546,6 +2930,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
        $(OBJS)\monolib_srchctlg.obj \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
        $(OBJS)\monolib_srchctlg.obj \

+       $(OBJS)\monolib_statbmpg.obj \
+       $(OBJS)\monolib_stattextg.obj \

        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_toolbkg.obj \
        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_toolbkg.obj \


@@ -2557,19 +2943,24 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \

+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \

        $(OBJS)\monolib_datavcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \

+       $(OBJS)\monolib_hyperlnkcmn.obj \

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

-       $(OBJS)\monolib_animateg.obj \

        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \

-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \

        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \

+       $(OBJS)\monolib_editlbox.obj \

        $(OBJS)\monolib_grid.obj \
        $(OBJS)\monolib_gridctrl.obj \
        $(OBJS)\monolib_grid.obj \
        $(OBJS)\monolib_gridctrl.obj \

+       $(OBJS)\monolib_grideditors.obj \

        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \

-       $(OBJS)\monolib_hyperlink.obj \
+       $(OBJS)\monolib_hyperlinkg.obj \

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

+       $(OBJS)\monolib_notifmsgg.obj \

        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
        $(OBJS)\monolib_sashwin.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
        $(OBJS)\monolib_sashwin.obj \


@@ -2578,27 +2969,37 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \

+       $(OBJS)\monolib_notifmsg.obj \

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

+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_bmpcbox.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datecontrols.obj \

        $(OBJS)\monolib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \
        $(OBJS)\monolib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \

+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \

        $(OBJS)\monolib_datavcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \

+       $(OBJS)\monolib_hyperlnkcmn.obj \

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

-       $(OBJS)\monolib_animateg.obj \

        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \

-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \

        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \

+       $(OBJS)\monolib_editlbox.obj \

        $(OBJS)\monolib_grid.obj \
        $(OBJS)\monolib_gridctrl.obj \
        $(OBJS)\monolib_grid.obj \
        $(OBJS)\monolib_gridctrl.obj \

+       $(OBJS)\monolib_grideditors.obj \

        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \

-       $(OBJS)\monolib_hyperlink.obj \
+       $(OBJS)\monolib_hyperlinkg.obj \

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

+       $(OBJS)\monolib_notifmsgg.obj \

        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
        $(OBJS)\monolib_sashwin.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
        $(OBJS)\monolib_sashwin.obj \


@@ -2607,62 +3008,77 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \

+       $(OBJS)\monolib_notifmsg.obj \

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

-       $(OBJS)\monolib_joystick.obj
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_animateg.obj

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_114 = D
+__RUNTIME_LIBS_127 = D

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

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

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

-__RUNTIME_LIBS_127 = D
+__RUNTIME_LIBS_140 = D

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

-__RUNTIME_LIBS_127 = $(__THREADSFLAG)
+__RUNTIME_LIBS_140 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxbase_namedll_DEP = $(__basedll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxbase_namelib_DEP = $(__baselib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __netdll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __netdll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_141 = D
+__RUNTIME_LIBS_154 = D

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

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

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

-__RUNTIME_LIBS_154 = D
+__RUNTIME_LIBS_167 = D

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

-__RUNTIME_LIBS_154 = $(__THREADSFLAG)
+__RUNTIME_LIBS_167 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxnet_namedll_DEP = $(__netdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxnet_namelib_DEP = $(__netlib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __coredll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __coredll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_168 = D
+__RUNTIME_LIBS_181 = D

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

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

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

+       $(OBJS)\coredll_activex.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -2680,14 +3096,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dib.obj \
        $(OBJS)\coredll_display.obj \
        $(OBJS)\coredll_enhmeta.obj \
        $(OBJS)\coredll_dib.obj \
        $(OBJS)\coredll_display.obj \
        $(OBJS)\coredll_enhmeta.obj \

-       $(OBJS)\coredll_evtloop.obj \

        $(OBJS)\coredll_font.obj \
        $(OBJS)\coredll_fontenum.obj \
        $(OBJS)\coredll_fontutil.obj \
        $(OBJS)\coredll_gdiimage.obj \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_font.obj \
        $(OBJS)\coredll_fontenum.obj \
        $(OBJS)\coredll_fontutil.obj \
        $(OBJS)\coredll_gdiimage.obj \
        $(OBJS)\coredll_gdiobj.obj \

+       $(OBJS)\coredll_gdiplus.obj \

        $(OBJS)\coredll_graphics.obj \
        $(OBJS)\coredll_graphics.obj \

-       $(OBJS)\coredll_gsockmsw.obj \

        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \


@@ -2703,7 +3118,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_timer.obj \

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


@@ -2713,9 +3127,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \

+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \

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

+       $(OBJS)\coredll_artmsw.obj \

        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \


@@ -2729,7 +3148,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dragimag.obj \
        $(OBJS)\coredll_filedlg.obj \
        $(OBJS)\coredll_frame.obj \
        $(OBJS)\coredll_dragimag.obj \
        $(OBJS)\coredll_filedlg.obj \
        $(OBJS)\coredll_frame.obj \

-       $(OBJS)\coredll_gauge95.obj \
+       $(OBJS)\coredll_gauge.obj \
+       $(OBJS)\coredll_headerctrl.obj \

        $(OBJS)\coredll_iniconf.obj \
        $(OBJS)\coredll_listbox.obj \
        $(OBJS)\coredll_listctrl.obj \
        $(OBJS)\coredll_iniconf.obj \
        $(OBJS)\coredll_listbox.obj \
        $(OBJS)\coredll_listctrl.obj \


@@ -2739,28 +3159,30 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_metafile.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_metafile.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \

+       $(OBJS)\coredll_nativewin.obj \

        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
        $(OBJS)\coredll_scrolbar.obj \

-       $(OBJS)\coredll_slider95.obj \
+       $(OBJS)\coredll_slider.obj \

        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_spinctrl.obj \
        $(OBJS)\coredll_statbmp.obj \
        $(OBJS)\coredll_statbox.obj \
        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_spinctrl.obj \
        $(OBJS)\coredll_statbmp.obj \
        $(OBJS)\coredll_statbox.obj \

-       $(OBJS)\coredll_statbr95.obj \
+       $(OBJS)\coredll_statusbar.obj \

        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \

-       $(OBJS)\coredll_tabctrl.obj \
-       $(OBJS)\coredll_tbar95.obj \
+       $(OBJS)\coredll_toolbar.obj \

        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_textctrl.obj \

+       $(OBJS)\coredll_textentry.obj \

        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
        $(OBJS)\coredll_checklst.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
        $(OBJS)\coredll_fontdlg.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
        $(OBJS)\coredll_checklst.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
        $(OBJS)\coredll_fontdlg.obj \

+       $(OBJS)\coredll_accelcmn.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
        $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
        $(OBJS)\coredll_appcmn.obj \


@@ -2768,6 +3190,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_bookctrl.obj \

+       $(OBJS)\coredll_btncmn.obj \
+       $(OBJS)\coredll_cairo.obj \

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


@@ -2783,6 +3207,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \

+       $(OBJS)\coredll_dcsvg.obj \

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


@@ -2791,8 +3216,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dpycmn.obj \
        $(OBJS)\coredll_dseldlg.obj \
        $(OBJS)\coredll_effects.obj \
        $(OBJS)\coredll_dpycmn.obj \
        $(OBJS)\coredll_dseldlg.obj \
        $(OBJS)\coredll_effects.obj \

-       $(OBJS)\coredll_evtloopcmn.obj \

        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \

+       $(OBJS)\coredll_filectrlcmn.obj \

        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \


@@ -2807,6 +3232,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
        $(OBJS)\coredll_graphcmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
        $(OBJS)\coredll_graphcmn.obj \

+       $(OBJS)\coredll_headercolcmn.obj \
+       $(OBJS)\coredll_headerctrlcmn.obj \

        $(OBJS)\coredll_helpbase.obj \
        $(OBJS)\coredll_iconbndl.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_helpbase.obj \
        $(OBJS)\coredll_iconbndl.obj \
        $(OBJS)\coredll_imagall.obj \


@@ -2827,43 +3254,48 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \

+       $(OBJS)\coredll_mousemanager.obj \

        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \

+       $(OBJS)\coredll_persist.obj \

        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
        $(OBJS)\coredll_radiocmn.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
        $(OBJS)\coredll_radiocmn.obj \

+       $(OBJS)\coredll_rearrangectrl.obj \

        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \

+       $(OBJS)\coredll_spinctrlcmn.obj \

        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \

+       $(OBJS)\coredll_stattextcmn.obj \

        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_textentrycmn.obj \

        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

+       $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \

        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
        $(OBJS)\coredll_choicdgg.obj \
        $(OBJS)\coredll_choicbkg.obj \
        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
        $(OBJS)\coredll_choicdgg.obj \
        $(OBJS)\coredll_choicbkg.obj \

-       $(OBJS)\coredll_clrpickerg.obj \
-       $(OBJS)\coredll_collpaneg.obj \

        $(OBJS)\coredll_combog.obj \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \
        $(OBJS)\coredll_combog.obj \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \

-       $(OBJS)\coredll_filepickerg.obj \
-       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_filectrlg.obj \
+       $(OBJS)\coredll_headerctrlg.obj \

        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \
        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \


@@ -2876,6 +3308,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
        $(OBJS)\coredll_srchctlg.obj \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
        $(OBJS)\coredll_srchctlg.obj \

+       $(OBJS)\coredll_statbmpg.obj \
+       $(OBJS)\coredll_stattextg.obj \

        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_toolbkg.obj \
        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_toolbkg.obj \


@@ -2886,6 +3320,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_activex.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -2903,14 +3338,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dib.obj \
        $(OBJS)\coredll_display.obj \
        $(OBJS)\coredll_enhmeta.obj \
        $(OBJS)\coredll_dib.obj \
        $(OBJS)\coredll_display.obj \
        $(OBJS)\coredll_enhmeta.obj \

-       $(OBJS)\coredll_evtloop.obj \

        $(OBJS)\coredll_font.obj \
        $(OBJS)\coredll_fontenum.obj \
        $(OBJS)\coredll_fontutil.obj \
        $(OBJS)\coredll_gdiimage.obj \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_font.obj \
        $(OBJS)\coredll_fontenum.obj \
        $(OBJS)\coredll_fontutil.obj \
        $(OBJS)\coredll_gdiimage.obj \
        $(OBJS)\coredll_gdiobj.obj \

+       $(OBJS)\coredll_gdiplus.obj \

        $(OBJS)\coredll_graphics.obj \
        $(OBJS)\coredll_graphics.obj \

-       $(OBJS)\coredll_gsockmsw.obj \

        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \


@@ -2926,7 +3360,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_timer.obj \

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


@@ -2937,22 +3370,24 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_accel.obj \

+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \

        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
        $(OBJS)\coredll_filedlgg.obj \
        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
        $(OBJS)\coredll_filedlgg.obj \

+       $(OBJS)\coredll_filepickerg.obj \

        $(OBJS)\coredll_fontdlgg.obj \
        $(OBJS)\coredll_fontdlgg.obj \

+       $(OBJS)\coredll_fontpickerg.obj \

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

-       $(OBJS)\coredll_tabg.obj \

        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_checklst.obj \
        $(OBJS)\coredll_choice.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_checklst.obj \
        $(OBJS)\coredll_choice.obj \

-       $(OBJS)\coredll_colschem.obj \

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


@@ -2969,6 +3404,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_scrthumb.obj \
        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_scrthumb.obj \

+       $(OBJS)\coredll_settingsuniv.obj \

        $(OBJS)\coredll_slider.obj \
        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_statbmp.obj \
        $(OBJS)\coredll_slider.obj \
        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_statbmp.obj \


@@ -2987,6 +3423,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_metal.obj \
        $(OBJS)\coredll_mono.obj \
        $(OBJS)\coredll_win32.obj \
        $(OBJS)\coredll_metal.obj \
        $(OBJS)\coredll_mono.obj \
        $(OBJS)\coredll_win32.obj \

+       $(OBJS)\coredll_accelcmn.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
        $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
        $(OBJS)\coredll_appcmn.obj \


@@ -2994,6 +3431,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_bookctrl.obj \

+       $(OBJS)\coredll_btncmn.obj \
+       $(OBJS)\coredll_cairo.obj \

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


@@ -3009,6 +3448,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \

+       $(OBJS)\coredll_dcsvg.obj \

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


@@ -3017,8 +3457,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dpycmn.obj \
        $(OBJS)\coredll_dseldlg.obj \
        $(OBJS)\coredll_effects.obj \
        $(OBJS)\coredll_dpycmn.obj \
        $(OBJS)\coredll_dseldlg.obj \
        $(OBJS)\coredll_effects.obj \

-       $(OBJS)\coredll_evtloopcmn.obj \

        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \

+       $(OBJS)\coredll_filectrlcmn.obj \

        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \


@@ -3033,6 +3473,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
        $(OBJS)\coredll_graphcmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
        $(OBJS)\coredll_graphcmn.obj \

+       $(OBJS)\coredll_headercolcmn.obj \
+       $(OBJS)\coredll_headerctrlcmn.obj \

        $(OBJS)\coredll_helpbase.obj \
        $(OBJS)\coredll_iconbndl.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_helpbase.obj \
        $(OBJS)\coredll_iconbndl.obj \
        $(OBJS)\coredll_imagall.obj \


@@ -3053,43 +3495,48 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \

+       $(OBJS)\coredll_mousemanager.obj \

        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \

+       $(OBJS)\coredll_persist.obj \

        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
        $(OBJS)\coredll_radiocmn.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
        $(OBJS)\coredll_radiocmn.obj \

+       $(OBJS)\coredll_rearrangectrl.obj \

        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \

+       $(OBJS)\coredll_spinctrlcmn.obj \

        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \

+       $(OBJS)\coredll_stattextcmn.obj \

        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_textentrycmn.obj \

        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

+       $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \

        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
        $(OBJS)\coredll_choicdgg.obj \
        $(OBJS)\coredll_choicbkg.obj \
        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
        $(OBJS)\coredll_choicdgg.obj \
        $(OBJS)\coredll_choicbkg.obj \

-       $(OBJS)\coredll_clrpickerg.obj \
-       $(OBJS)\coredll_collpaneg.obj \

        $(OBJS)\coredll_combog.obj \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \
        $(OBJS)\coredll_combog.obj \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \

-       $(OBJS)\coredll_filepickerg.obj \
-       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_filectrlg.obj \
+       $(OBJS)\coredll_headerctrlg.obj \

        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \
        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \


@@ -3102,6 +3549,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
        $(OBJS)\coredll_srchctlg.obj \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
        $(OBJS)\coredll_srchctlg.obj \

+       $(OBJS)\coredll_statbmpg.obj \
+       $(OBJS)\coredll_stattextg.obj \

        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_toolbkg.obj \
        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_toolbkg.obj \


@@ -3115,13 +3564,14 @@ __corelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_181 = D
+__RUNTIME_LIBS_194 = D

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

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

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

+       $(OBJS)\corelib_activex.obj \

        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \


@@ -3139,14 +3589,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_display.obj \
        $(OBJS)\corelib_enhmeta.obj \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_display.obj \
        $(OBJS)\corelib_enhmeta.obj \

-       $(OBJS)\corelib_evtloop.obj \

        $(OBJS)\corelib_font.obj \
        $(OBJS)\corelib_fontenum.obj \
        $(OBJS)\corelib_fontutil.obj \
        $(OBJS)\corelib_gdiimage.obj \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_font.obj \
        $(OBJS)\corelib_fontenum.obj \
        $(OBJS)\corelib_fontutil.obj \
        $(OBJS)\corelib_gdiimage.obj \
        $(OBJS)\corelib_gdiobj.obj \

+       $(OBJS)\corelib_gdiplus.obj \

        $(OBJS)\corelib_graphics.obj \
        $(OBJS)\corelib_graphics.obj \

-       $(OBJS)\corelib_gsockmsw.obj \

        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \


@@ -3162,7 +3611,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_timer.obj \

        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \


@@ -3172,9 +3620,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \

+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \

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

+       $(OBJS)\corelib_artmsw.obj \

        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \


@@ -3188,7 +3641,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dragimag.obj \
        $(OBJS)\corelib_filedlg.obj \
        $(OBJS)\corelib_frame.obj \
        $(OBJS)\corelib_dragimag.obj \
        $(OBJS)\corelib_filedlg.obj \
        $(OBJS)\corelib_frame.obj \

-       $(OBJS)\corelib_gauge95.obj \
+       $(OBJS)\corelib_gauge.obj \
+       $(OBJS)\corelib_headerctrl.obj \

        $(OBJS)\corelib_iniconf.obj \
        $(OBJS)\corelib_listbox.obj \
        $(OBJS)\corelib_listctrl.obj \
        $(OBJS)\corelib_iniconf.obj \
        $(OBJS)\corelib_listbox.obj \
        $(OBJS)\corelib_listctrl.obj \


@@ -3198,28 +3652,30 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_metafile.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_metafile.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \

+       $(OBJS)\corelib_nativewin.obj \

        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
        $(OBJS)\corelib_scrolbar.obj \

-       $(OBJS)\corelib_slider95.obj \
+       $(OBJS)\corelib_slider.obj \

        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_spinctrl.obj \
        $(OBJS)\corelib_statbmp.obj \
        $(OBJS)\corelib_statbox.obj \
        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_spinctrl.obj \
        $(OBJS)\corelib_statbmp.obj \
        $(OBJS)\corelib_statbox.obj \

-       $(OBJS)\corelib_statbr95.obj \
+       $(OBJS)\corelib_statusbar.obj \

        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \

-       $(OBJS)\corelib_tabctrl.obj \
-       $(OBJS)\corelib_tbar95.obj \
+       $(OBJS)\corelib_toolbar.obj \

        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_textctrl.obj \

+       $(OBJS)\corelib_textentry.obj \

        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
        $(OBJS)\corelib_checklst.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
        $(OBJS)\corelib_fontdlg.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
        $(OBJS)\corelib_checklst.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
        $(OBJS)\corelib_fontdlg.obj \

+       $(OBJS)\corelib_accelcmn.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
        $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
        $(OBJS)\corelib_appcmn.obj \


@@ -3227,6 +3683,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_bookctrl.obj \

+       $(OBJS)\corelib_btncmn.obj \
+       $(OBJS)\corelib_cairo.obj \

        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \


@@ -3242,6 +3700,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \

+       $(OBJS)\corelib_dcsvg.obj \

        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \


@@ -3250,8 +3709,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dpycmn.obj \
        $(OBJS)\corelib_dseldlg.obj \
        $(OBJS)\corelib_effects.obj \
        $(OBJS)\corelib_dpycmn.obj \
        $(OBJS)\corelib_dseldlg.obj \
        $(OBJS)\corelib_effects.obj \

-       $(OBJS)\corelib_evtloopcmn.obj \

        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \

+       $(OBJS)\corelib_filectrlcmn.obj \

        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \


@@ -3266,6 +3725,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
        $(OBJS)\corelib_graphcmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
        $(OBJS)\corelib_graphcmn.obj \

+       $(OBJS)\corelib_headercolcmn.obj \
+       $(OBJS)\corelib_headerctrlcmn.obj \

        $(OBJS)\corelib_helpbase.obj \
        $(OBJS)\corelib_iconbndl.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_helpbase.obj \
        $(OBJS)\corelib_iconbndl.obj \
        $(OBJS)\corelib_imagall.obj \


@@ -3286,43 +3747,48 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \

+       $(OBJS)\corelib_mousemanager.obj \

        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \

+       $(OBJS)\corelib_persist.obj \

        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
        $(OBJS)\corelib_radiocmn.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
        $(OBJS)\corelib_radiocmn.obj \

+       $(OBJS)\corelib_rearrangectrl.obj \

        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \

+       $(OBJS)\corelib_spinctrlcmn.obj \

        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \

+       $(OBJS)\corelib_stattextcmn.obj \

        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_textentrycmn.obj \

        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

+       $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \

        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
        $(OBJS)\corelib_choicdgg.obj \
        $(OBJS)\corelib_choicbkg.obj \
        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
        $(OBJS)\corelib_choicdgg.obj \
        $(OBJS)\corelib_choicbkg.obj \

-       $(OBJS)\corelib_clrpickerg.obj \
-       $(OBJS)\corelib_collpaneg.obj \

        $(OBJS)\corelib_combog.obj \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \
        $(OBJS)\corelib_combog.obj \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \

-       $(OBJS)\corelib_filepickerg.obj \
-       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_filectrlg.obj \
+       $(OBJS)\corelib_headerctrlg.obj \

        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \
        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \


@@ -3335,6 +3801,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
        $(OBJS)\corelib_srchctlg.obj \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
        $(OBJS)\corelib_srchctlg.obj \

+       $(OBJS)\corelib_statbmpg.obj \
+       $(OBJS)\corelib_stattextg.obj \

        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_toolbkg.obj \
        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_toolbkg.obj \


@@ -3345,6 +3813,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_activex.obj \

        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \


@@ -3362,14 +3831,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_display.obj \
        $(OBJS)\corelib_enhmeta.obj \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_display.obj \
        $(OBJS)\corelib_enhmeta.obj \

-       $(OBJS)\corelib_evtloop.obj \

        $(OBJS)\corelib_font.obj \
        $(OBJS)\corelib_fontenum.obj \
        $(OBJS)\corelib_fontutil.obj \
        $(OBJS)\corelib_gdiimage.obj \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_font.obj \
        $(OBJS)\corelib_fontenum.obj \
        $(OBJS)\corelib_fontutil.obj \
        $(OBJS)\corelib_gdiimage.obj \
        $(OBJS)\corelib_gdiobj.obj \

+       $(OBJS)\corelib_gdiplus.obj \

        $(OBJS)\corelib_graphics.obj \
        $(OBJS)\corelib_graphics.obj \

-       $(OBJS)\corelib_gsockmsw.obj \

        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \


@@ -3385,7 +3853,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_timer.obj \

        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \


@@ -3396,22 +3863,24 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_accel.obj \

+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \

        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
        $(OBJS)\corelib_filedlgg.obj \
        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
        $(OBJS)\corelib_filedlgg.obj \

+       $(OBJS)\corelib_filepickerg.obj \

        $(OBJS)\corelib_fontdlgg.obj \
        $(OBJS)\corelib_fontdlgg.obj \

+       $(OBJS)\corelib_fontpickerg.obj \

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

-       $(OBJS)\corelib_tabg.obj \

        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_checklst.obj \
        $(OBJS)\corelib_choice.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_checklst.obj \
        $(OBJS)\corelib_choice.obj \

-       $(OBJS)\corelib_colschem.obj \

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


@@ -3428,6 +3897,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_scrthumb.obj \
        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_scrthumb.obj \

+       $(OBJS)\corelib_settingsuniv.obj \

        $(OBJS)\corelib_slider.obj \
        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_statbmp.obj \
        $(OBJS)\corelib_slider.obj \
        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_statbmp.obj \


@@ -3446,6 +3916,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_metal.obj \
        $(OBJS)\corelib_mono.obj \
        $(OBJS)\corelib_win32.obj \
        $(OBJS)\corelib_metal.obj \
        $(OBJS)\corelib_mono.obj \
        $(OBJS)\corelib_win32.obj \

+       $(OBJS)\corelib_accelcmn.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
        $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
        $(OBJS)\corelib_appcmn.obj \


@@ -3453,6 +3924,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_bookctrl.obj \

+       $(OBJS)\corelib_btncmn.obj \
+       $(OBJS)\corelib_cairo.obj \

        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \


@@ -3468,6 +3941,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \

+       $(OBJS)\corelib_dcsvg.obj \

        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \


@@ -3476,8 +3950,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dpycmn.obj \
        $(OBJS)\corelib_dseldlg.obj \
        $(OBJS)\corelib_effects.obj \
        $(OBJS)\corelib_dpycmn.obj \
        $(OBJS)\corelib_dseldlg.obj \
        $(OBJS)\corelib_effects.obj \

-       $(OBJS)\corelib_evtloopcmn.obj \

        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \

+       $(OBJS)\corelib_filectrlcmn.obj \

        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \


@@ -3492,6 +3966,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
        $(OBJS)\corelib_graphcmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
        $(OBJS)\corelib_graphcmn.obj \

+       $(OBJS)\corelib_headercolcmn.obj \
+       $(OBJS)\corelib_headerctrlcmn.obj \

        $(OBJS)\corelib_helpbase.obj \
        $(OBJS)\corelib_iconbndl.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_helpbase.obj \
        $(OBJS)\corelib_iconbndl.obj \
        $(OBJS)\corelib_imagall.obj \


@@ -3512,43 +3988,48 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \

+       $(OBJS)\corelib_mousemanager.obj \

        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \

+       $(OBJS)\corelib_persist.obj \

        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
        $(OBJS)\corelib_radiocmn.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
        $(OBJS)\corelib_radiocmn.obj \

+       $(OBJS)\corelib_rearrangectrl.obj \

        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \

+       $(OBJS)\corelib_spinctrlcmn.obj \

        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \

+       $(OBJS)\corelib_stattextcmn.obj \

        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_textentrycmn.obj \

        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

+       $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \

        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
        $(OBJS)\corelib_choicdgg.obj \
        $(OBJS)\corelib_choicbkg.obj \
        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
        $(OBJS)\corelib_choicdgg.obj \
        $(OBJS)\corelib_choicbkg.obj \

-       $(OBJS)\corelib_clrpickerg.obj \
-       $(OBJS)\corelib_collpaneg.obj \

        $(OBJS)\corelib_combog.obj \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \
        $(OBJS)\corelib_combog.obj \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \

-       $(OBJS)\corelib_filepickerg.obj \
-       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_filectrlg.obj \
+       $(OBJS)\corelib_headerctrlg.obj \

        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \
        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \


@@ -3561,6 +4042,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
        $(OBJS)\corelib_srchctlg.obj \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
        $(OBJS)\corelib_srchctlg.obj \

+       $(OBJS)\corelib_statbmpg.obj \
+       $(OBJS)\corelib_stattextg.obj \

        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_toolbkg.obj \
        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_toolbkg.obj \


@@ -3569,32 +4052,43 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_vlbox.obj \
        $(OBJS)\corelib_vscroll.obj
 !endif
        $(OBJS)\corelib_vlbox.obj \
        $(OBJS)\corelib_vscroll.obj
 !endif

+!if "$(SHARED)" == "1"
+____wxcore_namedll_DEP = $(__coredll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxcore_namelib_DEP = $(__corelib___depname)
+!endif

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __advdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __advdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_195 = D
+__RUNTIME_LIBS_208 = D

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

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

 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \

+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \

        $(OBJS)\advdll_datavcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \

+       $(OBJS)\advdll_hyperlnkcmn.obj \

        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_aboutdlgg.obj \

-       $(OBJS)\advdll_animateg.obj \

        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \

-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \

        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \

+       $(OBJS)\advdll_editlbox.obj \

        $(OBJS)\advdll_grid.obj \
        $(OBJS)\advdll_gridctrl.obj \
        $(OBJS)\advdll_grid.obj \
        $(OBJS)\advdll_gridctrl.obj \

+       $(OBJS)\advdll_grideditors.obj \

        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \

-       $(OBJS)\advdll_hyperlink.obj \
+       $(OBJS)\advdll_hyperlinkg.obj \

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

+       $(OBJS)\advdll_notifmsgg.obj \

        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
        $(OBJS)\advdll_sashwin.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
        $(OBJS)\advdll_sashwin.obj \


@@ -3603,27 +4097,37 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \

+       $(OBJS)\advdll_notifmsg.obj \

        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_joystick.obj \
        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_joystick.obj \

+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_bmpcbox.obj \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datecontrols.obj \

        $(OBJS)\advdll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \
        $(OBJS)\advdll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \

+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \

        $(OBJS)\advdll_datavcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \

+       $(OBJS)\advdll_hyperlnkcmn.obj \

        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_aboutdlgg.obj \

-       $(OBJS)\advdll_animateg.obj \

        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \

-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \

        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \

+       $(OBJS)\advdll_editlbox.obj \

        $(OBJS)\advdll_grid.obj \
        $(OBJS)\advdll_gridctrl.obj \
        $(OBJS)\advdll_grid.obj \
        $(OBJS)\advdll_gridctrl.obj \

+       $(OBJS)\advdll_grideditors.obj \

        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \

-       $(OBJS)\advdll_hyperlink.obj \
+       $(OBJS)\advdll_hyperlinkg.obj \

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

+       $(OBJS)\advdll_notifmsgg.obj \

        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
        $(OBJS)\advdll_sashwin.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
        $(OBJS)\advdll_sashwin.obj \


@@ -3632,36 +4136,43 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \

+       $(OBJS)\advdll_notifmsg.obj \

        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \

-       $(OBJS)\advdll_joystick.obj
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_animateg.obj

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

-__RUNTIME_LIBS_208 = D
+__RUNTIME_LIBS_221 = D

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

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

 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \

+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \

        $(OBJS)\advlib_datavcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \

+       $(OBJS)\advlib_hyperlnkcmn.obj \

        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_aboutdlgg.obj \

-       $(OBJS)\advlib_animateg.obj \

        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \

-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \

        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \

+       $(OBJS)\advlib_editlbox.obj \

        $(OBJS)\advlib_grid.obj \
        $(OBJS)\advlib_gridctrl.obj \
        $(OBJS)\advlib_grid.obj \
        $(OBJS)\advlib_gridctrl.obj \

+       $(OBJS)\advlib_grideditors.obj \

        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \

-       $(OBJS)\advlib_hyperlink.obj \
+       $(OBJS)\advlib_hyperlinkg.obj \

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

+       $(OBJS)\advlib_notifmsgg.obj \

        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
        $(OBJS)\advlib_sashwin.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
        $(OBJS)\advlib_sashwin.obj \


@@ -3670,27 +4181,37 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \

+       $(OBJS)\advlib_notifmsg.obj \

        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_joystick.obj \
        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_joystick.obj \

+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_bmpcbox.obj \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datecontrols.obj \

        $(OBJS)\advlib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \
        $(OBJS)\advlib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \

+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \

        $(OBJS)\advlib_datavcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \

+       $(OBJS)\advlib_hyperlnkcmn.obj \

        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_aboutdlgg.obj \

-       $(OBJS)\advlib_animateg.obj \

        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \

-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \

        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \

+       $(OBJS)\advlib_editlbox.obj \

        $(OBJS)\advlib_grid.obj \
        $(OBJS)\advlib_gridctrl.obj \
        $(OBJS)\advlib_grid.obj \
        $(OBJS)\advlib_gridctrl.obj \

+       $(OBJS)\advlib_grideditors.obj \

        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \

-       $(OBJS)\advlib_hyperlink.obj \
+       $(OBJS)\advlib_hyperlinkg.obj \

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

+       $(OBJS)\advlib_notifmsgg.obj \

        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
        $(OBJS)\advlib_sashwin.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
        $(OBJS)\advlib_sashwin.obj \


@@ -3699,199 +4220,287 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \

+       $(OBJS)\advlib_notifmsg.obj \

        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \

-       $(OBJS)\advlib_joystick.obj
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(SHARED)" == "1"
+____wxadv_namedll_DEP = $(__advdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxadv_namelib_DEP = $(__advlib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 __mediadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 __mediadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_222 = D
+__RUNTIME_LIBS_235 = D

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

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

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

-__RUNTIME_LIBS_235 = D
+__RUNTIME_LIBS_248 = D

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

-__RUNTIME_LIBS_235 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-__odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_249 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_249 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-__odbclib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_262 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_262 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_276 = D
+__RUNTIME_LIBS_248 = $(__THREADSFLAG)

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_276 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgridlib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_289 = D
+!if "$(SHARED)" == "1"
+____wxmedia_namedll_DEP = $(__mediadll___depname)

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_289 = $(__THREADSFLAG)
+!if "$(SHARED)" == "0"
+____wxmedia_namelib_DEP = $(__medialib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_303 = D
+__RUNTIME_LIBS_262 = D

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

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

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

-__RUNTIME_LIBS_316 = D
+__RUNTIME_LIBS_275 = D

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

-__RUNTIME_LIBS_316 = $(__THREADSFLAG)
+__RUNTIME_LIBS_275 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxhtml_namedll_DEP = $(__htmldll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxhtml_namelib_DEP = $(__htmllib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_330 = D
+__RUNTIME_LIBS_289 = D

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

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

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

-__RUNTIME_LIBS_343 = D
+__RUNTIME_LIBS_302 = D

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

-__RUNTIME_LIBS_343 = $(__THREADSFLAG)
+__RUNTIME_LIBS_302 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxqa_namedll_DEP = $(__qadll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxqa_namelib_DEP = $(__qalib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_357 = D
+__RUNTIME_LIBS_316 = D

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

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

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

-__RUNTIME_LIBS_370 = D
+__RUNTIME_LIBS_329 = D

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

-__RUNTIME_LIBS_370 = $(__THREADSFLAG)
+__RUNTIME_LIBS_329 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxxml_namedll_DEP = $(__xmldll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxxml_namelib_DEP = $(__xmllib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_384 = D
+__RUNTIME_LIBS_343 = D

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

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

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

-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_356 = D

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

-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_356 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxxrc_namedll_DEP = $(__xrcdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxxrc_namelib_DEP = $(__xrclib___depname)

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_411 = D
+__RUNTIME_LIBS_370 = D

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

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

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

+__RUNTIME_LIBS_383 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_383 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxaui_namedll_DEP = $(__auidll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxaui_namelib_DEP = $(__auilib___depname)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+__ribbondll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_397 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+__ribbonlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_410 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxribbon_namedll_DEP = $(__ribbondll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxribbon_namelib_DEP = $(__ribbonlib___depname)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
+__propgriddll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"

 __RUNTIME_LIBS_424 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_424 = $(__THREADSFLAG)
 !endif
 __RUNTIME_LIBS_424 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_424 = $(__THREADSFLAG)
 !endif

+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
+__propgridlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_437 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_437 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
+!endif

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_438 = D
+__RUNTIME_LIBS_451 = D

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

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

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

-__RUNTIME_LIBS_451 = D
+__RUNTIME_LIBS_464 = D

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

-__RUNTIME_LIBS_451 = $(__THREADSFLAG)
+__RUNTIME_LIBS_464 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxrichtext_namedll_DEP = $(__richtextdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxrichtext_namelib_DEP = $(__richtextlib___depname)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
+__stcdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_478 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
+__stclib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_491 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_491 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxstc_namedll_DEP = $(__stcdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxstc_namelib_DEP = $(__stclib___depname)

 !endif
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_465 = D
+__RUNTIME_LIBS_505 = D

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

-__RUNTIME_LIBS_465 = $(__THREADSFLAG)
+__RUNTIME_LIBS_505 = $(__THREADSFLAG)

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


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

-__RUNTIME_LIBS_478 = D
+__RUNTIME_LIBS_518 = D

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

-__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+__RUNTIME_LIBS_518 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxgl_namedll_DEP = $(__gldll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxgl_namelib_DEP = $(__gllib___depname)
+!endif
+!if "$(USE_STC)" == "1"
+__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib

 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll_library_link_DEP = $(__htmldll___depname)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll_library_link_DEP = $(__htmldll___depname)


@@ -3947,37 +4565,37 @@ ____DEBUGRUNTIME_4 =
 ____DEBUGRUNTIME_4 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_4 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"

-__NO_VC_CRTDBG_p_63 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__

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

-__NO_VC_CRTDBG_p_63 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__

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

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

 !endif
 !endif

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

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

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

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

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

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

-__THREAD_DEFINE_p_57 = /d wxNO_THREADS
+__THREAD_DEFINE_p_61 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_62 = /d wxUSE_UNICODE=0

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

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

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

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

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

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

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


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

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

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


@@ -4078,6 +4693,9 @@ __RTTI_DEFINE_p = /DwxNO_RTTI
 !if "$(USE_THREADS)" == "0"
 __THREAD_DEFINE_p = /DwxNO_THREADS
 !endif
 !if "$(USE_THREADS)" == "0"
 __THREAD_DEFINE_p = /DwxNO_THREADS
 !endif

+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif

 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif


@@ -4101,7 +4719,7 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

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

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


@@ -4113,6 +4731,7 @@ clean:
        -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib

+       -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib

        -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
        -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
        -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
        -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
        -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
        -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


@@ -4143,16 +4762,6 @@ clean:
        -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
        -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
        -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
        -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
        -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
        -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

-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib

        -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
        -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
        -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
        -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
        -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
        -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


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

+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+       -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

        -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
        -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
        -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
        -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
        -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
        -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
        -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
        -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
        -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
        -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

+       -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
+       -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
+       -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
+       -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
+       -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

        -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
        -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
        -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
        -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
        -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
        -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


@@ -4190,7 +4814,7 @@ clean:
        -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
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        -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
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) clean

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 


@@ -4236,10 +4860,18 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
        $(WXEXPAT_OBJECTS)
 <<
 
        $(WXEXPAT_OBJECTS)
 <<
 

+!if "$(USE_STC)" == "1"
+$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(WXSCINTILLA_OBJECTS)
+<<
+!endif
+

 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib     /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4252,9 +4884,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"

-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4266,10 +4898,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0"
+wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"

-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4281,10 +4917,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0"
+wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4296,10 +4936,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1"
+wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4311,10 +4955,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1"
+wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4326,40 +4974,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(ODBCDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
-       if exist $@ del $@
-       link /LIB /NOLOGO /OUT:$@ @<<
-       $(ODBCLIB_OBJECTS)
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.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)_dbgrid.lib
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
-       if exist $@ del $@
-       link /LIB /NOLOGO /OUT:$@ @<<
-       $(DBGRIDLIB_OBJECTS)
-<<
+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
+wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)

 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4371,10 +4993,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_HTML)" == "1"
+wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4386,10 +5012,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_QA)" == "1"
+wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"

-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4401,10 +5031,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0"
+wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4416,10 +5050,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_XRC)" == "1"
+wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(AUIDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(AUIDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4431,10 +5069,52 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_AUI)" == "1"
+wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RIBBONDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib: $(OBJS)\ribbonlib_dummy.obj  $(RIBBONLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(RIBBONLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_RIBBON)" == "1"
+wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(PROPGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib: $(OBJS)\propgridlib_dummy.obj  $(PROPGRIDLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(PROPGRIDLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_PROPGRID)" == "1"
+wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
+!endif
+

 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(RICHTEXTDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RICHTEXTDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4446,10 +5126,33 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(MONOLITHIC)" == "0" && "$(USE_RICHTEXT)" == "1"
+wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(STCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib: $(OBJS)\stclib_dummy.obj  $(STCLIB_OBJECTS) $(__wxscintilla)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(STCLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1"
+wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
+!endif
+

 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -4461,10 +5164,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
 <<
 !endif
 

+!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
+wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
+!endif
+

 sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)


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

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

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


@@ -4508,7 +5215,6 @@ build_cfg_file: $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)

-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)

        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)


@@ -4521,8432 +5227,9692 @@ build_cfg_file: $(SETUPHDIR)
        @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
 
 $(OBJS)\wxregex_regcomp.obj: ..\..\src\regex\regcomp.c
        @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
 
 $(OBJS)\wxregex_regcomp.obj: ..\..\src\regex\regcomp.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regcomp.c

 
 $(OBJS)\wxregex_regexec.obj: ..\..\src\regex\regexec.c
 
 $(OBJS)\wxregex_regexec.obj: ..\..\src\regex\regexec.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regexec.c

 
 $(OBJS)\wxregex_regerror.obj: ..\..\src\regex\regerror.c
 
 $(OBJS)\wxregex_regerror.obj: ..\..\src\regex\regerror.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regerror.c

 
 $(OBJS)\wxregex_regfree.obj: ..\..\src\regex\regfree.c
 
 $(OBJS)\wxregex_regfree.obj: ..\..\src\regex\regfree.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regfree.c

 
 $(OBJS)\wxzlib_adler32.obj: ..\..\src\zlib\adler32.c
 
 $(OBJS)\wxzlib_adler32.obj: ..\..\src\zlib\adler32.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\adler32.c

 
 $(OBJS)\wxzlib_compress.obj: ..\..\src\zlib\compress.c
 
 $(OBJS)\wxzlib_compress.obj: ..\..\src\zlib\compress.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\compress.c

 
 $(OBJS)\wxzlib_crc32.obj: ..\..\src\zlib\crc32.c
 
 $(OBJS)\wxzlib_crc32.obj: ..\..\src\zlib\crc32.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\crc32.c

 
 $(OBJS)\wxzlib_gzio.obj: ..\..\src\zlib\gzio.c
 
 $(OBJS)\wxzlib_gzio.obj: ..\..\src\zlib\gzio.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzio.c

 
 $(OBJS)\wxzlib_uncompr.obj: ..\..\src\zlib\uncompr.c
 
 $(OBJS)\wxzlib_uncompr.obj: ..\..\src\zlib\uncompr.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\uncompr.c

 
 $(OBJS)\wxzlib_deflate.obj: ..\..\src\zlib\deflate.c
 
 $(OBJS)\wxzlib_deflate.obj: ..\..\src\zlib\deflate.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\deflate.c

 
 $(OBJS)\wxzlib_trees.obj: ..\..\src\zlib\trees.c
 
 $(OBJS)\wxzlib_trees.obj: ..\..\src\zlib\trees.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\trees.c

 
 $(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c
 
 $(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\zutil.c

 
 $(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c
 
 $(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inflate.c

 
 $(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c
 
 $(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\infback.c

 
 $(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c
 
 $(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inftrees.c

 
 $(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c
 
 $(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inffast.c

 
 $(OBJS)\wxpng_png.obj: ..\..\src\png\png.c
 
 $(OBJS)\wxpng_png.obj: ..\..\src\png\png.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\png.c

 
 $(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c
 
 $(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngerror.c

 
 $(OBJS)\wxpng_pnggccrd.obj: ..\..\src\png\pnggccrd.c
 
 $(OBJS)\wxpng_pnggccrd.obj: ..\..\src\png\pnggccrd.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pnggccrd.c

 
 $(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c
 
 $(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngget.c

 
 $(OBJS)\wxpng_pngmem.obj: ..\..\src\png\pngmem.c
 
 $(OBJS)\wxpng_pngmem.obj: ..\..\src\png\pngmem.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngmem.c

 
 $(OBJS)\wxpng_pngpread.obj: ..\..\src\png\pngpread.c
 
 $(OBJS)\wxpng_pngpread.obj: ..\..\src\png\pngpread.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngpread.c

 
 $(OBJS)\wxpng_pngread.obj: ..\..\src\png\pngread.c
 
 $(OBJS)\wxpng_pngread.obj: ..\..\src\png\pngread.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngread.c

 
 $(OBJS)\wxpng_pngrio.obj: ..\..\src\png\pngrio.c
 
 $(OBJS)\wxpng_pngrio.obj: ..\..\src\png\pngrio.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrio.c

 
 $(OBJS)\wxpng_pngrtran.obj: ..\..\src\png\pngrtran.c
 
 $(OBJS)\wxpng_pngrtran.obj: ..\..\src\png\pngrtran.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrtran.c

 
 $(OBJS)\wxpng_pngrutil.obj: ..\..\src\png\pngrutil.c
 
 $(OBJS)\wxpng_pngrutil.obj: ..\..\src\png\pngrutil.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrutil.c

 
 $(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c
 
 $(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngset.c

 
 $(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c
 
 $(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngtrans.c

 
 $(OBJS)\wxpng_pngvcrd.obj: ..\..\src\png\pngvcrd.c
 
 $(OBJS)\wxpng_pngvcrd.obj: ..\..\src\png\pngvcrd.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngvcrd.c

 
 $(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c
 
 $(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwio.c

 
 $(OBJS)\wxpng_pngwrite.obj: ..\..\src\png\pngwrite.c
 
 $(OBJS)\wxpng_pngwrite.obj: ..\..\src\png\pngwrite.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwrite.c

 
 $(OBJS)\wxpng_pngwtran.obj: ..\..\src\png\pngwtran.c
 
 $(OBJS)\wxpng_pngwtran.obj: ..\..\src\png\pngwtran.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwtran.c

 
 $(OBJS)\wxpng_pngwutil.obj: ..\..\src\png\pngwutil.c
 
 $(OBJS)\wxpng_pngwutil.obj: ..\..\src\png\pngwutil.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwutil.c

 
 $(OBJS)\wxjpeg_jcomapi.obj: ..\..\src\jpeg\jcomapi.c
 
 $(OBJS)\wxjpeg_jcomapi.obj: ..\..\src\jpeg\jcomapi.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcomapi.c

 
 $(OBJS)\wxjpeg_jutils.obj: ..\..\src\jpeg\jutils.c
 
 $(OBJS)\wxjpeg_jutils.obj: ..\..\src\jpeg\jutils.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jutils.c

 
 $(OBJS)\wxjpeg_jerror.obj: ..\..\src\jpeg\jerror.c
 
 $(OBJS)\wxjpeg_jerror.obj: ..\..\src\jpeg\jerror.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jerror.c

 
 $(OBJS)\wxjpeg_jmemmgr.obj: ..\..\src\jpeg\jmemmgr.c
 
 $(OBJS)\wxjpeg_jmemmgr.obj: ..\..\src\jpeg\jmemmgr.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemmgr.c

 
 $(OBJS)\wxjpeg_jmemnobs.obj: ..\..\src\jpeg\jmemnobs.c
 
 $(OBJS)\wxjpeg_jmemnobs.obj: ..\..\src\jpeg\jmemnobs.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemnobs.c

 
 $(OBJS)\wxjpeg_jcapimin.obj: ..\..\src\jpeg\jcapimin.c
 
 $(OBJS)\wxjpeg_jcapimin.obj: ..\..\src\jpeg\jcapimin.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapimin.c

 
 $(OBJS)\wxjpeg_jcapistd.obj: ..\..\src\jpeg\jcapistd.c
 
 $(OBJS)\wxjpeg_jcapistd.obj: ..\..\src\jpeg\jcapistd.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapistd.c

 
 $(OBJS)\wxjpeg_jctrans.obj: ..\..\src\jpeg\jctrans.c
 
 $(OBJS)\wxjpeg_jctrans.obj: ..\..\src\jpeg\jctrans.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jctrans.c

 
 $(OBJS)\wxjpeg_jcparam.obj: ..\..\src\jpeg\jcparam.c
 
 $(OBJS)\wxjpeg_jcparam.obj: ..\..\src\jpeg\jcparam.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcparam.c

 
 $(OBJS)\wxjpeg_jdatadst.obj: ..\..\src\jpeg\jdatadst.c
 
 $(OBJS)\wxjpeg_jdatadst.obj: ..\..\src\jpeg\jdatadst.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatadst.c

 
 $(OBJS)\wxjpeg_jcinit.obj: ..\..\src\jpeg\jcinit.c
 
 $(OBJS)\wxjpeg_jcinit.obj: ..\..\src\jpeg\jcinit.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcinit.c

 
 $(OBJS)\wxjpeg_jcmaster.obj: ..\..\src\jpeg\jcmaster.c
 
 $(OBJS)\wxjpeg_jcmaster.obj: ..\..\src\jpeg\jcmaster.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmaster.c

 
 $(OBJS)\wxjpeg_jcmarker.obj: ..\..\src\jpeg\jcmarker.c
 
 $(OBJS)\wxjpeg_jcmarker.obj: ..\..\src\jpeg\jcmarker.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmarker.c

 
 $(OBJS)\wxjpeg_jcmainct.obj: ..\..\src\jpeg\jcmainct.c
 
 $(OBJS)\wxjpeg_jcmainct.obj: ..\..\src\jpeg\jcmainct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmainct.c

 
 $(OBJS)\wxjpeg_jcprepct.obj: ..\..\src\jpeg\jcprepct.c
 
 $(OBJS)\wxjpeg_jcprepct.obj: ..\..\src\jpeg\jcprepct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcprepct.c

 
 $(OBJS)\wxjpeg_jccoefct.obj: ..\..\src\jpeg\jccoefct.c
 
 $(OBJS)\wxjpeg_jccoefct.obj: ..\..\src\jpeg\jccoefct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccoefct.c

 
 $(OBJS)\wxjpeg_jccolor.obj: ..\..\src\jpeg\jccolor.c
 
 $(OBJS)\wxjpeg_jccolor.obj: ..\..\src\jpeg\jccolor.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccolor.c

 
 $(OBJS)\wxjpeg_jcsample.obj: ..\..\src\jpeg\jcsample.c
 
 $(OBJS)\wxjpeg_jcsample.obj: ..\..\src\jpeg\jcsample.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcsample.c

 
 $(OBJS)\wxjpeg_jchuff.obj: ..\..\src\jpeg\jchuff.c
 
 $(OBJS)\wxjpeg_jchuff.obj: ..\..\src\jpeg\jchuff.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jchuff.c

 
 $(OBJS)\wxjpeg_jcphuff.obj: ..\..\src\jpeg\jcphuff.c
 
 $(OBJS)\wxjpeg_jcphuff.obj: ..\..\src\jpeg\jcphuff.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcphuff.c

 
 $(OBJS)\wxjpeg_jcdctmgr.obj: ..\..\src\jpeg\jcdctmgr.c
 
 $(OBJS)\wxjpeg_jcdctmgr.obj: ..\..\src\jpeg\jcdctmgr.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcdctmgr.c

 
 $(OBJS)\wxjpeg_jfdctfst.obj: ..\..\src\jpeg\jfdctfst.c
 
 $(OBJS)\wxjpeg_jfdctfst.obj: ..\..\src\jpeg\jfdctfst.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctfst.c

 
 $(OBJS)\wxjpeg_jfdctflt.obj: ..\..\src\jpeg\jfdctflt.c
 
 $(OBJS)\wxjpeg_jfdctflt.obj: ..\..\src\jpeg\jfdctflt.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctflt.c

 
 $(OBJS)\wxjpeg_jfdctint.obj: ..\..\src\jpeg\jfdctint.c
 
 $(OBJS)\wxjpeg_jfdctint.obj: ..\..\src\jpeg\jfdctint.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctint.c

 
 $(OBJS)\wxjpeg_jdapimin.obj: ..\..\src\jpeg\jdapimin.c
 
 $(OBJS)\wxjpeg_jdapimin.obj: ..\..\src\jpeg\jdapimin.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapimin.c

 
 $(OBJS)\wxjpeg_jdapistd.obj: ..\..\src\jpeg\jdapistd.c
 
 $(OBJS)\wxjpeg_jdapistd.obj: ..\..\src\jpeg\jdapistd.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapistd.c

 
 $(OBJS)\wxjpeg_jdtrans.obj: ..\..\src\jpeg\jdtrans.c
 
 $(OBJS)\wxjpeg_jdtrans.obj: ..\..\src\jpeg\jdtrans.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdtrans.c

 
 $(OBJS)\wxjpeg_jdatasrc.obj: ..\..\src\jpeg\jdatasrc.c
 
 $(OBJS)\wxjpeg_jdatasrc.obj: ..\..\src\jpeg\jdatasrc.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatasrc.c

 
 $(OBJS)\wxjpeg_jdmaster.obj: ..\..\src\jpeg\jdmaster.c
 
 $(OBJS)\wxjpeg_jdmaster.obj: ..\..\src\jpeg\jdmaster.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmaster.c

 
 $(OBJS)\wxjpeg_jdinput.obj: ..\..\src\jpeg\jdinput.c
 
 $(OBJS)\wxjpeg_jdinput.obj: ..\..\src\jpeg\jdinput.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdinput.c

 
 $(OBJS)\wxjpeg_jdmarker.obj: ..\..\src\jpeg\jdmarker.c
 
 $(OBJS)\wxjpeg_jdmarker.obj: ..\..\src\jpeg\jdmarker.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmarker.c

 
 $(OBJS)\wxjpeg_jdhuff.obj: ..\..\src\jpeg\jdhuff.c
 
 $(OBJS)\wxjpeg_jdhuff.obj: ..\..\src\jpeg\jdhuff.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdhuff.c

 
 $(OBJS)\wxjpeg_jdphuff.obj: ..\..\src\jpeg\jdphuff.c
 
 $(OBJS)\wxjpeg_jdphuff.obj: ..\..\src\jpeg\jdphuff.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdphuff.c

 
 $(OBJS)\wxjpeg_jdmainct.obj: ..\..\src\jpeg\jdmainct.c
 
 $(OBJS)\wxjpeg_jdmainct.obj: ..\..\src\jpeg\jdmainct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmainct.c

 
 $(OBJS)\wxjpeg_jdcoefct.obj: ..\..\src\jpeg\jdcoefct.c
 
 $(OBJS)\wxjpeg_jdcoefct.obj: ..\..\src\jpeg\jdcoefct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcoefct.c

 
 $(OBJS)\wxjpeg_jdpostct.obj: ..\..\src\jpeg\jdpostct.c
 
 $(OBJS)\wxjpeg_jdpostct.obj: ..\..\src\jpeg\jdpostct.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdpostct.c

 
 $(OBJS)\wxjpeg_jddctmgr.obj: ..\..\src\jpeg\jddctmgr.c
 
 $(OBJS)\wxjpeg_jddctmgr.obj: ..\..\src\jpeg\jddctmgr.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jddctmgr.c

 
 $(OBJS)\wxjpeg_jidctfst.obj: ..\..\src\jpeg\jidctfst.c
 
 $(OBJS)\wxjpeg_jidctfst.obj: ..\..\src\jpeg\jidctfst.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctfst.c

 
 $(OBJS)\wxjpeg_jidctflt.obj: ..\..\src\jpeg\jidctflt.c
 
 $(OBJS)\wxjpeg_jidctflt.obj: ..\..\src\jpeg\jidctflt.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctflt.c

 
 $(OBJS)\wxjpeg_jidctint.obj: ..\..\src\jpeg\jidctint.c
 
 $(OBJS)\wxjpeg_jidctint.obj: ..\..\src\jpeg\jidctint.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctint.c

 
 $(OBJS)\wxjpeg_jidctred.obj: ..\..\src\jpeg\jidctred.c
 
 $(OBJS)\wxjpeg_jidctred.obj: ..\..\src\jpeg\jidctred.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctred.c

 
 $(OBJS)\wxjpeg_jdsample.obj: ..\..\src\jpeg\jdsample.c
 
 $(OBJS)\wxjpeg_jdsample.obj: ..\..\src\jpeg\jdsample.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdsample.c

 
 $(OBJS)\wxjpeg_jdcolor.obj: ..\..\src\jpeg\jdcolor.c
 
 $(OBJS)\wxjpeg_jdcolor.obj: ..\..\src\jpeg\jdcolor.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcolor.c

 
 $(OBJS)\wxjpeg_jquant1.obj: ..\..\src\jpeg\jquant1.c
 
 $(OBJS)\wxjpeg_jquant1.obj: ..\..\src\jpeg\jquant1.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant1.c

 
 $(OBJS)\wxjpeg_jquant2.obj: ..\..\src\jpeg\jquant2.c
 
 $(OBJS)\wxjpeg_jquant2.obj: ..\..\src\jpeg\jquant2.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant2.c

 
 $(OBJS)\wxjpeg_jdmerge.obj: ..\..\src\jpeg\jdmerge.c
 
 $(OBJS)\wxjpeg_jdmerge.obj: ..\..\src\jpeg\jdmerge.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmerge.c
+
+$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\libtiff\tif_win32.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_win32.c

 
 

-$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\tif_win32.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\libtiff\tif_aux.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_aux.c

 
 

-$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\tif_aux.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\libtiff\tif_close.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_close.c

 
 

-$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\tif_close.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\libtiff\tif_codec.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_codec.c

 
 

-$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\tif_codec.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\libtiff\tif_color.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_color.c

 
 

-$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\tif_color.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\libtiff\tif_compress.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_compress.c

 
 

-$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\tif_compress.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\libtiff\tif_dir.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dir.c

 
 

-$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\tif_dir.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\libtiff\tif_dirinfo.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirinfo.c

 
 

-$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\tif_dirinfo.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\libtiff\tif_dirread.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirread.c

 
 

-$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\tif_dirread.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\libtiff\tif_dirwrite.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirwrite.c

 
 

-$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\tif_dirwrite.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\libtiff\tif_dumpmode.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dumpmode.c

 
 

-$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\tif_dumpmode.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\libtiff\tif_error.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_error.c

 
 

-$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\libtiff\tif_extension.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_extension.c

 
 

-$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\tif_extension.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\libtiff\tif_fax3.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3.c

 
 

-$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\libtiff\tif_fax3sm.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3sm.c

 
 

-$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\tif_fax3sm.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_flush.c

 
 

-$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\tif_getimage.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c

 
 

-$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\tif_jpeg.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c

 
 

-$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\tif_flush.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c

 
 

-$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\tif_lzw.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c

 
 

-$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\tif_luv.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\libtiff\tif_next.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_next.c

 
 

-$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\tif_next.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_ojpeg.obj: ..\..\src\tiff\libtiff\tif_ojpeg.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_ojpeg.c

 
 

-$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\tif_open.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\libtiff\tif_open.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_open.c

 
 

-$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\tif_packbits.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\libtiff\tif_packbits.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_packbits.c

 
 

-$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\tif_pixarlog.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\libtiff\tif_pixarlog.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_pixarlog.c

 
 

-$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\tif_predict.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_predict.c

 
 

-$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\tif_print.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\libtiff\tif_print.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_print.c

 
 

-$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\tif_read.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_read.c

 
 

-$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\tif_swab.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\libtiff\tif_strip.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_strip.c

 
 

-$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\tif_strip.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\libtiff\tif_swab.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_swab.c

 
 

-$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\tif_thunder.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\libtiff\tif_thunder.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_thunder.c

 
 

-$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\tif_tile.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\libtiff\tif_tile.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_tile.c

 
 

-$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\tif_version.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_version.c

 
 

-$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\tif_warning.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_warning.c

 
 

-$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\tif_write.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_write.c

 
 

-$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\tif_zip.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zip.c

 
 $(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\lib\xmlparse.c
 
 $(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\lib\xmlparse.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlparse.c

 
 $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
 
 $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlrole.c

 
 $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
 
 $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c

-       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c

 
 

-$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
+$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx

 
 

-$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx
+
+$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CellBuffer.cxx
+
+$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CharClassify.cxx
+
+$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx
+
+$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx
+
+$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Document.cxx
+
+$(OBJS)\wxscintilla_DocumentAccessor.obj: ..\..\src\stc\scintilla\src\DocumentAccessor.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\DocumentAccessor.cxx
+
+$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx
+
+$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx
+
+$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Indicator.cxx
+
+$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyMap.cxx
+
+$(OBJS)\wxscintilla_KeyWords.obj: ..\..\src\stc\scintilla\src\KeyWords.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyWords.cxx
+
+$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\src\LexAPDL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAPDL.cxx
+
+$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\src\LexAU3.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAU3.cxx
+
+$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\src\LexASY.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexASY.cxx
+
+$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\src\LexAVE.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAVE.cxx
+
+$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\src\LexAbaqus.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAbaqus.cxx
+
+$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\src\LexAda.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAda.cxx
+
+$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\src\LexAsm.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAsm.cxx
+
+$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\src\LexAsn1.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexAsn1.cxx
+
+$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\src\LexBaan.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBaan.cxx
+
+$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\src\LexBash.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBash.cxx
+
+$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\src\LexBasic.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBasic.cxx
+
+$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\src\LexBullant.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexBullant.cxx
+
+$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\src\LexCLW.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCLW.cxx
+
+$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\src\LexCmake.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCmake.cxx
+
+$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\src\LexCPP.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCPP.cxx
+
+$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\src\LexCSS.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCSS.cxx
+
+$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\src\LexCaml.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCaml.cxx
+
+$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\src\LexCsound.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCsound.cxx
+
+$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\src\LexConf.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexConf.cxx
+
+$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\src\LexCrontab.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexCrontab.cxx
+
+$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\src\LexD.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexD.cxx
+
+$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\src\LexEScript.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexEScript.cxx
+
+$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\src\LexEiffel.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexEiffel.cxx
+
+$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\src\LexErlang.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexErlang.cxx
+
+$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\src\LexFlagship.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexFlagship.cxx
+
+$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\src\LexForth.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexForth.cxx
+
+$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\src\LexFortran.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexFortran.cxx
+
+$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\src\LexGAP.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexGAP.cxx
+
+$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\src\LexGui4Cli.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexGui4Cli.cxx
+
+$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\src\LexHTML.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexHTML.cxx
+
+$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\src\LexHaskell.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexHaskell.cxx
+
+$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\src\LexInno.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexInno.cxx
+
+$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\src\LexKix.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexKix.cxx
+
+$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\src\LexLisp.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLisp.cxx
+
+$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\src\LexLout.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLout.cxx
+
+$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\src\LexLua.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexLua.cxx
+
+$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\src\LexMMIXAL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMMIXAL.cxx
+
+$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\src\LexMPT.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMPT.cxx
+
+$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\src\LexMSSQL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMSSQL.cxx
+
+$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\src\LexMatlab.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMatlab.cxx
+
+$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\src\LexMetapost.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexMetapost.cxx
+
+$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\src\LexNsis.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexNsis.cxx
+
+$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\src\LexOpal.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexOpal.cxx
+
+$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\src\LexOthers.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexOthers.cxx
+
+$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\src\LexPB.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPB.cxx
+
+$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\src\LexPLM.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPLM.cxx
+
+$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\src\LexPOV.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPOV.cxx
+
+$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\src\LexProgress.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexProgress.cxx
+
+$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\src\LexPS.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPS.cxx
+
+$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\src\LexPascal.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPascal.cxx
+
+$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\src\LexPerl.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPerl.cxx
+
+$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\src\LexPython.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexPython.cxx
+
+$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\src\LexR.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexR.cxx
+
+$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\src\LexRebol.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexRebol.cxx
+
+$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\src\LexRuby.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexRuby.cxx
+
+$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\src\LexSQL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSQL.cxx
+
+$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\src\LexSmalltalk.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSmalltalk.cxx
+
+$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\src\LexTADS3.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTADS3.cxx
+
+$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\src\LexScriptol.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexScriptol.cxx
+
+$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\src\LexSpecman.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSpecman.cxx
+
+$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\src\LexSpice.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexSpice.cxx
+
+$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\src\LexTCL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTCL.cxx
+
+$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\src\LexTeX.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexTeX.cxx
+
+$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\src\LexVB.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVB.cxx
+
+$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\src\LexVHDL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVHDL.cxx
+
+$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\src\LexVerilog.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexVerilog.cxx
+
+$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\src\LexYAML.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LexYAML.cxx
+
+$(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx
+
+$(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PositionCache.cxx
+
+$(OBJS)\wxscintilla_PropSet.obj: ..\..\src\stc\scintilla\src\PropSet.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PropSet.cxx
+
+$(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RESearch.cxx
+
+$(OBJS)\wxscintilla_RunStyles.obj: ..\..\src\stc\scintilla\src\RunStyles.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RunStyles.cxx
+
+$(OBJS)\wxscintilla_ScintillaBase.obj: ..\..\src\stc\scintilla\src\ScintillaBase.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ScintillaBase.cxx
+
+$(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Style.cxx
+
+$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\src\StyleContext.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\StyleContext.cxx
+
+$(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx
+
+$(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx
+
+$(OBJS)\wxscintilla_WindowAccessor.obj: ..\..\src\stc\scintilla\src\WindowAccessor.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\WindowAccessor.cxx
+
+$(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\XPM.cxx
+
+$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp

 
 $(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
 
 $(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcall.cpp

 
 $(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp
 
 $(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcfind.cpp

 
 $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
 
 $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\archive.cpp
+
+$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arrstr.cpp
+
+$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\base64.cpp

 
 $(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
 
 $(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clntdata.cpp

 
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
 
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdline.cpp

 
 $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp
 
 $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\config.cpp

 
 $(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp
 
 $(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\convauto.cpp

 
 $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
 
 $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp
+
+$(OBJS)\monodll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp

 
 $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
 
 $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp

 
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp
 
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp

 
 $(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp
 
 $(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp

 
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp
 
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp

 
 $(OBJS)\monodll_dynload.obj: ..\..\src\common\dynload.cpp
 
 $(OBJS)\monodll_dynload.obj: ..\..\src\common\dynload.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynload.cpp

 
 $(OBJS)\monodll_encconv.obj: ..\..\src\common\encconv.cpp
 
 $(OBJS)\monodll_encconv.obj: ..\..\src\common\encconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\encconv.cpp
+
+$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp

 
 $(OBJS)\monodll_extended.obj: ..\..\src\common\extended.c
 
 $(OBJS)\monodll_extended.obj: ..\..\src\common\extended.c

-       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\common\extended.c

 
 $(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp
 
 $(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ffile.cpp

 
 $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp
 
 $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\file.cpp

 
 $(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp
 
 $(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileback.cpp

 
 $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp
 
 $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileconf.cpp

 
 $(OBJS)\monodll_filefn.obj: ..\..\src\common\filefn.cpp
 
 $(OBJS)\monodll_filefn.obj: ..\..\src\common\filefn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filefn.cpp

 
 $(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp
 
 $(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filename.cpp

 
 $(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp
 
 $(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filesys.cpp

 
 $(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp
 
 $(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtall.cpp

 
 $(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp
 
 $(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtfind.cpp

 
 $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 
 $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp

 
 $(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
 
 $(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp

 
 $(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 
 $(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp

 
 $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
 
 $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hash.cpp

 
 $(OBJS)\monodll_hashmap.obj: ..\..\src\common\hashmap.cpp
 
 $(OBJS)\monodll_hashmap.obj: ..\..\src\common\hashmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hashmap.cpp

 
 $(OBJS)\monodll_init.obj: ..\..\src\common\init.cpp
 
 $(OBJS)\monodll_init.obj: ..\..\src\common\init.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\init.cpp

 
 $(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp
 
 $(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\intl.cpp

 
 $(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 
 $(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp

 
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
 
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp

 
 $(OBJS)\monodll_log.obj: ..\..\src\common\log.cpp
 
 $(OBJS)\monodll_log.obj: ..\..\src\common\log.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\log.cpp

 
 $(OBJS)\monodll_longlong.obj: ..\..\src\common\longlong.cpp
 
 $(OBJS)\monodll_longlong.obj: ..\..\src\common\longlong.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\longlong.cpp

 
 $(OBJS)\monodll_memory.obj: ..\..\src\common\memory.cpp
 
 $(OBJS)\monodll_memory.obj: ..\..\src\common\memory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\memory.cpp

 
 $(OBJS)\monodll_mimecmn.obj: ..\..\src\common\mimecmn.cpp
 
 $(OBJS)\monodll_mimecmn.obj: ..\..\src\common\mimecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp

 
 $(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp
 
 $(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\module.cpp

 
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
 
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp

 
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
 
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp

 
 $(OBJS)\monodll_platinfo.obj: ..\..\src\common\platinfo.cpp
 
 $(OBJS)\monodll_platinfo.obj: ..\..\src\common\platinfo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\platinfo.cpp

 
 $(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp
 
 $(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\powercmn.cpp

 
 $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
 
 $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\process.cpp

 
 $(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp
 
 $(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\regex.cpp

 
 $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 
 $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp

 
 $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
 
 $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp
+
+$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp

 
 $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 
 $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

 
 $(OBJS)\monodll_strconv.obj: ..\..\src\common\strconv.cpp
 
 $(OBJS)\monodll_strconv.obj: ..\..\src\common\strconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strconv.cpp

 
 $(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp
 
 $(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stream.cpp

 
 $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp
 
 $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\string.cpp
+
+$(OBJS)\monodll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+
+$(OBJS)\monodll_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringops.cpp
+
+$(OBJS)\monodll_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strvararg.cpp

 
 $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp
 
 $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sysopt.cpp

 
 $(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
 
 $(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp

 
 $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 
 $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textbuf.cpp

 
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
 
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
+
+$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
+
+$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp

 
 $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 
 $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp

 
 $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 
 $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+
+$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\unichar.cpp

 
 $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
 
 $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp
+
+$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp

 
 $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
 
 $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp

 
 $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp
 
 $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wfstream.cpp
+
+$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp

 
 

-$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+
+$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp

 
 $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
 
 $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp

 
 $(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
 
 $(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp

 
 $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 
 $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp

 
 $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp
 
 $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp

 
 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp

 
 $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
 
 $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp

 
 $(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp
 
 $(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp

 
 $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp
 
 $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dde.cpp

 
 $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
 
 $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dir.cpp

 
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

 
 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
 
 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp

 
 $(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp
 
 $(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\power.cpp

 
 $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp
 
 $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\regconf.cpp

 
 $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp
 
 $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\registry.cpp

 
 $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp
 
 $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp

 
 $(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
 
 $(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp

 
 $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
 
 $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp

 
 $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp
 
 $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\thread.cpp
+
+$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timer.cpp

 
 $(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp
 
 $(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utils.cpp

 
 $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp

 
 $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\monodll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\monodll_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\monodll_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\monodll_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\volume.cpp

 
 $(OBJS)\monodll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 
 $(OBJS)\monodll_fs_inet.obj: ..\..\src\common\fs_inet.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp

 
 $(OBJS)\monodll_ftp.obj: ..\..\src\common\ftp.cpp
 
 $(OBJS)\monodll_ftp.obj: ..\..\src\common\ftp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ftp.cpp

 
 $(OBJS)\monodll_http.obj: ..\..\src\common\http.cpp
 
 $(OBJS)\monodll_http.obj: ..\..\src\common\http.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\http.cpp

 
 $(OBJS)\monodll_protocol.obj: ..\..\src\common\protocol.cpp
 
 $(OBJS)\monodll_protocol.obj: ..\..\src\common\protocol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\protocol.cpp

 
 $(OBJS)\monodll_sckaddr.obj: ..\..\src\common\sckaddr.cpp
 
 $(OBJS)\monodll_sckaddr.obj: ..\..\src\common\sckaddr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp

 
 $(OBJS)\monodll_sckfile.obj: ..\..\src\common\sckfile.cpp
 
 $(OBJS)\monodll_sckfile.obj: ..\..\src\common\sckfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckfile.cpp

 
 $(OBJS)\monodll_sckipc.obj: ..\..\src\common\sckipc.cpp
 
 $(OBJS)\monodll_sckipc.obj: ..\..\src\common\sckipc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckipc.cpp

 
 $(OBJS)\monodll_sckstrm.obj: ..\..\src\common\sckstrm.cpp
 
 $(OBJS)\monodll_sckstrm.obj: ..\..\src\common\sckstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp

 
 $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp
 
 $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\socket.cpp

 
 $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
 
 $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\url.cpp

 
 

-$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp

 
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp

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

 
 $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp

 
 $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
 
 $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp

 
 $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp

 
 $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
 
 $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp

 
 $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 
 $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp

 
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
 
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp

 
 

-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp

 
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp

 
 $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
 
 $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp

 
 $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp

 
 $(OBJS)\monodll_metafile.obj: ..\..\src\msw\metafile.cpp
 
 $(OBJS)\monodll_metafile.obj: ..\..\src\msw\metafile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\metafile.cpp

 
 $(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 
 $(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp

 
 $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 
 $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+
+$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp

 
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

 
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

 
 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp

 
 

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

 
 

-$(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp

 
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp

 
 $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp

 
 $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp

 
 $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp

 
 $(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp

 
 $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp

 
 $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp

 
 $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp

 
 $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp

 
 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp

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

 
 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp

 
 $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
 
 $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp

 
 $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp

 
 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp

 
 

-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp

 
 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp

 
 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
 
 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp

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

 
 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp

 
 $(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp
 
 $(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp

 
 $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 
 $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp

 
 $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
 
 $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp

 
 $(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
 
 $(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp

 
 $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
 
 $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+
+$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp

 
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp

 
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

 
 $(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 
 $(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp

 
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp

 
 $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 
 $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp

 
 $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
 
 $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp

 
 $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
 
 $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp

 
 $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
 
 $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdata.cpp

 
 $(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
 
 $(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp

 
 $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
 
 $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp

 
 $(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
 
 $(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp

 
 $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
 
 $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp

 
 $(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
 
 $(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp

 
 $(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp
 
 $(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp

 
 $(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp
 
 $(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmltag.cpp

 
 $(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp
 
 $(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp

 
 $(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp
 
 $(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmprint.cpp

 
 $(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp
 
 $(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp

 
 $(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp
 
 $(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp

 
 $(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp
 
 $(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_hline.cpp

 
 $(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp
 
 $(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_image.cpp

 
 $(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp
 
 $(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_layout.cpp

 
 $(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp
 
 $(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_links.cpp

 
 $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp
 
 $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_list.cpp

 
 $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp
 
 $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp

 
 $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp
 
 $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp

 
 $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp
 
 $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp

 
 $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
 
 $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp

 
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp

 
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp

 
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

 
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

 
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

 
 $(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
 
 $(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp

 
 $(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
 
 $(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp

 
 $(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
 
 $(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp

 
 $(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
 
 $(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp

 
 $(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
 
 $(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp

 
 $(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
 
 $(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp

 
 $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
 
 $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp

 
 $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 
 $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp

 
 $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 
 $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp

 
 $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 
 $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp

 
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+
+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp

 
 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

 
 $(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 
 $(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp

 
 $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 
 $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp

 
 

-$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp

 
 

-$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp

 
 $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 
 $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp

 
 $(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
 
 $(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+
+$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp

 
 $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
 
 $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp

 
 $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
 
 $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp

 
 $(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 
 $(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp

 
 $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
 
 $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp

 
 $(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
 
 $(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp

 
 $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
 
 $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp

 
 $(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 
 $(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp

 
 $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
 
 $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp

 
 $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
 
 $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp

 
 $(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
 
 $(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp

 
 $(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
 
 $(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp

 
 $(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
 
 $(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+
+$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp

 
 $(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
 
 $(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp

 
 $(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
 
 $(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp

 
 $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 
 $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp

 
 $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 
 $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp

 
 $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
 
 $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp

 
 $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 
 $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

 
 $(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
 
 $(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp

 
 $(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
 
 $(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp

 
 $(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
 
 $(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+
+$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp

 
 $(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
 
 $(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp

 
 $(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
 
 $(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp

 
 $(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
 
 $(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp

 
 $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 
 $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp

 
 $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 
 $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp

 
 $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 
 $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp

 
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp

 
 $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 
 $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp

 
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp

 
 $(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
 
 $(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp

 
 $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
 
 $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp

 
 $(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
 
 $(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp

 
 $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
 
 $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+
+$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp

 
 $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 
 $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

 
 $(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
 
 $(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp

 
 $(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
 
 $(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\dockart.cpp

 
 $(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 
 $(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp

 
 $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
 
 $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
+
+$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp

 
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+
+$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp

 
 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp

 
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp

 
 $(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
 
 $(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp

 
 $(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp

 
 $(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 
 $(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp

 
 $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp

 
 $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 
 $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp

 
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp

 
 $(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+
+$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
+
+$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+
+$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp

 
 $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 
 $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp

 
 $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
 
 $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif

 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp

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

-$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp

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

-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_region.obj: ..\..\src\msw\region.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_region.obj: ..\..\src\msw\region.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderer.obj: ..\..\src\msw\renderer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderer.obj: ..\..\src\msw\renderer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\univ\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\univ\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_accel.obj: ..\..\src\msw\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_accel.obj: ..\..\src\msw\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_accel.obj: ..\..\src\generic\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_accel.obj: ..\..\src\generic\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_button.obj: ..\..\src\msw\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_button.obj: ..\..\src\msw\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_button.obj: ..\..\src\univ\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_button.obj: ..\..\src\univ\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checkbox.obj: ..\..\src\msw\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checkbox.obj: ..\..\src\msw\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_choice.obj: ..\..\src\univ\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_choice.obj: ..\..\src\univ\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_combobox.obj: ..\..\src\msw\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_combobox.obj: ..\..\src\msw\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_combobox.obj: ..\..\src\univ\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_combobox.obj: ..\..\src\univ\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_control.obj: ..\..\src\msw\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_control.obj: ..\..\src\msw\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp

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

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_listbox.obj: ..\..\src\univ\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_listbox.obj: ..\..\src\univ\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listctrl.obj: ..\..\src\msw\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listctrl.obj: ..\..\src\msw\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_listctrl.obj: ..\..\src\generic\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_listctrl.obj: ..\..\src\generic\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_menu.obj: ..\..\src\msw\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_menu.obj: ..\..\src\msw\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_menu.obj: ..\..\src\univ\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_menu.obj: ..\..\src\univ\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_notebook.obj: ..\..\src\msw\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_notebook.obj: ..\..\src\msw\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_notebook.obj: ..\..\src\univ\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_notebook.obj: ..\..\src\univ\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_radiobox.obj: ..\..\src\msw\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_radiobox.obj: ..\..\src\msw\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_radiobox.obj: ..\..\src\univ\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_radiobox.obj: ..\..\src\univ\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_radiobut.obj: ..\..\src\msw\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_radiobut.obj: ..\..\src\msw\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_radiobut.obj: ..\..\src\univ\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_radiobut.obj: ..\..\src\univ\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp

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

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statbmp.obj: ..\..\src\msw\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statbmp.obj: ..\..\src\msw\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statbmp.obj: ..\..\src\univ\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statbmp.obj: ..\..\src\univ\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statbox.obj: ..\..\src\msw\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statbox.obj: ..\..\src\msw\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statbox.obj: ..\..\src\univ\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statbox.obj: ..\..\src\univ\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statline.obj: ..\..\src\msw\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statline.obj: ..\..\src\msw\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statline.obj: ..\..\src\univ\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_statline.obj: ..\..\src\univ\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_stattext.obj: ..\..\src\msw\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_stattext.obj: ..\..\src\msw\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp

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

-$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

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

-$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\framecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\geometry.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagall.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\image.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagfill.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imaggif.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpng.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtga.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\layout.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stockitem.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp

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

-$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\treebase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\validate.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp

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

-$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp

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

-$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp

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

-$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp

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

-$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp

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

-$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp

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

-$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp

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

-$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp

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

-$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp

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

-$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\renderg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\selstore.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splitter.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp

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

-$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp

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

-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp

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

-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grid.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\helpext.cpp

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

-$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp

 !endif
 
 !endif
 

+$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
+

 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp

 
 $(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp
 
 $(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcall.cpp

 
 $(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp
 
 $(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcfind.cpp

 
 $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
 
 $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\archive.cpp
+
+$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
+
+$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\base64.cpp

 
 $(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
 
 $(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clntdata.cpp

 
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
 
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdline.cpp

 
 $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
 
 $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\config.cpp

 
 $(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
 
 $(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\convauto.cpp

 
 $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
 
 $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
+
+$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp

 
 $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
 
 $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp

 
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
 
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp

 
 $(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
 
 $(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp

 
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
 
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp

 
 $(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp
 
 $(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynload.cpp

 
 $(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp
 
 $(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\encconv.cpp
+
+$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp

 
 $(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c
 
 $(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c

-       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\common\extended.c

 
 $(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
 
 $(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ffile.cpp

 
 $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
 
 $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\file.cpp

 
 $(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
 
 $(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileback.cpp

 
 $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
 
 $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileconf.cpp

 
 $(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp
 
 $(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filefn.cpp

 
 $(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp
 
 $(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filename.cpp

 
 $(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
 
 $(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filesys.cpp

 
 $(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp
 
 $(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtall.cpp

 
 $(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
 
 $(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtfind.cpp

 
 $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 
 $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp

 
 $(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
 
 $(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp

 
 $(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 
 $(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp

 
 $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
 
 $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hash.cpp

 
 $(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp
 
 $(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hashmap.cpp

 
 $(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp
 
 $(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\init.cpp

 
 $(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp
 
 $(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\intl.cpp

 
 $(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 
 $(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp

 
 $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
 
 $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp

 
 $(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp
 
 $(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\log.cpp

 
 $(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp
 
 $(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\longlong.cpp

 
 $(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp
 
 $(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\memory.cpp

 
 $(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
 
 $(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp

 
 $(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp
 
 $(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\module.cpp

 
 $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
 
 $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp

 
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
 
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp

 
 $(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp
 
 $(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\platinfo.cpp

 
 $(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
 
 $(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\powercmn.cpp

 
 $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
 
 $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\process.cpp

 
 $(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp
 
 $(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\regex.cpp

 
 $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 
 $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp

 
 $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
 
 $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
+
+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp

 
 $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 
 $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

 
 $(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp
 
 $(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strconv.cpp

 
 $(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp
 
 $(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stream.cpp

 
 $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
 
 $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\string.cpp
+
+$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+
+$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringops.cpp
+
+$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strvararg.cpp

 
 $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
 
 $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sysopt.cpp

 
 $(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
 
 $(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp

 
 $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
 
 $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textbuf.cpp

 
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
 
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
+
+$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
+
+$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp

 
 $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 
 $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp

 
 $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 
 $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+
+$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\unichar.cpp

 
 $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
 
 $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
+
+$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp

 
 $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
 
 $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp

 
 $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
 
 $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
+
+$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp

 
 

-$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+
+$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp

 
 $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
 
 $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp

 
 $(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
 
 $(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp

 
 $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 
 $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp

 
 $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
 
 $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp

 
 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp

 
 $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
 
 $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp

 
 $(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp
 
 $(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp

 
 $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
 
 $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dde.cpp

 
 $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
 
 $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dir.cpp

 
 $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 
 $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

 
 $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
 
 $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp

 
 $(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp
 
 $(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\power.cpp

 
 $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
 
 $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\regconf.cpp

 
 $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp
 
 $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\registry.cpp

 
 $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
 
 $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp

 
 $(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
 
 $(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp

 
 $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
 
 $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp

 
 $(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
 
 $(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\thread.cpp
+
+$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timer.cpp

 
 $(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
 
 $(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utils.cpp

 
 $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp

 
 $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\volume.cpp

 
 $(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 
 $(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp

 
 $(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp
 
 $(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ftp.cpp

 
 $(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp
 
 $(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\http.cpp

 
 $(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp
 
 $(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\protocol.cpp

 
 $(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
 
 $(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp

 
 $(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp
 
 $(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp

 
 $(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp
 
 $(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp

 
 $(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
 
 $(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp

 
 $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
 
 $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\socket.cpp

 
 $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
 
 $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp

 
 

-$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp

 
 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp

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

 
 $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp

 
 $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
 
 $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp

 
 $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp

 
 $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
 
 $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp

 
 $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 
 $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp

 
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
 
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp

 
 

-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp

 
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp

 
 $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
 
 $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp

 
 $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp

 
 $(OBJS)\monolib_metafile.obj: ..\..\src\msw\metafile.cpp
 
 $(OBJS)\monolib_metafile.obj: ..\..\src\msw\metafile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\metafile.cpp

 
 $(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 
 $(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp

 
 $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 
 $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+
+$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp

 
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

 
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

 
 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp

 
 

-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp

 
 

-$(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp

 
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp

 
 $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp

 
 $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp

 
 $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp

 
 $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp

 
 $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp

 
 $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
 
 $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp

 
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp

 
 $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp

 
 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp

 
 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp

 
 $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
 
 $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp

 
 $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp

 
 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp

 
 

-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp

 
 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp

 
 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
 
 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp

 
 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp

 
 $(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp
 
 $(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp

 
 $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 
 $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp

 
 $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
 
 $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp

 
 $(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
 
 $(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp

 
 $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
 
 $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+
+$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp

 
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp

 
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

 
 $(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 
 $(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp

 
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp

 
 $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 
 $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp

 
 $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
 
 $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp

 
 $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
 
 $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp

 
 $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
 
 $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp

 
 $(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
 
 $(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp

 
 $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
 
 $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp

 
 $(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
 
 $(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp

 
 $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
 
 $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp

 
 $(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
 
 $(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp

 
 $(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
 
 $(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp

 
 $(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp
 
 $(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp

 
 $(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
 
 $(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp

 
 $(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp
 
 $(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp

 
 $(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
 
 $(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp

 
 $(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
 
 $(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp

 
 $(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp
 
 $(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp

 
 $(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp
 
 $(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_image.cpp

 
 $(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp
 
 $(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp

 
 $(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp
 
 $(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_links.cpp

 
 $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
 
 $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_list.cpp

 
 $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp
 
 $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp

 
 $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp
 
 $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp

 
 $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp
 
 $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp

 
 $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
 
 $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp

 
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp

 
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp

 
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

 
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

 
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

 
 $(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
 
 $(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp

 
 $(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
 
 $(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp

 
 $(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
 
 $(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp

 
 $(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
 
 $(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp

 
 $(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
 
 $(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp

 
 $(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
 
 $(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp

 
 $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
 
 $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp

 
 $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 
 $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp

 
 $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 
 $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp

 
 $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 
 $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp

 
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+
+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp

 
 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

 
 $(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 
 $(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp

 
 $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 
 $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp

 
 

-$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp

 
 

-$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp

 
 $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 
 $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp

 
 $(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
 
 $(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+
+$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp

 
 $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
 
 $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp

 
 $(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
 
 $(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp

 
 $(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 
 $(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp

 
 $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
 
 $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp

 
 $(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
 
 $(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp

 
 $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
 
 $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp

 
 $(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 
 $(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp

 
 $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
 
 $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp

 
 $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
 
 $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp

 
 $(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
 
 $(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp

 
 $(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
 
 $(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp

 
 $(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
 
 $(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+
+$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp

 
 $(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
 
 $(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp

 
 $(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
 
 $(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp

 
 $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 
 $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp

 
 $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 
 $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp

 
 $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
 
 $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp

 
 $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 
 $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

 
 $(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
 
 $(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp

 
 $(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
 
 $(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp

 
 $(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
 
 $(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+
+$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp

 
 $(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
 
 $(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp

 
 $(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
 
 $(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp

 
 $(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
 
 $(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp

 
 $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 
 $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp

 
 $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 
 $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp

 
 $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 
 $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp

 
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp

 
 $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 
 $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp

 
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp

 
 $(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
 
 $(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp

 
 $(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
 
 $(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp

 
 $(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
 
 $(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp

 
 $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
 
 $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+
+$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp

 
 $(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 
 $(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

 
 $(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
 
 $(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp

 
 $(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
 
 $(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\dockart.cpp

 
 $(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 
 $(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp

 
 $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
 
 $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
+
+$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp

 
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+
+$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp

 
 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp

 
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp

 
 $(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
 
 $(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp

 
 $(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp

 
 $(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 
 $(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp

 
 $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp

 
 $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 
 $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp

 
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp

 
 $(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+
+$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
+
+$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+
+$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp

 
 $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 
 $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp

 
 $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
 
 $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif

 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bitmap.obj: ..\..\src\msw\bitmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bitmap.obj: ..\..\src\msw\bitmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_caret.obj: ..\..\src\msw\caret.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_caret.obj: ..\..\src\msw\caret.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_colour.obj: ..\..\src\msw\colour.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_colour.obj: ..\..\src\msw\colour.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cursor.obj: ..\..\src\msw\cursor.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cursor.obj: ..\..\src\msw\cursor.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_data.obj: ..\..\src\msw\data.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_data.obj: ..\..\src\msw\data.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dc.obj: ..\..\src\msw\dc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dc.obj: ..\..\src\msw\dc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcclient.obj: ..\..\src\msw\dcclient.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcclient.obj: ..\..\src\msw\dcclient.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcprint.obj: ..\..\src\msw\dcprint.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcprint.obj: ..\..\src\msw\dcprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dialup.obj: ..\..\src\msw\dialup.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dialup.obj: ..\..\src\msw\dialup.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp

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

-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontenum.obj: ..\..\src\msw\fontenum.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontenum.obj: ..\..\src\msw\fontenum.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontutil.obj: ..\..\src\msw\fontutil.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontutil.obj: ..\..\src\msw\fontutil.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp

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

-$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp

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

-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_region.obj: ..\..\src\msw\region.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_region.obj: ..\..\src\msw\region.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_renderer.obj: ..\..\src\msw\renderer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_renderer.obj: ..\..\src\msw\renderer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\univ\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\univ\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_accel.obj: ..\..\src\msw\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_accel.obj: ..\..\src\msw\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_accel.obj: ..\..\src\generic\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_accel.obj: ..\..\src\generic\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_button.obj: ..\..\src\msw\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_button.obj: ..\..\src\msw\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_button.obj: ..\..\src\univ\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_button.obj: ..\..\src\univ\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checkbox.obj: ..\..\src\msw\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checkbox.obj: ..\..\src\msw\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_choice.obj: ..\..\src\univ\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_choice.obj: ..\..\src\univ\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_combobox.obj: ..\..\src\msw\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_combobox.obj: ..\..\src\msw\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_combobox.obj: ..\..\src\univ\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_combobox.obj: ..\..\src\univ\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_control.obj: ..\..\src\msw\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_control.obj: ..\..\src\msw\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_listbox.obj: ..\..\src\univ\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_listbox.obj: ..\..\src\univ\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listctrl.obj: ..\..\src\msw\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listctrl.obj: ..\..\src\msw\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_listctrl.obj: ..\..\src\generic\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_listctrl.obj: ..\..\src\generic\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_menu.obj: ..\..\src\msw\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_menu.obj: ..\..\src\msw\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_menu.obj: ..\..\src\univ\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_menu.obj: ..\..\src\univ\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_notebook.obj: ..\..\src\msw\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_notebook.obj: ..\..\src\msw\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_notebook.obj: ..\..\src\univ\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_notebook.obj: ..\..\src\univ\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_radiobox.obj: ..\..\src\msw\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_radiobox.obj: ..\..\src\msw\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_radiobox.obj: ..\..\src\univ\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_radiobox.obj: ..\..\src\univ\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_radiobut.obj: ..\..\src\msw\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_radiobut.obj: ..\..\src\msw\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_radiobut.obj: ..\..\src\univ\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_radiobut.obj: ..\..\src\univ\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statbmp.obj: ..\..\src\msw\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statbmp.obj: ..\..\src\msw\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statbmp.obj: ..\..\src\univ\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statbmp.obj: ..\..\src\univ\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statbox.obj: ..\..\src\msw\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statbox.obj: ..\..\src\msw\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statbox.obj: ..\..\src\univ\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statbox.obj: ..\..\src\univ\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statline.obj: ..\..\src\msw\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statline.obj: ..\..\src\msw\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statline.obj: ..\..\src\univ\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_statline.obj: ..\..\src\univ\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_stattext.obj: ..\..\src\msw\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_stattext.obj: ..\..\src\msw\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docmdi.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docview.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp

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

-$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

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

-$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\framecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\geometry.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagall.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\image.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagfill.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imaggif.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpng.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtga.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\layout.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stockitem.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp

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

-$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\treebase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\validate.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp

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

-$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp

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

-$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp

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

-$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp

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

-$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp

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

-$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp

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

-$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp

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

-$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp

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

-$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp

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

-$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\renderg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\selstore.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splitter.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp

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

-$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp

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

-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp

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

-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grid.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp

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

-$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp

 !endif
 
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
 !endif
 
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc

 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp

 
 $(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
 
 $(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcall.cpp

 
 $(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp
 
 $(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcfind.cpp

 
 $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
 
 $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\archive.cpp
+
+$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arrstr.cpp
+
+$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\base64.cpp

 
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
 
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\clntdata.cpp

 
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
 
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\cmdline.cpp

 
 $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
 
 $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\config.cpp

 
 $(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
 
 $(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\convauto.cpp

 
 $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
 
 $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
+
+$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp

 
 $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
 
 $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp

 
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
 
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp

 
 $(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
 
 $(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp

 
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
 
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp

 
 $(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp
 
 $(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynload.cpp

 
 $(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp
 
 $(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\encconv.cpp
+
+$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp

 
 $(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c
 
 $(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c

-       $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) ..\..\src\common\extended.c

 
 $(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
 
 $(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ffile.cpp

 
 $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
 
 $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\file.cpp

 
 $(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
 
 $(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileback.cpp

 
 $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
 
 $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileconf.cpp

 
 $(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp
 
 $(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filefn.cpp

 
 $(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp
 
 $(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filename.cpp

 
 $(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
 
 $(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filesys.cpp

 
 $(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp
 
 $(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtall.cpp

 
 $(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
 
 $(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtfind.cpp

 
 $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 
 $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp

 
 $(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
 
 $(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp

 
 $(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 
 $(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp

 
 $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
 
 $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hash.cpp

 
 $(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp
 
 $(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hashmap.cpp

 
 $(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp
 
 $(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\init.cpp

 
 $(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp
 
 $(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\intl.cpp

 
 $(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 
 $(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp

 
 $(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp
 
 $(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp

 
 $(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp
 
 $(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\log.cpp

 
 $(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp
 
 $(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\longlong.cpp

 
 $(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp
 
 $(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\memory.cpp

 
 $(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp
 
 $(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp

 
 $(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp
 
 $(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\module.cpp

 
 $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
 
 $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp

 
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
 
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp

 
 $(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp
 
 $(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\platinfo.cpp

 
 $(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
 
 $(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\powercmn.cpp

 
 $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
 
 $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\process.cpp

 
 $(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp
 
 $(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\regex.cpp

 
 $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 
 $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp

 
 $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
 
 $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
+
+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp

 
 $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 
 $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp

 
 $(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp
 
 $(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strconv.cpp

 
 $(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp
 
 $(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stream.cpp

 
 $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
 
 $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\string.cpp
+
+$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+
+$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringops.cpp
+
+$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strvararg.cpp

 
 $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
 
 $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sysopt.cpp

 
 $(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
 
 $(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp

 
 $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
 
 $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textbuf.cpp

 
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
 
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
+
+$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
+
+$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp

 
 $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 
 $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp

 
 $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 
 $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+
+$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\unichar.cpp

 
 $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
 
 $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
+
+$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp

 
 $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
 
 $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp

 
 $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
 
 $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wfstream.cpp
+
+$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp

 
 

-$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+
+$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp

 
 $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
 
 $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp

 
 $(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
 
 $(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp

 
 $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 
 $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp

 
 $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
 
 $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp

 
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp

 
 $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
 
 $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp

 
 $(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp
 
 $(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp

 
 $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
 
 $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dde.cpp

 
 $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
 
 $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dir.cpp

 
 $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 
 $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

 
 $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
 
 $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp

 
 $(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp
 
 $(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\power.cpp

 
 $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
 
 $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\regconf.cpp

 
 $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp
 
 $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\registry.cpp

 
 $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
 
 $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp

 
 $(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
 
 $(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp

 
 $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
 
 $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp

 
 $(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
 
 $(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\thread.cpp
+
+$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\timer.cpp

 
 $(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
 
 $(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utils.cpp

 
 $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp

 
 $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\volume.cpp

 
 $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp

 
 $(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
 
 $(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcall.cpp

 
 $(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp
 
 $(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcfind.cpp

 
 $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
 
 $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\archive.cpp
+
+$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
+
+$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\base64.cpp

 
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
 
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\clntdata.cpp

 
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
 
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\cmdline.cpp

 
 $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
 
 $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\config.cpp

 
 $(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
 
 $(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\convauto.cpp

 
 $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
 
 $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
+
+$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp

 
 $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
 
 $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp

 
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
 
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp

 
 $(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
 
 $(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp

 
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
 
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp

 
 $(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp
 
 $(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynload.cpp

 
 $(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp
 
 $(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\encconv.cpp
+
+$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp

 
 $(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c
 
 $(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c

-       $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $**
+       $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) ..\..\src\common\extended.c

 
 $(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
 
 $(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ffile.cpp

 
 $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
 
 $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\file.cpp

 
 $(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
 
 $(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileback.cpp

 
 $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
 
 $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileconf.cpp

 
 $(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp
 
 $(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filefn.cpp

 
 $(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp
 
 $(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filename.cpp

 
 $(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
 
 $(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filesys.cpp

 
 $(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp
 
 $(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtall.cpp

 
 $(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
 
 $(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtfind.cpp

 
 $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 
 $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp

 
 $(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
 
 $(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp

 
 $(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 
 $(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp

 
 $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
 
 $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hash.cpp

 
 $(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp
 
 $(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hashmap.cpp

 
 $(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp
 
 $(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\init.cpp

 
 $(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp
 
 $(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\intl.cpp

 
 $(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 
 $(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp

 
 $(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp
 
 $(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp

 
 $(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp
 
 $(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\log.cpp

 
 $(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp
 
 $(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\longlong.cpp

 
 $(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp
 
 $(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\memory.cpp

 
 $(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
 
 $(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp

 
 $(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp
 
 $(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\module.cpp

 
 $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
 
 $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp

 
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
 
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp

 
 $(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp
 
 $(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\platinfo.cpp

 
 $(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
 
 $(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\powercmn.cpp

 
 $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
 
 $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\process.cpp

 
 $(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp
 
 $(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\regex.cpp

 
 $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 
 $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp

 
 $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
 
 $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
+
+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp

 
 $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
 
 $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp

 
 $(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp
 
 $(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strconv.cpp

 
 $(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp
 
 $(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stream.cpp

 
 $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
 
 $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\string.cpp
+
+$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+
+$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringops.cpp
+
+$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strvararg.cpp

 
 $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
 
 $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sysopt.cpp

 
 $(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
 
 $(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp

 
 $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
 
 $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textbuf.cpp

 
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
 
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
+
+$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
+
+$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp

 
 $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 
 $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp

 
 $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 
 $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+
+$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\unichar.cpp

 
 $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
 
 $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
+
+$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp

 
 $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
 
 $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp

 
 $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
 
 $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
+
+$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp

 
 

-$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+
+$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp

 
 $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
 
 $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp

 
 $(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
 
 $(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp

 
 $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
 
 $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp

 
 $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
 
 $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp

 
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp

 
 $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
 
 $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp

 
 $(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp
 
 $(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp

 
 $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
 
 $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dde.cpp

 
 $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
 
 $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dir.cpp

 
 $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 
 $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

 
 $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
 
 $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp

 
 $(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp
 
 $(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\power.cpp

 
 $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
 
 $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\regconf.cpp

 
 $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp
 
 $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\registry.cpp

 
 $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
 
 $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp

 
 $(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
 
 $(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp

 
 $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
 
 $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp

 
 $(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
 
 $(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\thread.cpp
+
+$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\timer.cpp

 
 $(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
 
 $(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utils.cpp

 
 $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp

 
 $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\volume.cpp

 
 $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc

 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp

 
 $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
 
 $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\ftp.cpp

 
 $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
 
 $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\http.cpp

 
 $(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp
 
 $(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\protocol.cpp

 
 $(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp
 
 $(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp

 
 $(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp
 
 $(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckfile.cpp

 
 $(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp
 
 $(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckipc.cpp

 
 $(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp
 
 $(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp

 
 $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
 
 $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\socket.cpp

 
 $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
 
 $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp

 
 

-$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp

 
 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp

 
 $(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 
 $(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp

 
 $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
 
 $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\ftp.cpp

 
 $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
 
 $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\http.cpp

 
 $(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp
 
 $(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\protocol.cpp

 
 $(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
 
 $(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp

 
 $(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp
 
 $(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp

 
 $(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp
 
 $(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp

 
 $(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
 
 $(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp

 
 $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
 
 $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\socket.cpp

 
 $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
 
 $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp

 
 

-$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp

 
 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 
 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp

 
 $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc

 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
+
+$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp

 
 $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp

 
 $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
 
 $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp

 
 $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp

 
 $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
 
 $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp

 
 $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 
 $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp

 
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
 
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp

 
 

-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp

 
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp

 
 $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
 
 $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp

 
 $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp

 
 $(OBJS)\coredll_metafile.obj: ..\..\src\msw\metafile.cpp
 
 $(OBJS)\coredll_metafile.obj: ..\..\src\msw\metafile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\metafile.cpp

 
 $(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 
 $(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp

 
 $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 
 $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+
+$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp

 
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

 
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

 
 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp

 
 

-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp

 
 

-$(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp

 
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp

 
 $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp

 
 $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp

 
 $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp

 
 $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp

 
 $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp

 
 $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
 
 $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp

 
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp

 
 $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp

 
 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp

 
 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp

 
 $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
 
 $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp

 
 $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp

 
 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp

 
 

-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp

 
 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp

 
 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
 
 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp

 
 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp

 
 $(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
 
 $(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp

 
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp

 
 $(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp
 
 $(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp

 
 $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
 
 $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp

 
 $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
 
 $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif

 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bitmap.obj: ..\..\src\msw\bitmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bitmap.obj: ..\..\src\msw\bitmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_caret.obj: ..\..\src\msw\caret.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_caret.obj: ..\..\src\msw\caret.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_colour.obj: ..\..\src\msw\colour.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_colour.obj: ..\..\src\msw\colour.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cursor.obj: ..\..\src\msw\cursor.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cursor.obj: ..\..\src\msw\cursor.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_data.obj: ..\..\src\msw\data.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_data.obj: ..\..\src\msw\data.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dc.obj: ..\..\src\msw\dc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dc.obj: ..\..\src\msw\dc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcclient.obj: ..\..\src\msw\dcclient.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcclient.obj: ..\..\src\msw\dcclient.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcprint.obj: ..\..\src\msw\dcprint.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcprint.obj: ..\..\src\msw\dcprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dialup.obj: ..\..\src\msw\dialup.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dialup.obj: ..\..\src\msw\dialup.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp

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

-$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp

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

-$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\univ\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\univ\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_accel.obj: ..\..\src\msw\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_accel.obj: ..\..\src\msw\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_accel.obj: ..\..\src\generic\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_accel.obj: ..\..\src\generic\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_button.obj: ..\..\src\msw\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_button.obj: ..\..\src\msw\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_button.obj: ..\..\src\univ\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_button.obj: ..\..\src\univ\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checkbox.obj: ..\..\src\msw\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checkbox.obj: ..\..\src\msw\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_choice.obj: ..\..\src\univ\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_choice.obj: ..\..\src\univ\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_combobox.obj: ..\..\src\msw\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_combobox.obj: ..\..\src\msw\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_combobox.obj: ..\..\src\univ\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_combobox.obj: ..\..\src\univ\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_control.obj: ..\..\src\msw\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_control.obj: ..\..\src\msw\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_control.obj: ..\..\src\univ\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_control.obj: ..\..\src\univ\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_dialog.obj: ..\..\src\msw\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_dialog.obj: ..\..\src\msw\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_listbox.obj: ..\..\src\univ\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_listbox.obj: ..\..\src\univ\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listctrl.obj: ..\..\src\msw\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listctrl.obj: ..\..\src\msw\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_listctrl.obj: ..\..\src\generic\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_listctrl.obj: ..\..\src\generic\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_menu.obj: ..\..\src\msw\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_menu.obj: ..\..\src\msw\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_menu.obj: ..\..\src\univ\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_menu.obj: ..\..\src\univ\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_notebook.obj: ..\..\src\msw\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_notebook.obj: ..\..\src\msw\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_notebook.obj: ..\..\src\univ\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_notebook.obj: ..\..\src\univ\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_radiobox.obj: ..\..\src\msw\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_radiobox.obj: ..\..\src\msw\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_radiobox.obj: ..\..\src\univ\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_radiobox.obj: ..\..\src\univ\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_radiobut.obj: ..\..\src\msw\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_radiobut.obj: ..\..\src\msw\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_radiobut.obj: ..\..\src\univ\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_radiobut.obj: ..\..\src\univ\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statbmp.obj: ..\..\src\msw\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statbmp.obj: ..\..\src\msw\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statbmp.obj: ..\..\src\univ\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statbmp.obj: ..\..\src\univ\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statbox.obj: ..\..\src\msw\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statbox.obj: ..\..\src\msw\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statbox.obj: ..\..\src\univ\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statbox.obj: ..\..\src\univ\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statline.obj: ..\..\src\msw\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statline.obj: ..\..\src\msw\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statline.obj: ..\..\src\univ\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_statline.obj: ..\..\src\univ\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_stattext.obj: ..\..\src\msw\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_stattext.obj: ..\..\src\msw\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docmdi.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docview.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp

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

-$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

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

-$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\framecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\geometry.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagall.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\image.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagfill.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imaggif.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpng.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtga.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\layout.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp

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

-$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stockitem.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp

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

-$(OBJS)\coredll_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\treebase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\validate.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp

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

-$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp

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

-$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp

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

-$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp

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

-$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp

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

-$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp

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

-$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp

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

-$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp

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

-$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp

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

-$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\renderg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\selstore.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\splitter.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp

 !endif
 
 $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
 !endif
 
 $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
 
 $(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\event.cpp

 
 $(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
 
 $(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp

 
 $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
 
 $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\msgout.cpp

 
 $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 
 $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp

 
 $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp
 
 $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp

 
 $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
 
 $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp

 
 $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
 
 $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+
+$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp

 
 $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
 
 $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp

 
 $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
 
 $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp

 
 $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 
 $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp

 
 $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp
 
 $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp

 
 $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 
 $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp

 
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
 
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp

 
 

-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp

 
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
 
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp

 
 $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
 
 $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp

 
 $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
 
 $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp

 
 $(OBJS)\corelib_metafile.obj: ..\..\src\msw\metafile.cpp
 
 $(OBJS)\corelib_metafile.obj: ..\..\src\msw\metafile.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\metafile.cpp

 
 $(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 
 $(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp

 
 $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 
 $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+
+$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp

 
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

 
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

 
 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 
 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp

 
 

-$(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp

 
 

-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp

 
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp

 
 $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
 
 $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp

 
 $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
 
 $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp

 
 $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
 
 $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp

 
 $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
 
 $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp

 
 $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
 
 $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp

 
 $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
 
 $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp

 
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp

 
 $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp

 
 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
 
 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp

 
 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
 
 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp

 
 $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
 
 $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp

 
 $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 
 $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp

 
 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 
 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp

 
 

-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp

 
 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp

 
 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
 
 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp

 
 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 
 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp

 
 $(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
 
 $(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp

 
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp

 
 $(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp
 
 $(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp

 
 $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
 
 $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp

 
 $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
 
 $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif

 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bitmap.obj: ..\..\src\msw\bitmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bitmap.obj: ..\..\src\msw\bitmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_caret.obj: ..\..\src\msw\caret.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_caret.obj: ..\..\src\msw\caret.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_colour.obj: ..\..\src\msw\colour.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_colour.obj: ..\..\src\msw\colour.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cursor.obj: ..\..\src\msw\cursor.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cursor.obj: ..\..\src\msw\cursor.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_data.obj: ..\..\src\msw\data.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_data.obj: ..\..\src\msw\data.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dc.obj: ..\..\src\msw\dc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dc.obj: ..\..\src\msw\dc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcclient.obj: ..\..\src\msw\dcclient.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcclient.obj: ..\..\src\msw\dcclient.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcprint.obj: ..\..\src\msw\dcprint.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcprint.obj: ..\..\src\msw\dcprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dialup.obj: ..\..\src\msw\dialup.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dialup.obj: ..\..\src\msw\dialup.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontenum.obj: ..\..\src\msw\fontenum.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontenum.obj: ..\..\src\msw\fontenum.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontutil.obj: ..\..\src\msw\fontutil.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontutil.obj: ..\..\src\msw\fontutil.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp

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

-$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp

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

-$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\univ\statusbr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\univ\statusbr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_accel.obj: ..\..\src\msw\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_accel.obj: ..\..\src\msw\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_accel.obj: ..\..\src\generic\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_accel.obj: ..\..\src\generic\accel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_button.obj: ..\..\src\msw\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_button.obj: ..\..\src\msw\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_button.obj: ..\..\src\univ\button.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_button.obj: ..\..\src\univ\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checkbox.obj: ..\..\src\msw\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checkbox.obj: ..\..\src\msw\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_choice.obj: ..\..\src\univ\choice.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_choice.obj: ..\..\src\univ\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_combobox.obj: ..\..\src\msw\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_combobox.obj: ..\..\src\msw\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_combobox.obj: ..\..\src\univ\combobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_combobox.obj: ..\..\src\univ\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_control.obj: ..\..\src\msw\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_control.obj: ..\..\src\msw\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_control.obj: ..\..\src\univ\control.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_control.obj: ..\..\src\univ\control.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_dialog.obj: ..\..\src\msw\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_dialog.obj: ..\..\src\msw\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_listbox.obj: ..\..\src\univ\listbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_listbox.obj: ..\..\src\univ\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listctrl.obj: ..\..\src\msw\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listctrl.obj: ..\..\src\msw\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_listctrl.obj: ..\..\src\generic\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_listctrl.obj: ..\..\src\generic\listctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_menu.obj: ..\..\src\msw\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_menu.obj: ..\..\src\msw\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_menu.obj: ..\..\src\univ\menu.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_menu.obj: ..\..\src\univ\menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_notebook.obj: ..\..\src\msw\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_notebook.obj: ..\..\src\msw\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_notebook.obj: ..\..\src\univ\notebook.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_notebook.obj: ..\..\src\univ\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_radiobox.obj: ..\..\src\msw\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_radiobox.obj: ..\..\src\msw\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_radiobox.obj: ..\..\src\univ\radiobox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_radiobox.obj: ..\..\src\univ\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_radiobut.obj: ..\..\src\msw\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_radiobut.obj: ..\..\src\msw\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_radiobut.obj: ..\..\src\univ\radiobut.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_radiobut.obj: ..\..\src\univ\radiobut.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statbmp.obj: ..\..\src\msw\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statbmp.obj: ..\..\src\msw\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statbmp.obj: ..\..\src\univ\statbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statbmp.obj: ..\..\src\univ\statbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statbox.obj: ..\..\src\msw\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statbox.obj: ..\..\src\msw\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statbox.obj: ..\..\src\univ\statbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statbox.obj: ..\..\src\univ\statbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statline.obj: ..\..\src\msw\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statline.obj: ..\..\src\msw\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statline.obj: ..\..\src\univ\statline.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_statline.obj: ..\..\src\univ\statline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_stattext.obj: ..\..\src\msw\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_stattext.obj: ..\..\src\msw\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artprov.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmndata.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\containr.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cshelp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docmdi.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docview.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp

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

-$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

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

-$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmap.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\framecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\geometry.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagall.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\image.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagfill.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imaggif.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpng.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtga.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\layout.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stockitem.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp

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

-$(OBJS)\corelib_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\treebase.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valgen.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\validate.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp

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

-$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp

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

-$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp

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

-$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp

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

-$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp

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

-$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp

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

-$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp

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

-$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp

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

-$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp

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

-$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\renderg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\selstore.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\splitter.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp

 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp

 !endif
 
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 !endif
 
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+
+$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp

 
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp

 
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp

 
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp

 
 

-$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp

 
 

-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp

 
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp

 
 

-$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp

 
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
 
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp

 
 $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
 
 $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+
+$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp

 
 $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
 
 $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grid.cpp

 
 $(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
 
 $(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+
+$(OBJS)\advdll_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp

 
 $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
 
 $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp

 
 $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
 
 $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\helpext.cpp

 
 

-$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp

 
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
 
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
+
+$(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp

 
 $(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
 
 $(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp

 
 $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
 
 $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp

 
 $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
 
 $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp

 
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
 
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp

 
 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 
 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

 
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp

 
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp

 
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp

 
 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
 
 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp

 
 $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 
 $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp

 
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp

 
 $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp

 
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp

 
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp

 
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp

 
 

-$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp

 
 

-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp

 
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp

 
 

-$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp

 
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
 
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp

 
 $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
 
 $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+
+$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp

 
 $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
 
 $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grid.cpp

 
 $(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
 
 $(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+
+$(OBJS)\advlib_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp

 
 $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
 
 $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp

 
 $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
 
 $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp

 
 

-$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp

 
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
 
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
+
+$(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp

 
 $(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
 
 $(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp

 
 $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
 
 $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp

 
 $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
 
 $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp

 
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
 
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp

 
 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 
 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

 
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp

 
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp

 
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp

 
 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
 
 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp

 
 $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 
 $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp

 
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
 
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp

 
 $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc

 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

 
 $(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 
 $(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp

 
 $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 
 $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp

 
 $(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 
 $(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp

 
 $(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 
 $(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

 
 $(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 
 $(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp

 
 $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 
 $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp

 
 $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 
 $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
-
-$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
-
-$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
-
-$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp

 
 $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc

 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp

 
 $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
 
 $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp

 
 $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp
 
 $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdata.cpp

 
 $(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
 
 $(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp

 
 $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
 
 $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp

 
 $(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
 
 $(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp

 
 $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
 
 $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp

 
 $(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
 
 $(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp

 
 $(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp
 
 $(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp

 
 $(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp
 
 $(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmltag.cpp

 
 $(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp
 
 $(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp

 
 $(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp
 
 $(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmprint.cpp

 
 $(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp
 
 $(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp

 
 $(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp
 
 $(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp

 
 $(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp
 
 $(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_hline.cpp

 
 $(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp
 
 $(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_image.cpp

 
 $(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp
 
 $(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_layout.cpp

 
 $(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp
 
 $(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_links.cpp

 
 $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp
 
 $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_list.cpp

 
 $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp
 
 $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp

 
 $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp
 
 $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp

 
 $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp
 
 $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp

 
 $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp
 
 $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp

 
 $(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 
 $(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp

 
 $(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
 
 $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp

 
 $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
 
 $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp

 
 $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp
 
 $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp

 
 $(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
 
 $(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp

 
 $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
 
 $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp

 
 $(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
 
 $(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp

 
 $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
 
 $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp

 
 $(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
 
 $(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp

 
 $(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
 
 $(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp

 
 $(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp
 
 $(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp

 
 $(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
 
 $(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp

 
 $(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp
 
 $(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp

 
 $(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
 
 $(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp

 
 $(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
 
 $(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp

 
 $(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp
 
 $(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp

 
 $(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp
 
 $(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_image.cpp

 
 $(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp
 
 $(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp

 
 $(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp
 
 $(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_links.cpp

 
 $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp
 
 $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_list.cpp

 
 $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp
 
 $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp

 
 $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp
 
 $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp

 
 $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp
 
 $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp

 
 $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
 
 $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp

 
 $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 
 $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp

 
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc

 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp

 
 $(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 
 $(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

 
 $(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 
 $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp

 
 $(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 
 $(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

 
 $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc

 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp

 
 $(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
 
 $(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\common\xtixml.cpp

 
 $(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
 
 $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\xml\xml.cpp

 
 $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
 
 $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp

 
 $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc

 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

 
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

 
 $(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
 
 $(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp

 
 $(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
 
 $(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp

 
 $(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
 
 $(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp

 
 $(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
 
 $(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp

 
 $(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
 
 $(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp

 
 $(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
 
 $(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp

 
 $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
 
 $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp

 
 $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 
 $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp

 
 $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 
 $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp

 
 $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 
 $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp

 
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+
+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp

 
 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

 
 $(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 
 $(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp

 
 $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 
 $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp

 
 

-$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp

 
 

-$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp

 
 $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 
 $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp

 
 $(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
 
 $(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+
+$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp

 
 $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
 
 $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp

 
 $(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
 
 $(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp

 
 $(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 
 $(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp

 
 $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
 
 $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp

 
 $(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
 
 $(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp

 
 $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
 
 $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp

 
 $(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 
 $(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp

 
 $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
 
 $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp

 
 $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
 
 $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp

 
 $(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
 
 $(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp

 
 $(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
 
 $(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp

 
 $(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
 
 $(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+
+$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp

 
 $(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
 
 $(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp

 
 $(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
 
 $(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp

 
 $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 
 $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp

 
 $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 
 $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp

 
 $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
 
 $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp

 
 $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 
 $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

 
 $(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
 
 $(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp

 
 $(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
 
 $(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp

 
 $(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
 
 $(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+
+$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp

 
 $(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
 
 $(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp

 
 $(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
 
 $(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp

 
 $(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
 
 $(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp

 
 $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 
 $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp

 
 $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 
 $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp

 
 $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 
 $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp

 
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp

 
 $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 
 $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp

 
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp

 
 $(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
 
 $(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp

 
 $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
 
 $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp

 
 $(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
 
 $(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp

 
 $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
 
 $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+
+$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp

 
 $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 
 $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

 
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

 
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

 
 $(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
 
 $(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp

 
 $(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
 
 $(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp

 
 $(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
 
 $(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp

 
 $(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
 
 $(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp

 
 $(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
 
 $(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp

 
 $(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
 
 $(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp

 
 $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
 
 $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp

 
 $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 
 $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp

 
 $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 
 $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp

 
 $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 
 $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp

 
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+
+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp

 
 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

 
 $(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 
 $(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp

 
 $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 
 $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp

 
 

-$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp

 
 

-$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp

 
 $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 
 $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp

 
 $(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
 
 $(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+
+$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp

 
 $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
 
 $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp

 
 $(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
 
 $(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp

 
 $(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 
 $(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp

 
 $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
 
 $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp

 
 $(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
 
 $(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp

 
 $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
 
 $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp

 
 $(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 
 $(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp

 
 $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
 
 $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp

 
 $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
 
 $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp

 
 $(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
 
 $(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp

 
 $(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
 
 $(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp

 
 $(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
 
 $(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+
+$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp

 
 $(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
 
 $(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp

 
 $(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
 
 $(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp

 
 $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 
 $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp

 
 $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 
 $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp

 
 $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
 
 $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp

 
 $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 
 $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

 
 $(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
 
 $(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp

 
 $(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
 
 $(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp

 
 $(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
 
 $(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+
+$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp

 
 $(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
 
 $(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp

 
 $(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
 
 $(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp

 
 $(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
 
 $(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp

 
 $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 
 $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp

 
 $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 
 $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp

 
 $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 
 $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp

 
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp

 
 $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 
 $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp

 
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp

 
 $(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
 
 $(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp

 
 $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
 
 $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp

 
 $(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
 
 $(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp

 
 $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
 
 $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+
+$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp

 
 $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 
 $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

 
 $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc

 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp

 
 $(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp
 
 $(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\dockart.cpp

 
 $(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 
 $(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp

 
 $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
 
 $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
+
+$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp

 
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp

 
 $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp
 
 $(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp

 
 $(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp
 
 $(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\dockart.cpp

 
 $(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 
 $(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp

 
 $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
 
 $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
+
+$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp

 
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+
+$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+
+$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
+$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
+$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+
+$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
+
+$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp

 
 $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc

 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp

 
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp

 
 $(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
 
 $(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp

 
 $(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp

 
 $(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 
 $(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp

 
 $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp

 
 $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 
 $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp

 
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp

 
 $(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp

 
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 
 $(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp

 
 $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 
 $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp

 
 $(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
 
 $(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp

 
 $(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp

 
 $(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 
 $(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp

 
 $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp

 
 $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 
 $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp

 
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp

 
 $(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+
+$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
+
+$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
+
+$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+
+$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
+
+$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
+
+$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+
+$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp

 
 $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
+
+$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp

 
 $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
 
 $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\msw\glcanvas.cpp

 
 $(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp
 
 $(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\common\glcmn.cpp

 
 $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
 
 $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\msw\glcanvas.cpp