simplify code setting backing pixmap

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 2fbecaa7b95243e075f6f63bd88c43aa063a71c8..7d4083cd0e3eb524d364d00713d63e378c76a18f 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,1877 +1,2876 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.8 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
-       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_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)" \
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
-COMPILER_PREFIX = vc
-OBJS = \
-       $(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_10)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+!include <config.vc>\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
+       TOOLKIT="$(TOOLKIT)" TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
+       USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
+WX_RELEASE_NODOT = 29\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5\r
+COMPILER_PREFIX = vc\r
+OBJS = \\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)\r
+LIBDIRNAME = \\r
+       ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+SETUPHDIR = \\r
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\include \\r
+       /I$(SETUPHDIR) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
-WXREGEX_OBJECTS =  \
-       $(OBJS)\wxregex_regcomp.obj \
-       $(OBJS)\wxregex_regexec.obj \
-       $(OBJS)\wxregex_regerror.obj \
-       $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS)
-WXZLIB_OBJECTS =  \
-       $(OBJS)\wxzlib_adler32.obj \
-       $(OBJS)\wxzlib_compress.obj \
-       $(OBJS)\wxzlib_crc32.obj \
-       $(OBJS)\wxzlib_gzio.obj \
-       $(OBJS)\wxzlib_uncompr.obj \
-       $(OBJS)\wxzlib_deflate.obj \
-       $(OBJS)\wxzlib_trees.obj \
-       $(OBJS)\wxzlib_zutil.obj \
-       $(OBJS)\wxzlib_inflate.obj \
-       $(OBJS)\wxzlib_infback.obj \
-       $(OBJS)\wxzlib_inftrees.obj \
-       $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \
-       $(CFLAGS)
-WXPNG_OBJECTS =  \
-       $(OBJS)\wxpng_png.obj \
-       $(OBJS)\wxpng_pngerror.obj \
-       $(OBJS)\wxpng_pnggccrd.obj \
-       $(OBJS)\wxpng_pngget.obj \
-       $(OBJS)\wxpng_pngmem.obj \
-       $(OBJS)\wxpng_pngpread.obj \
-       $(OBJS)\wxpng_pngread.obj \
-       $(OBJS)\wxpng_pngrio.obj \
-       $(OBJS)\wxpng_pngrtran.obj \
-       $(OBJS)\wxpng_pngrutil.obj \
-       $(OBJS)\wxpng_pngset.obj \
-       $(OBJS)\wxpng_pngtrans.obj \
-       $(OBJS)\wxpng_pngvcrd.obj \
-       $(OBJS)\wxpng_pngwio.obj \
-       $(OBJS)\wxpng_pngwrite.obj \
-       $(OBJS)\wxpng_pngwtran.obj \
-       $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \
-       $(CFLAGS)
-WXJPEG_OBJECTS =  \
-       $(OBJS)\wxjpeg_jcomapi.obj \
-       $(OBJS)\wxjpeg_jutils.obj \
-       $(OBJS)\wxjpeg_jerror.obj \
-       $(OBJS)\wxjpeg_jmemmgr.obj \
-       $(OBJS)\wxjpeg_jmemnobs.obj \
-       $(OBJS)\wxjpeg_jcapimin.obj \
-       $(OBJS)\wxjpeg_jcapistd.obj \
-       $(OBJS)\wxjpeg_jctrans.obj \
-       $(OBJS)\wxjpeg_jcparam.obj \
-       $(OBJS)\wxjpeg_jdatadst.obj \
-       $(OBJS)\wxjpeg_jcinit.obj \
-       $(OBJS)\wxjpeg_jcmaster.obj \
-       $(OBJS)\wxjpeg_jcmarker.obj \
-       $(OBJS)\wxjpeg_jcmainct.obj \
-       $(OBJS)\wxjpeg_jcprepct.obj \
-       $(OBJS)\wxjpeg_jccoefct.obj \
-       $(OBJS)\wxjpeg_jccolor.obj \
-       $(OBJS)\wxjpeg_jcsample.obj \
-       $(OBJS)\wxjpeg_jchuff.obj \
-       $(OBJS)\wxjpeg_jcphuff.obj \
-       $(OBJS)\wxjpeg_jcdctmgr.obj \
-       $(OBJS)\wxjpeg_jfdctfst.obj \
-       $(OBJS)\wxjpeg_jfdctflt.obj \
-       $(OBJS)\wxjpeg_jfdctint.obj \
-       $(OBJS)\wxjpeg_jdapimin.obj \
-       $(OBJS)\wxjpeg_jdapistd.obj \
-       $(OBJS)\wxjpeg_jdtrans.obj \
-       $(OBJS)\wxjpeg_jdatasrc.obj \
-       $(OBJS)\wxjpeg_jdmaster.obj \
-       $(OBJS)\wxjpeg_jdinput.obj \
-       $(OBJS)\wxjpeg_jdmarker.obj \
-       $(OBJS)\wxjpeg_jdhuff.obj \
-       $(OBJS)\wxjpeg_jdphuff.obj \
-       $(OBJS)\wxjpeg_jdmainct.obj \
-       $(OBJS)\wxjpeg_jdcoefct.obj \
-       $(OBJS)\wxjpeg_jdpostct.obj \
-       $(OBJS)\wxjpeg_jddctmgr.obj \
-       $(OBJS)\wxjpeg_jidctfst.obj \
-       $(OBJS)\wxjpeg_jidctflt.obj \
-       $(OBJS)\wxjpeg_jidctint.obj \
-       $(OBJS)\wxjpeg_jidctred.obj \
-       $(OBJS)\wxjpeg_jdsample.obj \
-       $(OBJS)\wxjpeg_jdcolor.obj \
-       $(OBJS)\wxjpeg_jquant1.obj \
-       $(OBJS)\wxjpeg_jquant2.obj \
-       $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \
-       /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
-WXTIFF_OBJECTS =  \
-       $(OBJS)\wxtiff_tif_win32.obj \
-       $(OBJS)\wxtiff_tif_aux.obj \
-       $(OBJS)\wxtiff_tif_close.obj \
-       $(OBJS)\wxtiff_tif_codec.obj \
-       $(OBJS)\wxtiff_tif_color.obj \
-       $(OBJS)\wxtiff_tif_compress.obj \
-       $(OBJS)\wxtiff_tif_dir.obj \
-       $(OBJS)\wxtiff_tif_dirinfo.obj \
-       $(OBJS)\wxtiff_tif_dirread.obj \
-       $(OBJS)\wxtiff_tif_dirwrite.obj \
-       $(OBJS)\wxtiff_tif_dumpmode.obj \
-       $(OBJS)\wxtiff_tif_error.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_luv.obj \
-       $(OBJS)\wxtiff_tif_lzw.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_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_warning.obj \
-       $(OBJS)\wxtiff_tif_write.obj \
-       $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
-WXEXPAT_OBJECTS =  \
-       $(OBJS)\wxexpat_xmlparse.obj \
-       $(OBJS)\wxexpat_xmlrole.obj \
-       $(OBJS)\wxexpat_xmltok.obj
-WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
+WXREGEX_OBJECTS =  \\r
+       $(OBJS)\wxregex_regcomp.obj \\r
+       $(OBJS)\wxregex_regexec.obj \\r
+       $(OBJS)\wxregex_regerror.obj \\r
+       $(OBJS)\wxregex_regfree.obj\r
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)\r
+WXZLIB_OBJECTS =  \\r
+       $(OBJS)\wxzlib_adler32.obj \\r
+       $(OBJS)\wxzlib_compress.obj \\r
+       $(OBJS)\wxzlib_crc32.obj \\r
+       $(OBJS)\wxzlib_gzio.obj \\r
+       $(OBJS)\wxzlib_uncompr.obj \\r
+       $(OBJS)\wxzlib_deflate.obj \\r
+       $(OBJS)\wxzlib_trees.obj \\r
+       $(OBJS)\wxzlib_zutil.obj \\r
+       $(OBJS)\wxzlib_inflate.obj \\r
+       $(OBJS)\wxzlib_infback.obj \\r
+       $(OBJS)\wxzlib_inftrees.obj \\r
+       $(OBJS)\wxzlib_inffast.obj\r
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \\r
+       $(CPPFLAGS) $(CFLAGS)\r
+WXPNG_OBJECTS =  \\r
+       $(OBJS)\wxpng_png.obj \\r
+       $(OBJS)\wxpng_pngerror.obj \\r
+       $(OBJS)\wxpng_pngget.obj \\r
+       $(OBJS)\wxpng_pngmem.obj \\r
+       $(OBJS)\wxpng_pngpread.obj \\r
+       $(OBJS)\wxpng_pngread.obj \\r
+       $(OBJS)\wxpng_pngrio.obj \\r
+       $(OBJS)\wxpng_pngrtran.obj \\r
+       $(OBJS)\wxpng_pngrutil.obj \\r
+       $(OBJS)\wxpng_pngset.obj \\r
+       $(OBJS)\wxpng_pngtrans.obj \\r
+       $(OBJS)\wxpng_pngwio.obj \\r
+       $(OBJS)\wxpng_pngwrite.obj \\r
+       $(OBJS)\wxpng_pngwtran.obj \\r
+       $(OBJS)\wxpng_pngwutil.obj\r
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(SETUPHDIR) \\r
+       $(CPPFLAGS) $(CFLAGS)\r
+WXJPEG_OBJECTS =  \\r
+       $(OBJS)\wxjpeg_jcomapi.obj \\r
+       $(OBJS)\wxjpeg_jutils.obj \\r
+       $(OBJS)\wxjpeg_jerror.obj \\r
+       $(OBJS)\wxjpeg_jmemmgr.obj \\r
+       $(OBJS)\wxjpeg_jmemnobs.obj \\r
+       $(OBJS)\wxjpeg_jcapimin.obj \\r
+       $(OBJS)\wxjpeg_jcapistd.obj \\r
+       $(OBJS)\wxjpeg_jctrans.obj \\r
+       $(OBJS)\wxjpeg_jcparam.obj \\r
+       $(OBJS)\wxjpeg_jdatadst.obj \\r
+       $(OBJS)\wxjpeg_jcinit.obj \\r
+       $(OBJS)\wxjpeg_jcmaster.obj \\r
+       $(OBJS)\wxjpeg_jcmarker.obj \\r
+       $(OBJS)\wxjpeg_jcmainct.obj \\r
+       $(OBJS)\wxjpeg_jcprepct.obj \\r
+       $(OBJS)\wxjpeg_jccoefct.obj \\r
+       $(OBJS)\wxjpeg_jccolor.obj \\r
+       $(OBJS)\wxjpeg_jcsample.obj \\r
+       $(OBJS)\wxjpeg_jchuff.obj \\r
+       $(OBJS)\wxjpeg_jcphuff.obj \\r
+       $(OBJS)\wxjpeg_jcdctmgr.obj \\r
+       $(OBJS)\wxjpeg_jfdctfst.obj \\r
+       $(OBJS)\wxjpeg_jfdctflt.obj \\r
+       $(OBJS)\wxjpeg_jfdctint.obj \\r
+       $(OBJS)\wxjpeg_jdapimin.obj \\r
+       $(OBJS)\wxjpeg_jdapistd.obj \\r
+       $(OBJS)\wxjpeg_jdtrans.obj \\r
+       $(OBJS)\wxjpeg_jdatasrc.obj \\r
+       $(OBJS)\wxjpeg_jdmaster.obj \\r
+       $(OBJS)\wxjpeg_jdinput.obj \\r
+       $(OBJS)\wxjpeg_jdmarker.obj \\r
+       $(OBJS)\wxjpeg_jdhuff.obj \\r
+       $(OBJS)\wxjpeg_jdphuff.obj \\r
+       $(OBJS)\wxjpeg_jdmainct.obj \\r
+       $(OBJS)\wxjpeg_jdcoefct.obj \\r
+       $(OBJS)\wxjpeg_jdpostct.obj \\r
+       $(OBJS)\wxjpeg_jddctmgr.obj \\r
+       $(OBJS)\wxjpeg_jidctfst.obj \\r
+       $(OBJS)\wxjpeg_jidctflt.obj \\r
+       $(OBJS)\wxjpeg_jidctint.obj \\r
+       $(OBJS)\wxjpeg_jidctred.obj \\r
+       $(OBJS)\wxjpeg_jdsample.obj \\r
+       $(OBJS)\wxjpeg_jdcolor.obj \\r
+       $(OBJS)\wxjpeg_jquant1.obj \\r
+       $(OBJS)\wxjpeg_jquant2.obj \\r
+       $(OBJS)\wxjpeg_jdmerge.obj\r
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \\r
+       $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \\r
+       /I..\..\src\jpeg /I..\..\src\tiff\libtiff /D_CRT_NONSTDC_NO_WARNINGS \\r
+       $(CPPFLAGS) $(CFLAGS)\r
+WXTIFF_OBJECTS =  \\r
+       $(OBJS)\wxtiff_tif_win32.obj \\r
+       $(OBJS)\wxtiff_tif_aux.obj \\r
+       $(OBJS)\wxtiff_tif_close.obj \\r
+       $(OBJS)\wxtiff_tif_codec.obj \\r
+       $(OBJS)\wxtiff_tif_color.obj \\r
+       $(OBJS)\wxtiff_tif_compress.obj \\r
+       $(OBJS)\wxtiff_tif_dir.obj \\r
+       $(OBJS)\wxtiff_tif_dirinfo.obj \\r
+       $(OBJS)\wxtiff_tif_dirread.obj \\r
+       $(OBJS)\wxtiff_tif_dirwrite.obj \\r
+       $(OBJS)\wxtiff_tif_dumpmode.obj \\r
+       $(OBJS)\wxtiff_tif_error.obj \\r
+       $(OBJS)\wxtiff_tif_extension.obj \\r
+       $(OBJS)\wxtiff_tif_fax3.obj \\r
+       $(OBJS)\wxtiff_tif_fax3sm.obj \\r
+       $(OBJS)\wxtiff_tif_flush.obj \\r
+       $(OBJS)\wxtiff_tif_getimage.obj \\r
+       $(OBJS)\wxtiff_tif_jbig.obj \
+       $(OBJS)\wxtiff_tif_jpeg.obj \\r
+       $(OBJS)\wxtiff_tif_jpeg_12.obj \
+       $(OBJS)\wxtiff_tif_luv.obj \\r
+       $(OBJS)\wxtiff_tif_lzma.obj \
+       $(OBJS)\wxtiff_tif_lzw.obj \\r
+       $(OBJS)\wxtiff_tif_next.obj \\r
+       $(OBJS)\wxtiff_tif_ojpeg.obj \\r
+       $(OBJS)\wxtiff_tif_open.obj \\r
+       $(OBJS)\wxtiff_tif_packbits.obj \\r
+       $(OBJS)\wxtiff_tif_pixarlog.obj \\r
+       $(OBJS)\wxtiff_tif_predict.obj \\r
+       $(OBJS)\wxtiff_tif_print.obj \\r
+       $(OBJS)\wxtiff_tif_read.obj \\r
+       $(OBJS)\wxtiff_tif_strip.obj \\r
+       $(OBJS)\wxtiff_tif_swab.obj \\r
+       $(OBJS)\wxtiff_tif_thunder.obj \\r
+       $(OBJS)\wxtiff_tif_tile.obj \\r
+       $(OBJS)\wxtiff_tif_version.obj \\r
+       $(OBJS)\wxtiff_tif_warning.obj \\r
+       $(OBJS)\wxtiff_tif_write.obj \\r
+       $(OBJS)\wxtiff_tif_zip.obj\r
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(LIBDIRNAME) \\r
+       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)\r
+WXEXPAT_OBJECTS =  \\r
+       $(OBJS)\wxexpat_xmlparse.obj \\r
+       $(OBJS)\wxexpat_xmlrole.obj \\r
+       $(OBJS)\wxexpat_xmltok.obj\r
+WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \\r
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \\r
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \\r
+       /I$(SETUPHDIR) /I..\..\include $(__wxscintilla_usingdll_p) \
+       /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__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_116)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__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 /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_116)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+WXSCINTILLA_OBJECTS =  \\r
+       $(OBJS)\wxscintilla_LexA68k.obj \\r
+       $(OBJS)\wxscintilla_LexAbaqus.obj \\r
+       $(OBJS)\wxscintilla_LexAda.obj \\r
+       $(OBJS)\wxscintilla_LexAPDL.obj \\r
+       $(OBJS)\wxscintilla_LexAsm.obj \\r
+       $(OBJS)\wxscintilla_LexAsn1.obj \\r
+       $(OBJS)\wxscintilla_LexASY.obj \\r
+       $(OBJS)\wxscintilla_LexAU3.obj \\r
+       $(OBJS)\wxscintilla_LexAVE.obj \\r
+       $(OBJS)\wxscintilla_LexAVS.obj \\r
+       $(OBJS)\wxscintilla_LexBaan.obj \\r
+       $(OBJS)\wxscintilla_LexBash.obj \\r
+       $(OBJS)\wxscintilla_LexBasic.obj \\r
+       $(OBJS)\wxscintilla_LexBullant.obj \\r
+       $(OBJS)\wxscintilla_LexCaml.obj \\r
+       $(OBJS)\wxscintilla_LexCLW.obj \\r
+       $(OBJS)\wxscintilla_LexCmake.obj \\r
+       $(OBJS)\wxscintilla_LexCOBOL.obj \\r
+       $(OBJS)\wxscintilla_LexCoffeeScript.obj \\r
+       $(OBJS)\wxscintilla_LexConf.obj \\r
+       $(OBJS)\wxscintilla_LexCPP.obj \\r
+       $(OBJS)\wxscintilla_LexCrontab.obj \\r
+       $(OBJS)\wxscintilla_LexCsound.obj \\r
+       $(OBJS)\wxscintilla_LexCSS.obj \\r
+       $(OBJS)\wxscintilla_LexD.obj \\r
+       $(OBJS)\wxscintilla_LexECL.obj \\r
+       $(OBJS)\wxscintilla_LexEiffel.obj \\r
+       $(OBJS)\wxscintilla_LexErlang.obj \\r
+       $(OBJS)\wxscintilla_LexEScript.obj \\r
+       $(OBJS)\wxscintilla_LexFlagship.obj \\r
+       $(OBJS)\wxscintilla_LexForth.obj \\r
+       $(OBJS)\wxscintilla_LexFortran.obj \\r
+       $(OBJS)\wxscintilla_LexGAP.obj \\r
+       $(OBJS)\wxscintilla_LexGui4Cli.obj \\r
+       $(OBJS)\wxscintilla_LexHaskell.obj \\r
+       $(OBJS)\wxscintilla_LexHTML.obj \\r
+       $(OBJS)\wxscintilla_LexInno.obj \\r
+       $(OBJS)\wxscintilla_LexKix.obj \\r
+       $(OBJS)\wxscintilla_LexLisp.obj \\r
+       $(OBJS)\wxscintilla_LexLout.obj \\r
+       $(OBJS)\wxscintilla_LexLua.obj \\r
+       $(OBJS)\wxscintilla_LexMagik.obj \\r
+       $(OBJS)\wxscintilla_LexMarkdown.obj \\r
+       $(OBJS)\wxscintilla_LexMatlab.obj \\r
+       $(OBJS)\wxscintilla_LexMetapost.obj \\r
+       $(OBJS)\wxscintilla_LexMMIXAL.obj \\r
+       $(OBJS)\wxscintilla_LexModula.obj \\r
+       $(OBJS)\wxscintilla_LexMPT.obj \\r
+       $(OBJS)\wxscintilla_LexMSSQL.obj \\r
+       $(OBJS)\wxscintilla_LexMySQL.obj \\r
+       $(OBJS)\wxscintilla_LexNimrod.obj \\r
+       $(OBJS)\wxscintilla_LexNsis.obj \\r
+       $(OBJS)\wxscintilla_LexOpal.obj \\r
+       $(OBJS)\wxscintilla_LexOScript.obj \\r
+       $(OBJS)\wxscintilla_LexOthers.obj \\r
+       $(OBJS)\wxscintilla_LexPascal.obj \\r
+       $(OBJS)\wxscintilla_LexPB.obj \\r
+       $(OBJS)\wxscintilla_LexPerl.obj \\r
+       $(OBJS)\wxscintilla_LexPLM.obj \\r
+       $(OBJS)\wxscintilla_LexPOV.obj \\r
+       $(OBJS)\wxscintilla_LexPowerPro.obj \\r
+       $(OBJS)\wxscintilla_LexPowerShell.obj \\r
+       $(OBJS)\wxscintilla_LexProgress.obj \\r
+       $(OBJS)\wxscintilla_LexPS.obj \\r
+       $(OBJS)\wxscintilla_LexPython.obj \\r
+       $(OBJS)\wxscintilla_LexR.obj \\r
+       $(OBJS)\wxscintilla_LexRebol.obj \\r
+       $(OBJS)\wxscintilla_LexRuby.obj \\r
+       $(OBJS)\wxscintilla_LexScriptol.obj \\r
+       $(OBJS)\wxscintilla_LexSmalltalk.obj \\r
+       $(OBJS)\wxscintilla_LexSML.obj \\r
+       $(OBJS)\wxscintilla_LexSorcus.obj \\r
+       $(OBJS)\wxscintilla_LexSpecman.obj \\r
+       $(OBJS)\wxscintilla_LexSpice.obj \\r
+       $(OBJS)\wxscintilla_LexSQL.obj \\r
+       $(OBJS)\wxscintilla_LexTACL.obj \\r
+       $(OBJS)\wxscintilla_LexTADS3.obj \\r
+       $(OBJS)\wxscintilla_LexTAL.obj \\r
+       $(OBJS)\wxscintilla_LexTCL.obj \\r
+       $(OBJS)\wxscintilla_LexTCMD.obj \\r
+       $(OBJS)\wxscintilla_LexTeX.obj \\r
+       $(OBJS)\wxscintilla_LexTxt2tags.obj \\r
+       $(OBJS)\wxscintilla_LexVB.obj \\r
+       $(OBJS)\wxscintilla_LexVerilog.obj \\r
+       $(OBJS)\wxscintilla_LexVHDL.obj \\r
+       $(OBJS)\wxscintilla_LexVisualProlog.obj \\r
+       $(OBJS)\wxscintilla_LexYAML.obj \\r
+       $(OBJS)\wxscintilla_Accessor.obj \\r
+       $(OBJS)\wxscintilla_CharacterSet.obj \\r
+       $(OBJS)\wxscintilla_LexerBase.obj \\r
+       $(OBJS)\wxscintilla_LexerModule.obj \\r
+       $(OBJS)\wxscintilla_LexerNoExceptions.obj \\r
+       $(OBJS)\wxscintilla_LexerSimple.obj \\r
+       $(OBJS)\wxscintilla_PropSetSimple.obj \\r
+       $(OBJS)\wxscintilla_StyleContext.obj \\r
+       $(OBJS)\wxscintilla_WordList.obj \\r
+       $(OBJS)\wxscintilla_AutoComplete.obj \\r
+       $(OBJS)\wxscintilla_CallTip.obj \\r
+       $(OBJS)\wxscintilla_Catalogue.obj \\r
+       $(OBJS)\wxscintilla_CellBuffer.obj \\r
+       $(OBJS)\wxscintilla_CharClassify.obj \\r
+       $(OBJS)\wxscintilla_ContractionState.obj \\r
+       $(OBJS)\wxscintilla_Decoration.obj \\r
+       $(OBJS)\wxscintilla_Document.obj \\r
+       $(OBJS)\wxscintilla_Editor.obj \\r
+       $(OBJS)\wxscintilla_ExternalLexer.obj \\r
+       $(OBJS)\wxscintilla_Indicator.obj \\r
+       $(OBJS)\wxscintilla_KeyMap.obj \\r
+       $(OBJS)\wxscintilla_LineMarker.obj \\r
+       $(OBJS)\wxscintilla_PerLine.obj \\r
+       $(OBJS)\wxscintilla_PositionCache.obj \\r
+       $(OBJS)\wxscintilla_RESearch.obj \\r
+       $(OBJS)\wxscintilla_RunStyles.obj \\r
+       $(OBJS)\wxscintilla_ScintillaBase.obj \\r
+       $(OBJS)\wxscintilla_Selection.obj \\r
+       $(OBJS)\wxscintilla_Style.obj \\r
+       $(OBJS)\wxscintilla_UniConversion.obj \\r
+       $(OBJS)\wxscintilla_ViewStyle.obj \\r
+       $(OBJS)\wxscintilla_XPM.obj\r
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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 \
-       $(OBJS)\monodll_any.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_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_evtloopcmn.obj \
-       $(OBJS)\monodll_extended.obj \
-       $(OBJS)\monodll_ffile.obj \
-       $(OBJS)\monodll_file.obj \
-       $(OBJS)\monodll_fileback.obj \
-       $(OBJS)\monodll_fileconf.obj \
-       $(OBJS)\monodll_filefn.obj \
-       $(OBJS)\monodll_filename.obj \
-       $(OBJS)\monodll_filesys.obj \
-       $(OBJS)\monodll_filtall.obj \
-       $(OBJS)\monodll_filtfind.obj \
-       $(OBJS)\monodll_fmapbase.obj \
-       $(OBJS)\monodll_fs_arc.obj \
-       $(OBJS)\monodll_fs_filter.obj \
-       $(OBJS)\monodll_hash.obj \
-       $(OBJS)\monodll_hashmap.obj \
-       $(OBJS)\monodll_init.obj \
-       $(OBJS)\monodll_intl.obj \
-       $(OBJS)\monodll_ipcbase.obj \
-       $(OBJS)\monodll_list.obj \
-       $(OBJS)\monodll_log.obj \
-       $(OBJS)\monodll_longlong.obj \
-       $(OBJS)\monodll_memory.obj \
-       $(OBJS)\monodll_mimecmn.obj \
-       $(OBJS)\monodll_module.obj \
-       $(OBJS)\monodll_mstream.obj \
-       $(OBJS)\monodll_object.obj \
-       $(OBJS)\monodll_platinfo.obj \
-       $(OBJS)\monodll_powercmn.obj \
-       $(OBJS)\monodll_process.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_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_timercmn.obj \
-       $(OBJS)\monodll_timerimpl.obj \
-       $(OBJS)\monodll_tokenzr.obj \
-       $(OBJS)\monodll_txtstrm.obj \
-       $(OBJS)\monodll_unichar.obj \
-       $(OBJS)\monodll_uri.obj \
-       $(OBJS)\monodll_ustring.obj \
-       $(OBJS)\monodll_variant.obj \
-       $(OBJS)\monodll_wfstream.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_zstream.obj \
-       $(OBJS)\monodll_fswatchercmn.obj \
-       $(OBJS)\monodll_fswatcherg.obj \
-       $(OBJS)\monodll_basemsw.obj \
-       $(OBJS)\monodll_crashrpt.obj \
-       $(OBJS)\monodll_debughlp.obj \
-       $(OBJS)\monodll_dde.obj \
-       $(OBJS)\monodll_dir.obj \
-       $(OBJS)\monodll_dlmsw.obj \
-       $(OBJS)\monodll_mimetype.obj \
-       $(OBJS)\monodll_power.obj \
-       $(OBJS)\monodll_regconf.obj \
-       $(OBJS)\monodll_registry.obj \
-       $(OBJS)\monodll_snglinst.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_fswatcher.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_fs_inet.obj \
-       $(OBJS)\monodll_ftp.obj \
-       $(OBJS)\monodll_http.obj \
-       $(OBJS)\monodll_protocol.obj \
-       $(OBJS)\monodll_sckaddr.obj \
-       $(OBJS)\monodll_sckfile.obj \
-       $(OBJS)\monodll_sckipc.obj \
-       $(OBJS)\monodll_sckstrm.obj \
-       $(OBJS)\monodll_socket.obj \
-       $(OBJS)\monodll_url.obj \
-       $(OBJS)\monodll_sockmsw.obj \
-       $(OBJS)\monodll_urlmsw.obj \
-       $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
-       $(OBJS)\monodll_xml.obj \
-       $(OBJS)\monodll_xtixml.obj
-MONODLL_RESOURCES =  \
-       $(OBJS)\monodll_version.res
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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_131)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+MONODLL_OBJECTS =  \\r
+       $(OBJS)\monodll_dummy.obj \\r
+       $(OBJS)\monodll_any.obj \\r
+       $(OBJS)\monodll_appbase.obj \\r
+       $(OBJS)\monodll_arcall.obj \\r
+       $(OBJS)\monodll_arcfind.obj \\r
+       $(OBJS)\monodll_archive.obj \\r
+       $(OBJS)\monodll_arrstr.obj \\r
+       $(OBJS)\monodll_base64.obj \\r
+       $(OBJS)\monodll_clntdata.obj \\r
+       $(OBJS)\monodll_cmdline.obj \\r
+       $(OBJS)\monodll_config.obj \\r
+       $(OBJS)\monodll_convauto.obj \\r
+       $(OBJS)\monodll_datetime.obj \\r
+       $(OBJS)\monodll_datetimefmt.obj \\r
+       $(OBJS)\monodll_datstrm.obj \\r
+       $(OBJS)\monodll_dircmn.obj \\r
+       $(OBJS)\monodll_dynarray.obj \\r
+       $(OBJS)\monodll_dynlib.obj \\r
+       $(OBJS)\monodll_dynload.obj \\r
+       $(OBJS)\monodll_encconv.obj \\r
+       $(OBJS)\monodll_evtloopcmn.obj \\r
+       $(OBJS)\monodll_extended.obj \\r
+       $(OBJS)\monodll_ffile.obj \\r
+       $(OBJS)\monodll_file.obj \\r
+       $(OBJS)\monodll_fileback.obj \\r
+       $(OBJS)\monodll_fileconf.obj \\r
+       $(OBJS)\monodll_filefn.obj \\r
+       $(OBJS)\monodll_filename.obj \\r
+       $(OBJS)\monodll_filesys.obj \\r
+       $(OBJS)\monodll_filtall.obj \\r
+       $(OBJS)\monodll_filtfind.obj \\r
+       $(OBJS)\monodll_fmapbase.obj \\r
+       $(OBJS)\monodll_fs_arc.obj \\r
+       $(OBJS)\monodll_fs_filter.obj \\r
+       $(OBJS)\monodll_hash.obj \\r
+       $(OBJS)\monodll_hashmap.obj \\r
+       $(OBJS)\monodll_init.obj \\r
+       $(OBJS)\monodll_intl.obj \\r
+       $(OBJS)\monodll_ipcbase.obj \\r
+       $(OBJS)\monodll_languageinfo.obj \\r
+       $(OBJS)\monodll_list.obj \\r
+       $(OBJS)\monodll_log.obj \\r
+       $(OBJS)\monodll_longlong.obj \\r
+       $(OBJS)\monodll_memory.obj \\r
+       $(OBJS)\monodll_mimecmn.obj \\r
+       $(OBJS)\monodll_module.obj \\r
+       $(OBJS)\monodll_mstream.obj \\r
+       $(OBJS)\monodll_numformatter.obj \\r
+       $(OBJS)\monodll_object.obj \\r
+       $(OBJS)\monodll_platinfo.obj \\r
+       $(OBJS)\monodll_powercmn.obj \\r
+       $(OBJS)\monodll_process.obj \\r
+       $(OBJS)\monodll_regex.obj \\r
+       $(OBJS)\monodll_stdpbase.obj \\r
+       $(OBJS)\monodll_sstream.obj \\r
+       $(OBJS)\monodll_stdstream.obj \\r
+       $(OBJS)\monodll_stopwatch.obj \\r
+       $(OBJS)\monodll_strconv.obj \\r
+       $(OBJS)\monodll_stream.obj \\r
+       $(OBJS)\monodll_string.obj \\r
+       $(OBJS)\monodll_stringimpl.obj \\r
+       $(OBJS)\monodll_stringops.obj \\r
+       $(OBJS)\monodll_strvararg.obj \\r
+       $(OBJS)\monodll_sysopt.obj \\r
+       $(OBJS)\monodll_tarstrm.obj \\r
+       $(OBJS)\monodll_textbuf.obj \\r
+       $(OBJS)\monodll_textfile.obj \\r
+       $(OBJS)\monodll_common_time.obj \
+       $(OBJS)\monodll_timercmn.obj \\r
+       $(OBJS)\monodll_timerimpl.obj \\r
+       $(OBJS)\monodll_tokenzr.obj \\r
+       $(OBJS)\monodll_translation.obj \\r
+       $(OBJS)\monodll_txtstrm.obj \\r
+       $(OBJS)\monodll_unichar.obj \\r
+       $(OBJS)\monodll_uri.obj \\r
+       $(OBJS)\monodll_ustring.obj \\r
+       $(OBJS)\monodll_variant.obj \\r
+       $(OBJS)\monodll_wfstream.obj \\r
+       $(OBJS)\monodll_wxcrt.obj \\r
+       $(OBJS)\monodll_wxprintf.obj \\r
+       $(OBJS)\monodll_xlocale.obj \\r
+       $(OBJS)\monodll_xti.obj \\r
+       $(OBJS)\monodll_xtistrm.obj \\r
+       $(OBJS)\monodll_zipstrm.obj \\r
+       $(OBJS)\monodll_zstream.obj \\r
+       $(OBJS)\monodll_fswatchercmn.obj \\r
+       $(OBJS)\monodll_fswatcherg.obj \\r
+       $(OBJS)\monodll_basemsw.obj \\r
+       $(OBJS)\monodll_crashrpt.obj \\r
+       $(OBJS)\monodll_debughlp.obj \\r
+       $(OBJS)\monodll_dde.obj \\r
+       $(OBJS)\monodll_dir.obj \\r
+       $(OBJS)\monodll_dlmsw.obj \\r
+       $(OBJS)\monodll_evtloopconsole.obj \\r
+       $(OBJS)\monodll_mimetype.obj \\r
+       $(OBJS)\monodll_power.obj \\r
+       $(OBJS)\monodll_regconf.obj \\r
+       $(OBJS)\monodll_registry.obj \\r
+       $(OBJS)\monodll_snglinst.obj \\r
+       $(OBJS)\monodll_stackwalk.obj \\r
+       $(OBJS)\monodll_stdpaths.obj \\r
+       $(OBJS)\monodll_thread.obj \\r
+       $(OBJS)\monodll_msw_timer.obj \
+       $(OBJS)\monodll_msw_utils.obj \
+       $(OBJS)\monodll_msw_utilsexc.obj \
+       $(OBJS)\monodll_fswatcher.obj \\r
+       $(____BASE_WINCE_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_event.obj \\r
+       $(OBJS)\monodll_fs_mem.obj \\r
+       $(OBJS)\monodll_msgout.obj \\r
+       $(OBJS)\monodll_utilscmn.obj \\r
+       $(OBJS)\monodll_msw_main.obj \
+       $(OBJS)\monodll_mslu.obj \\r
+       $(OBJS)\monodll_volume.obj \\r
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_fs_inet.obj \\r
+       $(OBJS)\monodll_ftp.obj \\r
+       $(OBJS)\monodll_http.obj \\r
+       $(OBJS)\monodll_protocol.obj \\r
+       $(OBJS)\monodll_sckaddr.obj \\r
+       $(OBJS)\monodll_sckfile.obj \\r
+       $(OBJS)\monodll_sckipc.obj \\r
+       $(OBJS)\monodll_sckstrm.obj \\r
+       $(OBJS)\monodll_socket.obj \\r
+       $(OBJS)\monodll_url.obj \\r
+       $(OBJS)\monodll_sockmsw.obj \\r
+       $(OBJS)\monodll_urlmsw.obj \\r
+       $(____NET_WINCE_SRC_FILENAMES_OBJECTS) \
+       $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \\r
+       $(OBJS)\monodll_xml.obj \\r
+       $(OBJS)\monodll_xtixml.obj\r
+MONODLL_RESOURCES =  \\r
+       $(OBJS)\monodll_version.res\r
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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_any.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_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_evtloopcmn.obj \
-       $(OBJS)\monolib_extended.obj \
-       $(OBJS)\monolib_ffile.obj \
-       $(OBJS)\monolib_file.obj \
-       $(OBJS)\monolib_fileback.obj \
-       $(OBJS)\monolib_fileconf.obj \
-       $(OBJS)\monolib_filefn.obj \
-       $(OBJS)\monolib_filename.obj \
-       $(OBJS)\monolib_filesys.obj \
-       $(OBJS)\monolib_filtall.obj \
-       $(OBJS)\monolib_filtfind.obj \
-       $(OBJS)\monolib_fmapbase.obj \
-       $(OBJS)\monolib_fs_arc.obj \
-       $(OBJS)\monolib_fs_filter.obj \
-       $(OBJS)\monolib_hash.obj \
-       $(OBJS)\monolib_hashmap.obj \
-       $(OBJS)\monolib_init.obj \
-       $(OBJS)\monolib_intl.obj \
-       $(OBJS)\monolib_ipcbase.obj \
-       $(OBJS)\monolib_list.obj \
-       $(OBJS)\monolib_log.obj \
-       $(OBJS)\monolib_longlong.obj \
-       $(OBJS)\monolib_memory.obj \
-       $(OBJS)\monolib_mimecmn.obj \
-       $(OBJS)\monolib_module.obj \
-       $(OBJS)\monolib_mstream.obj \
-       $(OBJS)\monolib_object.obj \
-       $(OBJS)\monolib_platinfo.obj \
-       $(OBJS)\monolib_powercmn.obj \
-       $(OBJS)\monolib_process.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_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_timercmn.obj \
-       $(OBJS)\monolib_timerimpl.obj \
-       $(OBJS)\monolib_tokenzr.obj \
-       $(OBJS)\monolib_txtstrm.obj \
-       $(OBJS)\monolib_unichar.obj \
-       $(OBJS)\monolib_uri.obj \
-       $(OBJS)\monolib_ustring.obj \
-       $(OBJS)\monolib_variant.obj \
-       $(OBJS)\monolib_wfstream.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_zstream.obj \
-       $(OBJS)\monolib_fswatchercmn.obj \
-       $(OBJS)\monolib_fswatcherg.obj \
-       $(OBJS)\monolib_basemsw.obj \
-       $(OBJS)\monolib_crashrpt.obj \
-       $(OBJS)\monolib_debughlp.obj \
-       $(OBJS)\monolib_dde.obj \
-       $(OBJS)\monolib_dir.obj \
-       $(OBJS)\monolib_dlmsw.obj \
-       $(OBJS)\monolib_mimetype.obj \
-       $(OBJS)\monolib_power.obj \
-       $(OBJS)\monolib_regconf.obj \
-       $(OBJS)\monolib_registry.obj \
-       $(OBJS)\monolib_snglinst.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_fswatcher.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_fs_inet.obj \
-       $(OBJS)\monolib_ftp.obj \
-       $(OBJS)\monolib_http.obj \
-       $(OBJS)\monolib_protocol.obj \
-       $(OBJS)\monolib_sckaddr.obj \
-       $(OBJS)\monolib_sckfile.obj \
-       $(OBJS)\monolib_sckipc.obj \
-       $(OBJS)\monolib_sckstrm.obj \
-       $(OBJS)\monolib_socket.obj \
-       $(OBJS)\monolib_url.obj \
-       $(OBJS)\monolib_sockmsw.obj \
-       $(OBJS)\monolib_urlmsw.obj \
-       $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
-       $(OBJS)\monolib_xml.obj \
-       $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /DwxUSE_GUI=0 \
-       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
+MONOLIB_OBJECTS =  \\r
+       $(OBJS)\monolib_dummy.obj \\r
+       $(OBJS)\monolib_any.obj \\r
+       $(OBJS)\monolib_appbase.obj \\r
+       $(OBJS)\monolib_arcall.obj \\r
+       $(OBJS)\monolib_arcfind.obj \\r
+       $(OBJS)\monolib_archive.obj \\r
+       $(OBJS)\monolib_arrstr.obj \\r
+       $(OBJS)\monolib_base64.obj \\r
+       $(OBJS)\monolib_clntdata.obj \\r
+       $(OBJS)\monolib_cmdline.obj \\r
+       $(OBJS)\monolib_config.obj \\r
+       $(OBJS)\monolib_convauto.obj \\r
+       $(OBJS)\monolib_datetime.obj \\r
+       $(OBJS)\monolib_datetimefmt.obj \\r
+       $(OBJS)\monolib_datstrm.obj \\r
+       $(OBJS)\monolib_dircmn.obj \\r
+       $(OBJS)\monolib_dynarray.obj \\r
+       $(OBJS)\monolib_dynlib.obj \\r
+       $(OBJS)\monolib_dynload.obj \\r
+       $(OBJS)\monolib_encconv.obj \\r
+       $(OBJS)\monolib_evtloopcmn.obj \\r
+       $(OBJS)\monolib_extended.obj \\r
+       $(OBJS)\monolib_ffile.obj \\r
+       $(OBJS)\monolib_file.obj \\r
+       $(OBJS)\monolib_fileback.obj \\r
+       $(OBJS)\monolib_fileconf.obj \\r
+       $(OBJS)\monolib_filefn.obj \\r
+       $(OBJS)\monolib_filename.obj \\r
+       $(OBJS)\monolib_filesys.obj \\r
+       $(OBJS)\monolib_filtall.obj \\r
+       $(OBJS)\monolib_filtfind.obj \\r
+       $(OBJS)\monolib_fmapbase.obj \\r
+       $(OBJS)\monolib_fs_arc.obj \\r
+       $(OBJS)\monolib_fs_filter.obj \\r
+       $(OBJS)\monolib_hash.obj \\r
+       $(OBJS)\monolib_hashmap.obj \\r
+       $(OBJS)\monolib_init.obj \\r
+       $(OBJS)\monolib_intl.obj \\r
+       $(OBJS)\monolib_ipcbase.obj \\r
+       $(OBJS)\monolib_languageinfo.obj \\r
+       $(OBJS)\monolib_list.obj \\r
+       $(OBJS)\monolib_log.obj \\r
+       $(OBJS)\monolib_longlong.obj \\r
+       $(OBJS)\monolib_memory.obj \\r
+       $(OBJS)\monolib_mimecmn.obj \\r
+       $(OBJS)\monolib_module.obj \\r
+       $(OBJS)\monolib_mstream.obj \\r
+       $(OBJS)\monolib_numformatter.obj \\r
+       $(OBJS)\monolib_object.obj \\r
+       $(OBJS)\monolib_platinfo.obj \\r
+       $(OBJS)\monolib_powercmn.obj \\r
+       $(OBJS)\monolib_process.obj \\r
+       $(OBJS)\monolib_regex.obj \\r
+       $(OBJS)\monolib_stdpbase.obj \\r
+       $(OBJS)\monolib_sstream.obj \\r
+       $(OBJS)\monolib_stdstream.obj \\r
+       $(OBJS)\monolib_stopwatch.obj \\r
+       $(OBJS)\monolib_strconv.obj \\r
+       $(OBJS)\monolib_stream.obj \\r
+       $(OBJS)\monolib_string.obj \\r
+       $(OBJS)\monolib_stringimpl.obj \\r
+       $(OBJS)\monolib_stringops.obj \\r
+       $(OBJS)\monolib_strvararg.obj \\r
+       $(OBJS)\monolib_sysopt.obj \\r
+       $(OBJS)\monolib_tarstrm.obj \\r
+       $(OBJS)\monolib_textbuf.obj \\r
+       $(OBJS)\monolib_textfile.obj \\r
+       $(OBJS)\monolib_common_time.obj \
+       $(OBJS)\monolib_timercmn.obj \\r
+       $(OBJS)\monolib_timerimpl.obj \\r
+       $(OBJS)\monolib_tokenzr.obj \\r
+       $(OBJS)\monolib_translation.obj \\r
+       $(OBJS)\monolib_txtstrm.obj \\r
+       $(OBJS)\monolib_unichar.obj \\r
+       $(OBJS)\monolib_uri.obj \\r
+       $(OBJS)\monolib_ustring.obj \\r
+       $(OBJS)\monolib_variant.obj \\r
+       $(OBJS)\monolib_wfstream.obj \\r
+       $(OBJS)\monolib_wxcrt.obj \\r
+       $(OBJS)\monolib_wxprintf.obj \\r
+       $(OBJS)\monolib_xlocale.obj \\r
+       $(OBJS)\monolib_xti.obj \\r
+       $(OBJS)\monolib_xtistrm.obj \\r
+       $(OBJS)\monolib_zipstrm.obj \\r
+       $(OBJS)\monolib_zstream.obj \\r
+       $(OBJS)\monolib_fswatchercmn.obj \\r
+       $(OBJS)\monolib_fswatcherg.obj \\r
+       $(OBJS)\monolib_basemsw.obj \\r
+       $(OBJS)\monolib_crashrpt.obj \\r
+       $(OBJS)\monolib_debughlp.obj \\r
+       $(OBJS)\monolib_dde.obj \\r
+       $(OBJS)\monolib_dir.obj \\r
+       $(OBJS)\monolib_dlmsw.obj \\r
+       $(OBJS)\monolib_evtloopconsole.obj \\r
+       $(OBJS)\monolib_mimetype.obj \\r
+       $(OBJS)\monolib_power.obj \\r
+       $(OBJS)\monolib_regconf.obj \\r
+       $(OBJS)\monolib_registry.obj \\r
+       $(OBJS)\monolib_snglinst.obj \\r
+       $(OBJS)\monolib_stackwalk.obj \\r
+       $(OBJS)\monolib_stdpaths.obj \\r
+       $(OBJS)\monolib_thread.obj \\r
+       $(OBJS)\monolib_msw_timer.obj \
+       $(OBJS)\monolib_msw_utils.obj \
+       $(OBJS)\monolib_msw_utilsexc.obj \
+       $(OBJS)\monolib_fswatcher.obj \\r
+       $(____BASE_WINCE_SRC_FILENAMES_1_OBJECTS) \
+       $(OBJS)\monolib_event.obj \\r
+       $(OBJS)\monolib_fs_mem.obj \\r
+       $(OBJS)\monolib_msgout.obj \\r
+       $(OBJS)\monolib_utilscmn.obj \\r
+       $(OBJS)\monolib_msw_main.obj \
+       $(OBJS)\monolib_mslu.obj \\r
+       $(OBJS)\monolib_volume.obj \\r
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_1_OBJECTS) \
+       $(OBJS)\monolib_fs_inet.obj \\r
+       $(OBJS)\monolib_ftp.obj \\r
+       $(OBJS)\monolib_http.obj \\r
+       $(OBJS)\monolib_protocol.obj \\r
+       $(OBJS)\monolib_sckaddr.obj \\r
+       $(OBJS)\monolib_sckfile.obj \\r
+       $(OBJS)\monolib_sckipc.obj \\r
+       $(OBJS)\monolib_sckstrm.obj \\r
+       $(OBJS)\monolib_socket.obj \\r
+       $(OBJS)\monolib_url.obj \\r
+       $(OBJS)\monolib_sockmsw.obj \\r
+       $(OBJS)\monolib_urlmsw.obj \\r
+       $(____NET_WINCE_SRC_FILENAMES_1_OBJECTS) \
+       $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \\r
+       $(OBJS)\monolib_xml.obj \\r
+       $(OBJS)\monolib_xtixml.obj\r
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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_any.obj \
-       $(OBJS)\basedll_appbase.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_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_evtloopcmn.obj \
-       $(OBJS)\basedll_extended.obj \
-       $(OBJS)\basedll_ffile.obj \
-       $(OBJS)\basedll_file.obj \
-       $(OBJS)\basedll_fileback.obj \
-       $(OBJS)\basedll_fileconf.obj \
-       $(OBJS)\basedll_filefn.obj \
-       $(OBJS)\basedll_filename.obj \
-       $(OBJS)\basedll_filesys.obj \
-       $(OBJS)\basedll_filtall.obj \
-       $(OBJS)\basedll_filtfind.obj \
-       $(OBJS)\basedll_fmapbase.obj \
-       $(OBJS)\basedll_fs_arc.obj \
-       $(OBJS)\basedll_fs_filter.obj \
-       $(OBJS)\basedll_hash.obj \
-       $(OBJS)\basedll_hashmap.obj \
-       $(OBJS)\basedll_init.obj \
-       $(OBJS)\basedll_intl.obj \
-       $(OBJS)\basedll_ipcbase.obj \
-       $(OBJS)\basedll_list.obj \
-       $(OBJS)\basedll_log.obj \
-       $(OBJS)\basedll_longlong.obj \
-       $(OBJS)\basedll_memory.obj \
-       $(OBJS)\basedll_mimecmn.obj \
-       $(OBJS)\basedll_module.obj \
-       $(OBJS)\basedll_mstream.obj \
-       $(OBJS)\basedll_object.obj \
-       $(OBJS)\basedll_platinfo.obj \
-       $(OBJS)\basedll_powercmn.obj \
-       $(OBJS)\basedll_process.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_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_timercmn.obj \
-       $(OBJS)\basedll_timerimpl.obj \
-       $(OBJS)\basedll_tokenzr.obj \
-       $(OBJS)\basedll_txtstrm.obj \
-       $(OBJS)\basedll_unichar.obj \
-       $(OBJS)\basedll_uri.obj \
-       $(OBJS)\basedll_ustring.obj \
-       $(OBJS)\basedll_variant.obj \
-       $(OBJS)\basedll_wfstream.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_zstream.obj \
-       $(OBJS)\basedll_fswatchercmn.obj \
-       $(OBJS)\basedll_fswatcherg.obj \
-       $(OBJS)\basedll_basemsw.obj \
-       $(OBJS)\basedll_crashrpt.obj \
-       $(OBJS)\basedll_debughlp.obj \
-       $(OBJS)\basedll_dde.obj \
-       $(OBJS)\basedll_dir.obj \
-       $(OBJS)\basedll_dlmsw.obj \
-       $(OBJS)\basedll_mimetype.obj \
-       $(OBJS)\basedll_power.obj \
-       $(OBJS)\basedll_regconf.obj \
-       $(OBJS)\basedll_registry.obj \
-       $(OBJS)\basedll_snglinst.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_fswatcher.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
-BASEDLL_RESOURCES =  \
-       $(OBJS)\basedll_version.res
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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_147)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /DwxUSE_GUI=0 \
-       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\basedll_dummy.obj \\r
+       $(OBJS)\basedll_any.obj \\r
+       $(OBJS)\basedll_appbase.obj \\r
+       $(OBJS)\basedll_arcall.obj \\r
+       $(OBJS)\basedll_arcfind.obj \\r
+       $(OBJS)\basedll_archive.obj \\r
+       $(OBJS)\basedll_arrstr.obj \\r
+       $(OBJS)\basedll_base64.obj \\r
+       $(OBJS)\basedll_clntdata.obj \\r
+       $(OBJS)\basedll_cmdline.obj \\r
+       $(OBJS)\basedll_config.obj \\r
+       $(OBJS)\basedll_convauto.obj \\r
+       $(OBJS)\basedll_datetime.obj \\r
+       $(OBJS)\basedll_datetimefmt.obj \\r
+       $(OBJS)\basedll_datstrm.obj \\r
+       $(OBJS)\basedll_dircmn.obj \\r
+       $(OBJS)\basedll_dynarray.obj \\r
+       $(OBJS)\basedll_dynlib.obj \\r
+       $(OBJS)\basedll_dynload.obj \\r
+       $(OBJS)\basedll_encconv.obj \\r
+       $(OBJS)\basedll_evtloopcmn.obj \\r
+       $(OBJS)\basedll_extended.obj \\r
+       $(OBJS)\basedll_ffile.obj \\r
+       $(OBJS)\basedll_file.obj \\r
+       $(OBJS)\basedll_fileback.obj \\r
+       $(OBJS)\basedll_fileconf.obj \\r
+       $(OBJS)\basedll_filefn.obj \\r
+       $(OBJS)\basedll_filename.obj \\r
+       $(OBJS)\basedll_filesys.obj \\r
+       $(OBJS)\basedll_filtall.obj \\r
+       $(OBJS)\basedll_filtfind.obj \\r
+       $(OBJS)\basedll_fmapbase.obj \\r
+       $(OBJS)\basedll_fs_arc.obj \\r
+       $(OBJS)\basedll_fs_filter.obj \\r
+       $(OBJS)\basedll_hash.obj \\r
+       $(OBJS)\basedll_hashmap.obj \\r
+       $(OBJS)\basedll_init.obj \\r
+       $(OBJS)\basedll_intl.obj \\r
+       $(OBJS)\basedll_ipcbase.obj \\r
+       $(OBJS)\basedll_languageinfo.obj \\r
+       $(OBJS)\basedll_list.obj \\r
+       $(OBJS)\basedll_log.obj \\r
+       $(OBJS)\basedll_longlong.obj \\r
+       $(OBJS)\basedll_memory.obj \\r
+       $(OBJS)\basedll_mimecmn.obj \\r
+       $(OBJS)\basedll_module.obj \\r
+       $(OBJS)\basedll_mstream.obj \\r
+       $(OBJS)\basedll_numformatter.obj \\r
+       $(OBJS)\basedll_object.obj \\r
+       $(OBJS)\basedll_platinfo.obj \\r
+       $(OBJS)\basedll_powercmn.obj \\r
+       $(OBJS)\basedll_process.obj \\r
+       $(OBJS)\basedll_regex.obj \\r
+       $(OBJS)\basedll_stdpbase.obj \\r
+       $(OBJS)\basedll_sstream.obj \\r
+       $(OBJS)\basedll_stdstream.obj \\r
+       $(OBJS)\basedll_stopwatch.obj \\r
+       $(OBJS)\basedll_strconv.obj \\r
+       $(OBJS)\basedll_stream.obj \\r
+       $(OBJS)\basedll_string.obj \\r
+       $(OBJS)\basedll_stringimpl.obj \\r
+       $(OBJS)\basedll_stringops.obj \\r
+       $(OBJS)\basedll_strvararg.obj \\r
+       $(OBJS)\basedll_sysopt.obj \\r
+       $(OBJS)\basedll_tarstrm.obj \\r
+       $(OBJS)\basedll_textbuf.obj \\r
+       $(OBJS)\basedll_textfile.obj \\r
+       $(OBJS)\basedll_common_time.obj \
+       $(OBJS)\basedll_timercmn.obj \\r
+       $(OBJS)\basedll_timerimpl.obj \\r
+       $(OBJS)\basedll_tokenzr.obj \\r
+       $(OBJS)\basedll_translation.obj \\r
+       $(OBJS)\basedll_txtstrm.obj \\r
+       $(OBJS)\basedll_unichar.obj \\r
+       $(OBJS)\basedll_uri.obj \\r
+       $(OBJS)\basedll_ustring.obj \\r
+       $(OBJS)\basedll_variant.obj \\r
+       $(OBJS)\basedll_wfstream.obj \\r
+       $(OBJS)\basedll_wxcrt.obj \\r
+       $(OBJS)\basedll_wxprintf.obj \\r
+       $(OBJS)\basedll_xlocale.obj \\r
+       $(OBJS)\basedll_xti.obj \\r
+       $(OBJS)\basedll_xtistrm.obj \\r
+       $(OBJS)\basedll_zipstrm.obj \\r
+       $(OBJS)\basedll_zstream.obj \\r
+       $(OBJS)\basedll_fswatchercmn.obj \\r
+       $(OBJS)\basedll_fswatcherg.obj \\r
+       $(OBJS)\basedll_basemsw.obj \\r
+       $(OBJS)\basedll_crashrpt.obj \\r
+       $(OBJS)\basedll_debughlp.obj \\r
+       $(OBJS)\basedll_dde.obj \\r
+       $(OBJS)\basedll_dir.obj \\r
+       $(OBJS)\basedll_dlmsw.obj \\r
+       $(OBJS)\basedll_evtloopconsole.obj \\r
+       $(OBJS)\basedll_mimetype.obj \\r
+       $(OBJS)\basedll_power.obj \\r
+       $(OBJS)\basedll_regconf.obj \\r
+       $(OBJS)\basedll_registry.obj \\r
+       $(OBJS)\basedll_snglinst.obj \\r
+       $(OBJS)\basedll_stackwalk.obj \\r
+       $(OBJS)\basedll_stdpaths.obj \\r
+       $(OBJS)\basedll_thread.obj \\r
+       $(OBJS)\basedll_timer.obj \\r
+       $(OBJS)\basedll_msw_utils.obj \
+       $(OBJS)\basedll_utilsexc.obj \\r
+       $(OBJS)\basedll_fswatcher.obj \\r
+       $(____BASE_WINCE_SRC_FILENAMES_2_OBJECTS) \
+       $(OBJS)\basedll_event.obj \\r
+       $(OBJS)\basedll_fs_mem.obj \\r
+       $(OBJS)\basedll_msgout.obj \\r
+       $(OBJS)\basedll_utilscmn.obj \\r
+       $(OBJS)\basedll_main.obj \\r
+       $(OBJS)\basedll_mslu.obj \\r
+       $(OBJS)\basedll_volume.obj \
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_2_OBJECTS)
+BASEDLL_RESOURCES =  \\r
+       $(OBJS)\basedll_version.res\r
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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 \
-       $(OBJS)\baselib_any.obj \
-       $(OBJS)\baselib_appbase.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_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_evtloopcmn.obj \
-       $(OBJS)\baselib_extended.obj \
-       $(OBJS)\baselib_ffile.obj \
-       $(OBJS)\baselib_file.obj \
-       $(OBJS)\baselib_fileback.obj \
-       $(OBJS)\baselib_fileconf.obj \
-       $(OBJS)\baselib_filefn.obj \
-       $(OBJS)\baselib_filename.obj \
-       $(OBJS)\baselib_filesys.obj \
-       $(OBJS)\baselib_filtall.obj \
-       $(OBJS)\baselib_filtfind.obj \
-       $(OBJS)\baselib_fmapbase.obj \
-       $(OBJS)\baselib_fs_arc.obj \
-       $(OBJS)\baselib_fs_filter.obj \
-       $(OBJS)\baselib_hash.obj \
-       $(OBJS)\baselib_hashmap.obj \
-       $(OBJS)\baselib_init.obj \
-       $(OBJS)\baselib_intl.obj \
-       $(OBJS)\baselib_ipcbase.obj \
-       $(OBJS)\baselib_list.obj \
-       $(OBJS)\baselib_log.obj \
-       $(OBJS)\baselib_longlong.obj \
-       $(OBJS)\baselib_memory.obj \
-       $(OBJS)\baselib_mimecmn.obj \
-       $(OBJS)\baselib_module.obj \
-       $(OBJS)\baselib_mstream.obj \
-       $(OBJS)\baselib_object.obj \
-       $(OBJS)\baselib_platinfo.obj \
-       $(OBJS)\baselib_powercmn.obj \
-       $(OBJS)\baselib_process.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_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_timercmn.obj \
-       $(OBJS)\baselib_timerimpl.obj \
-       $(OBJS)\baselib_tokenzr.obj \
-       $(OBJS)\baselib_txtstrm.obj \
-       $(OBJS)\baselib_unichar.obj \
-       $(OBJS)\baselib_uri.obj \
-       $(OBJS)\baselib_ustring.obj \
-       $(OBJS)\baselib_variant.obj \
-       $(OBJS)\baselib_wfstream.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_zstream.obj \
-       $(OBJS)\baselib_fswatchercmn.obj \
-       $(OBJS)\baselib_fswatcherg.obj \
-       $(OBJS)\baselib_basemsw.obj \
-       $(OBJS)\baselib_crashrpt.obj \
-       $(OBJS)\baselib_debughlp.obj \
-       $(OBJS)\baselib_dde.obj \
-       $(OBJS)\baselib_dir.obj \
-       $(OBJS)\baselib_dlmsw.obj \
-       $(OBJS)\baselib_mimetype.obj \
-       $(OBJS)\baselib_power.obj \
-       $(OBJS)\baselib_regconf.obj \
-       $(OBJS)\baselib_registry.obj \
-       $(OBJS)\baselib_snglinst.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_fswatcher.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
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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_162)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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_fs_inet.obj \
-       $(OBJS)\netdll_ftp.obj \
-       $(OBJS)\netdll_http.obj \
-       $(OBJS)\netdll_protocol.obj \
-       $(OBJS)\netdll_sckaddr.obj \
-       $(OBJS)\netdll_sckfile.obj \
-       $(OBJS)\netdll_sckipc.obj \
-       $(OBJS)\netdll_sckstrm.obj \
-       $(OBJS)\netdll_socket.obj \
-       $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_sockmsw.obj \
-       $(OBJS)\netdll_urlmsw.obj
-NETDLL_RESOURCES =  \
-       $(OBJS)\netdll_version.res
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\baselib_dummy.obj \\r
+       $(OBJS)\baselib_any.obj \\r
+       $(OBJS)\baselib_appbase.obj \\r
+       $(OBJS)\baselib_arcall.obj \\r
+       $(OBJS)\baselib_arcfind.obj \\r
+       $(OBJS)\baselib_archive.obj \\r
+       $(OBJS)\baselib_arrstr.obj \\r
+       $(OBJS)\baselib_base64.obj \\r
+       $(OBJS)\baselib_clntdata.obj \\r
+       $(OBJS)\baselib_cmdline.obj \\r
+       $(OBJS)\baselib_config.obj \\r
+       $(OBJS)\baselib_convauto.obj \\r
+       $(OBJS)\baselib_datetime.obj \\r
+       $(OBJS)\baselib_datetimefmt.obj \\r
+       $(OBJS)\baselib_datstrm.obj \\r
+       $(OBJS)\baselib_dircmn.obj \\r
+       $(OBJS)\baselib_dynarray.obj \\r
+       $(OBJS)\baselib_dynlib.obj \\r
+       $(OBJS)\baselib_dynload.obj \\r
+       $(OBJS)\baselib_encconv.obj \\r
+       $(OBJS)\baselib_evtloopcmn.obj \\r
+       $(OBJS)\baselib_extended.obj \\r
+       $(OBJS)\baselib_ffile.obj \\r
+       $(OBJS)\baselib_file.obj \\r
+       $(OBJS)\baselib_fileback.obj \\r
+       $(OBJS)\baselib_fileconf.obj \\r
+       $(OBJS)\baselib_filefn.obj \\r
+       $(OBJS)\baselib_filename.obj \\r
+       $(OBJS)\baselib_filesys.obj \\r
+       $(OBJS)\baselib_filtall.obj \\r
+       $(OBJS)\baselib_filtfind.obj \\r
+       $(OBJS)\baselib_fmapbase.obj \\r
+       $(OBJS)\baselib_fs_arc.obj \\r
+       $(OBJS)\baselib_fs_filter.obj \\r
+       $(OBJS)\baselib_hash.obj \\r
+       $(OBJS)\baselib_hashmap.obj \\r
+       $(OBJS)\baselib_init.obj \\r
+       $(OBJS)\baselib_intl.obj \\r
+       $(OBJS)\baselib_ipcbase.obj \\r
+       $(OBJS)\baselib_languageinfo.obj \\r
+       $(OBJS)\baselib_list.obj \\r
+       $(OBJS)\baselib_log.obj \\r
+       $(OBJS)\baselib_longlong.obj \\r
+       $(OBJS)\baselib_memory.obj \\r
+       $(OBJS)\baselib_mimecmn.obj \\r
+       $(OBJS)\baselib_module.obj \\r
+       $(OBJS)\baselib_mstream.obj \\r
+       $(OBJS)\baselib_numformatter.obj \\r
+       $(OBJS)\baselib_object.obj \\r
+       $(OBJS)\baselib_platinfo.obj \\r
+       $(OBJS)\baselib_powercmn.obj \\r
+       $(OBJS)\baselib_process.obj \\r
+       $(OBJS)\baselib_regex.obj \\r
+       $(OBJS)\baselib_stdpbase.obj \\r
+       $(OBJS)\baselib_sstream.obj \\r
+       $(OBJS)\baselib_stdstream.obj \\r
+       $(OBJS)\baselib_stopwatch.obj \\r
+       $(OBJS)\baselib_strconv.obj \\r
+       $(OBJS)\baselib_stream.obj \\r
+       $(OBJS)\baselib_string.obj \\r
+       $(OBJS)\baselib_stringimpl.obj \\r
+       $(OBJS)\baselib_stringops.obj \\r
+       $(OBJS)\baselib_strvararg.obj \\r
+       $(OBJS)\baselib_sysopt.obj \\r
+       $(OBJS)\baselib_tarstrm.obj \\r
+       $(OBJS)\baselib_textbuf.obj \\r
+       $(OBJS)\baselib_textfile.obj \\r
+       $(OBJS)\baselib_common_time.obj \
+       $(OBJS)\baselib_timercmn.obj \\r
+       $(OBJS)\baselib_timerimpl.obj \\r
+       $(OBJS)\baselib_tokenzr.obj \\r
+       $(OBJS)\baselib_translation.obj \\r
+       $(OBJS)\baselib_txtstrm.obj \\r
+       $(OBJS)\baselib_unichar.obj \\r
+       $(OBJS)\baselib_uri.obj \\r
+       $(OBJS)\baselib_ustring.obj \\r
+       $(OBJS)\baselib_variant.obj \\r
+       $(OBJS)\baselib_wfstream.obj \\r
+       $(OBJS)\baselib_wxcrt.obj \\r
+       $(OBJS)\baselib_wxprintf.obj \\r
+       $(OBJS)\baselib_xlocale.obj \\r
+       $(OBJS)\baselib_xti.obj \\r
+       $(OBJS)\baselib_xtistrm.obj \\r
+       $(OBJS)\baselib_zipstrm.obj \\r
+       $(OBJS)\baselib_zstream.obj \\r
+       $(OBJS)\baselib_fswatchercmn.obj \\r
+       $(OBJS)\baselib_fswatcherg.obj \\r
+       $(OBJS)\baselib_basemsw.obj \\r
+       $(OBJS)\baselib_crashrpt.obj \\r
+       $(OBJS)\baselib_debughlp.obj \\r
+       $(OBJS)\baselib_dde.obj \\r
+       $(OBJS)\baselib_dir.obj \\r
+       $(OBJS)\baselib_dlmsw.obj \\r
+       $(OBJS)\baselib_evtloopconsole.obj \\r
+       $(OBJS)\baselib_mimetype.obj \\r
+       $(OBJS)\baselib_power.obj \\r
+       $(OBJS)\baselib_regconf.obj \\r
+       $(OBJS)\baselib_registry.obj \\r
+       $(OBJS)\baselib_snglinst.obj \\r
+       $(OBJS)\baselib_stackwalk.obj \\r
+       $(OBJS)\baselib_stdpaths.obj \\r
+       $(OBJS)\baselib_thread.obj \\r
+       $(OBJS)\baselib_timer.obj \\r
+       $(OBJS)\baselib_msw_utils.obj \
+       $(OBJS)\baselib_utilsexc.obj \\r
+       $(OBJS)\baselib_fswatcher.obj \\r
+       $(____BASE_WINCE_SRC_FILENAMES_3_OBJECTS) \
+       $(OBJS)\baselib_event.obj \\r
+       $(OBJS)\baselib_fs_mem.obj \\r
+       $(OBJS)\baselib_msgout.obj \\r
+       $(OBJS)\baselib_utilscmn.obj \\r
+       $(OBJS)\baselib_main.obj \\r
+       $(OBJS)\baselib_mslu.obj \\r
+       $(OBJS)\baselib_volume.obj \
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_3_OBJECTS)
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /DwxUSE_GUI=0 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
-NETLIB_OBJECTS =  \
-       $(OBJS)\netlib_dummy.obj \
-       $(OBJS)\netlib_fs_inet.obj \
-       $(OBJS)\netlib_ftp.obj \
-       $(OBJS)\netlib_http.obj \
-       $(OBJS)\netlib_protocol.obj \
-       $(OBJS)\netlib_sckaddr.obj \
-       $(OBJS)\netlib_sckfile.obj \
-       $(OBJS)\netlib_sckipc.obj \
-       $(OBJS)\netlib_sckstrm.obj \
-       $(OBJS)\netlib_socket.obj \
-       $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_sockmsw.obj \
-       $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \
+       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+NETDLL_OBJECTS =  \\r
+       $(OBJS)\netdll_dummy.obj \\r
+       $(OBJS)\netdll_fs_inet.obj \\r
+       $(OBJS)\netdll_ftp.obj \\r
+       $(OBJS)\netdll_http.obj \\r
+       $(OBJS)\netdll_protocol.obj \\r
+       $(OBJS)\netdll_sckaddr.obj \\r
+       $(OBJS)\netdll_sckfile.obj \\r
+       $(OBJS)\netdll_sckipc.obj \\r
+       $(OBJS)\netdll_sckstrm.obj \\r
+       $(OBJS)\netdll_socket.obj \\r
+       $(OBJS)\netdll_url.obj \\r
+       $(OBJS)\netdll_sockmsw.obj \\r
+       $(OBJS)\netdll_urlmsw.obj \
+       $(____NET_WINCE_SRC_FILENAMES_2_OBJECTS)
+NETDLL_RESOURCES =  \\r
+       $(OBJS)\netdll_version.res\r
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\netlib_dummy.obj \\r
+       $(OBJS)\netlib_fs_inet.obj \\r
+       $(OBJS)\netlib_ftp.obj \\r
+       $(OBJS)\netlib_http.obj \\r
+       $(OBJS)\netlib_protocol.obj \\r
+       $(OBJS)\netlib_sckaddr.obj \\r
+       $(OBJS)\netlib_sckfile.obj \\r
+       $(OBJS)\netlib_sckipc.obj \\r
+       $(OBJS)\netlib_sckstrm.obj \\r
+       $(OBJS)\netlib_socket.obj \\r
+       $(OBJS)\netlib_url.obj \\r
+       $(OBJS)\netlib_sockmsw.obj \\r
+       $(OBJS)\netlib_urlmsw.obj \
+       $(____NET_WINCE_SRC_FILENAMES_3_OBJECTS)
+COREDLL_CFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 \
+       $(CPPFLAGS) $(CFLAGS)
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_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_event.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)
-COREDLL_RESOURCES =  \
-       $(OBJS)\coredll_version.res
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\coredll_dummy.obj \\r
+       $(OBJS)\coredll_event.obj \\r
+       $(OBJS)\coredll_fs_mem.obj \\r
+       $(OBJS)\coredll_msgout.obj \\r
+       $(OBJS)\coredll_utilscmn.obj \\r
+       $(OBJS)\coredll_msw_main.obj \
+       $(OBJS)\coredll_mslu.obj \\r
+       $(OBJS)\coredll_volume.obj \\r
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_4_OBJECTS) \
+       $(____CORE_SRC_FILENAMES_2_OBJECTS)\r
+COREDLL_RESOURCES =  \\r
+       $(OBJS)\coredll_version.res\r
+CORELIB_CFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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 \
-       $(OBJS)\corelib_evtloop.obj \
-       $(OBJS)\corelib_main.obj \
-       $(OBJS)\corelib_mslu.obj \
-       $(OBJS)\corelib_volume.obj \
-       $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\corelib_dummy.obj \\r
+       $(OBJS)\corelib_event.obj \\r
+       $(OBJS)\corelib_fs_mem.obj \\r
+       $(OBJS)\corelib_msgout.obj \\r
+       $(OBJS)\corelib_utilscmn.obj \\r
+       $(OBJS)\corelib_msw_main.obj \
+       $(OBJS)\corelib_mslu.obj \\r
+       $(OBJS)\corelib_volume.obj \\r
+       $(____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_5_OBJECTS) \
+       $(____CORE_SRC_FILENAMES_3_OBJECTS)\r
+ADVDLL_CFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CPPFLAGS) $(CFLAGS)
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-ADVDLL_OBJECTS =  \
-       $(OBJS)\advdll_dummy.obj \
-       $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
-ADVDLL_RESOURCES =  \
-       $(OBJS)\advdll_version.res
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\advdll_dummy.obj \\r
+       $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)\r
+ADVDLL_RESOURCES =  \\r
+       $(OBJS)\advdll_version.res\r
+ADVLIB_CFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(CPPFLAGS) $(CFLAGS)
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_advlib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+ADVLIB_OBJECTS =  \\r
+       $(OBJS)\advlib_dummy.obj \\r
+       $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)\r
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-ADVLIB_OBJECTS =  \
-       $(OBJS)\advlib_dummy.obj \
-       $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+MEDIADLL_OBJECTS =  \\r
+       $(OBJS)\mediadll_dummy.obj \\r
+       $(OBJS)\mediadll_mediactrlcmn.obj \\r
+       $(____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS)
+MEDIADLL_RESOURCES =  \\r
+       $(OBJS)\mediadll_version.res\r
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
-MEDIADLL_OBJECTS =  \
-       $(OBJS)\mediadll_dummy.obj \
-       $(OBJS)\mediadll_mediactrlcmn.obj \
-       $(OBJS)\mediadll_mediactrl_am.obj \
-       $(OBJS)\mediadll_mediactrl_wmp10.obj \
-       $(OBJS)\mediadll_mediactrl_qt.obj
-MEDIADLL_RESOURCES =  \
-       $(OBJS)\mediadll_version.res
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
+MEDIALIB_OBJECTS =  \\r
+       $(OBJS)\medialib_dummy.obj \\r
+       $(OBJS)\medialib_mediactrlcmn.obj \\r
+       $(____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS)
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_medialib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-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
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+HTMLDLL_OBJECTS =  \\r
+       $(OBJS)\htmldll_dummy.obj \\r
+       $(____HTML_SRC_PLATFORM_FILENAMES_2_OBJECTS) \
+       $(OBJS)\htmldll_helpctrl.obj \\r
+       $(OBJS)\htmldll_helpdata.obj \\r
+       $(OBJS)\htmldll_helpdlg.obj \\r
+       $(OBJS)\htmldll_helpfrm.obj \\r
+       $(OBJS)\htmldll_helpwnd.obj \\r
+       $(OBJS)\htmldll_htmlcell.obj \\r
+       $(OBJS)\htmldll_htmlfilt.obj \\r
+       $(OBJS)\htmldll_htmlpars.obj \\r
+       $(OBJS)\htmldll_htmltag.obj \\r
+       $(OBJS)\htmldll_htmlwin.obj \\r
+       $(OBJS)\htmldll_htmprint.obj \\r
+       $(OBJS)\htmldll_m_dflist.obj \\r
+       $(OBJS)\htmldll_m_fonts.obj \\r
+       $(OBJS)\htmldll_m_hline.obj \\r
+       $(OBJS)\htmldll_m_image.obj \\r
+       $(OBJS)\htmldll_m_layout.obj \\r
+       $(OBJS)\htmldll_m_links.obj \\r
+       $(OBJS)\htmldll_m_list.obj \\r
+       $(OBJS)\htmldll_m_pre.obj \\r
+       $(OBJS)\htmldll_m_span.obj \\r
+       $(OBJS)\htmldll_m_style.obj \\r
+       $(OBJS)\htmldll_m_tables.obj \\r
+       $(OBJS)\htmldll_styleparams.obj \\r
+       $(OBJS)\htmldll_winpars.obj \\r
+       $(OBJS)\htmldll_htmllbox.obj\r
+HTMLDLL_RESOURCES =  \\r
+       $(OBJS)\htmldll_version.res\r
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
-HTMLDLL_OBJECTS =  \
-       $(OBJS)\htmldll_dummy.obj \
-       $(OBJS)\htmldll_helpbest.obj \
-       $(OBJS)\htmldll_helpctrl.obj \
-       $(OBJS)\htmldll_helpdata.obj \
-       $(OBJS)\htmldll_helpdlg.obj \
-       $(OBJS)\htmldll_helpfrm.obj \
-       $(OBJS)\htmldll_helpwnd.obj \
-       $(OBJS)\htmldll_htmlcell.obj \
-       $(OBJS)\htmldll_htmlfilt.obj \
-       $(OBJS)\htmldll_htmlpars.obj \
-       $(OBJS)\htmldll_htmltag.obj \
-       $(OBJS)\htmldll_htmlwin.obj \
-       $(OBJS)\htmldll_htmprint.obj \
-       $(OBJS)\htmldll_m_dflist.obj \
-       $(OBJS)\htmldll_m_fonts.obj \
-       $(OBJS)\htmldll_m_hline.obj \
-       $(OBJS)\htmldll_m_image.obj \
-       $(OBJS)\htmldll_m_layout.obj \
-       $(OBJS)\htmldll_m_links.obj \
-       $(OBJS)\htmldll_m_list.obj \
-       $(OBJS)\htmldll_m_pre.obj \
-       $(OBJS)\htmldll_m_style.obj \
-       $(OBJS)\htmldll_m_tables.obj \
-       $(OBJS)\htmldll_winpars.obj \
-       $(OBJS)\htmldll_htmllbox.obj
-HTMLDLL_RESOURCES =  \
-       $(OBJS)\htmldll_version.res
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+HTMLLIB_OBJECTS =  \\r
+       $(OBJS)\htmllib_dummy.obj \\r
+       $(____HTML_SRC_PLATFORM_FILENAMES_3_OBJECTS) \
+       $(OBJS)\htmllib_helpctrl.obj \\r
+       $(OBJS)\htmllib_helpdata.obj \\r
+       $(OBJS)\htmllib_helpdlg.obj \\r
+       $(OBJS)\htmllib_helpfrm.obj \\r
+       $(OBJS)\htmllib_helpwnd.obj \\r
+       $(OBJS)\htmllib_htmlcell.obj \\r
+       $(OBJS)\htmllib_htmlfilt.obj \\r
+       $(OBJS)\htmllib_htmlpars.obj \\r
+       $(OBJS)\htmllib_htmltag.obj \\r
+       $(OBJS)\htmllib_htmlwin.obj \\r
+       $(OBJS)\htmllib_htmprint.obj \\r
+       $(OBJS)\htmllib_m_dflist.obj \\r
+       $(OBJS)\htmllib_m_fonts.obj \\r
+       $(OBJS)\htmllib_m_hline.obj \\r
+       $(OBJS)\htmllib_m_image.obj \\r
+       $(OBJS)\htmllib_m_layout.obj \\r
+       $(OBJS)\htmllib_m_links.obj \\r
+       $(OBJS)\htmllib_m_list.obj \\r
+       $(OBJS)\htmllib_m_pre.obj \\r
+       $(OBJS)\htmllib_m_span.obj \\r
+       $(OBJS)\htmllib_m_style.obj \\r
+       $(OBJS)\htmllib_m_tables.obj \\r
+       $(OBJS)\htmllib_styleparams.obj \\r
+       $(OBJS)\htmllib_winpars.obj \\r
+       $(OBJS)\htmllib_htmllbox.obj\r
+WEBVIEWDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_htmllib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_WEBVIEW $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_webviewdll.pch" \
        $(CPPFLAGS) $(CXXFLAGS)
-HTMLLIB_OBJECTS =  \
-       $(OBJS)\htmllib_dummy.obj \
-       $(OBJS)\htmllib_helpbest.obj \
-       $(OBJS)\htmllib_helpctrl.obj \
-       $(OBJS)\htmllib_helpdata.obj \
-       $(OBJS)\htmllib_helpdlg.obj \
-       $(OBJS)\htmllib_helpfrm.obj \
-       $(OBJS)\htmllib_helpwnd.obj \
-       $(OBJS)\htmllib_htmlcell.obj \
-       $(OBJS)\htmllib_htmlfilt.obj \
-       $(OBJS)\htmllib_htmlpars.obj \
-       $(OBJS)\htmllib_htmltag.obj \
-       $(OBJS)\htmllib_htmlwin.obj \
-       $(OBJS)\htmllib_htmprint.obj \
-       $(OBJS)\htmllib_m_dflist.obj \
-       $(OBJS)\htmllib_m_fonts.obj \
-       $(OBJS)\htmllib_m_hline.obj \
-       $(OBJS)\htmllib_m_image.obj \
-       $(OBJS)\htmllib_m_layout.obj \
-       $(OBJS)\htmllib_m_links.obj \
-       $(OBJS)\htmllib_m_list.obj \
-       $(OBJS)\htmllib_m_pre.obj \
-       $(OBJS)\htmllib_m_style.obj \
-       $(OBJS)\htmllib_m_tables.obj \
-       $(OBJS)\htmllib_winpars.obj \
-       $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+WEBVIEWDLL_OBJECTS =  \\r
+       $(OBJS)\webviewdll_dummy.obj \\r
+       $(____WEBVIEW_SRC_PLATFORM_FILENAMES_2_OBJECTS) \
+       $(OBJS)\webviewdll_webview.obj \\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
+WEBVIEWDLL_RESOURCES =  \\r
+       $(OBJS)\webviewdll_version.res\r
+WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
-QADLL_OBJECTS =  \
-       $(OBJS)\qadll_dummy.obj \
-       $(OBJS)\qadll_debugrpt.obj \
-       $(OBJS)\qadll_dbgrptg.obj
-QADLL_RESOURCES =  \
-       $(OBJS)\qadll_version.res
-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_webviewlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+WEBVIEWLIB_OBJECTS =  \\r
+       $(OBJS)\webviewlib_dummy.obj \\r
+       $(____WEBVIEW_SRC_PLATFORM_FILENAMES_3_OBJECTS) \
+       $(OBJS)\webviewlib_webview.obj \\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_qalib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-QALIB_OBJECTS =  \
-       $(OBJS)\qalib_dummy.obj \
-       $(OBJS)\qalib_debugrpt.obj \
-       $(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+QADLL_OBJECTS =  \\r
+       $(OBJS)\qadll_dummy.obj \\r
+       $(OBJS)\qadll_debugrpt.obj \\r
+       $(OBJS)\qadll_dbgrptg.obj\r
+QADLL_RESOURCES =  \\r
+       $(OBJS)\qadll_version.res\r
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /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_xml.obj \
-       $(OBJS)\xmldll_xtixml.obj
-XMLDLL_RESOURCES =  \
-       $(OBJS)\xmldll_version.res
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
+QALIB_OBJECTS =  \\r
+       $(OBJS)\qalib_dummy.obj \\r
+       $(OBJS)\qalib_debugrpt.obj \\r
+       $(OBJS)\qalib_dbgrptg.obj\r
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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 /DwxUSE_GUI=0 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
-XMLLIB_OBJECTS =  \
-       $(OBJS)\xmllib_dummy.obj \
-       $(OBJS)\xmllib_xml.obj \
-       $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+XMLDLL_OBJECTS =  \\r
+       $(OBJS)\xmldll_dummy.obj \\r
+       $(OBJS)\xmldll_xml.obj \\r
+       $(OBJS)\xmldll_xtixml.obj\r
+XMLDLL_RESOURCES =  \\r
+       $(OBJS)\xmldll_version.res\r
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-XRCDLL_OBJECTS =  \
-       $(OBJS)\xrcdll_dummy.obj \
-       $(OBJS)\xrcdll_xh_animatctrl.obj \
-       $(OBJS)\xrcdll_xh_bmp.obj \
-       $(OBJS)\xrcdll_xh_bmpcbox.obj \
-       $(OBJS)\xrcdll_xh_bmpbt.obj \
-       $(OBJS)\xrcdll_xh_bttn.obj \
-       $(OBJS)\xrcdll_xh_cald.obj \
-       $(OBJS)\xrcdll_xh_chckb.obj \
-       $(OBJS)\xrcdll_xh_chckl.obj \
-       $(OBJS)\xrcdll_xh_choic.obj \
-       $(OBJS)\xrcdll_xh_choicbk.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_editlbox.obj \
-       $(OBJS)\xrcdll_xh_filectrl.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_html.obj \
-       $(OBJS)\xrcdll_xh_hyperlink.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_propdlg.obj \
-       $(OBJS)\xrcdll_xh_radbt.obj \
-       $(OBJS)\xrcdll_xh_radbx.obj \
-       $(OBJS)\xrcdll_xh_scrol.obj \
-       $(OBJS)\xrcdll_xh_scwin.obj \
-       $(OBJS)\xrcdll_xh_htmllbox.obj \
-       $(OBJS)\xrcdll_xh_sizer.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_stlin.obj \
-       $(OBJS)\xrcdll_xh_sttxt.obj \
-       $(OBJS)\xrcdll_xh_text.obj \
-       $(OBJS)\xrcdll_xh_tglbtn.obj \
-       $(OBJS)\xrcdll_xh_toolb.obj \
-       $(OBJS)\xrcdll_xh_tree.obj \
-       $(OBJS)\xrcdll_xh_treebk.obj \
-       $(OBJS)\xrcdll_xh_unkwn.obj \
-       $(OBJS)\xrcdll_xh_wizrd.obj \
-       $(OBJS)\xrcdll_xmlres.obj \
-       $(OBJS)\xrcdll_xmladv.obj \
-       $(OBJS)\xrcdll_xmlrsall.obj
-XRCDLL_RESOURCES =  \
-       $(OBJS)\xrcdll_version.res
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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 =  \\r
+       $(OBJS)\xmllib_dummy.obj \\r
+       $(OBJS)\xmllib_xml.obj \\r
+       $(OBJS)\xmllib_xtixml.obj\r
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_xrclib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-XRCLIB_OBJECTS =  \
-       $(OBJS)\xrclib_dummy.obj \
-       $(OBJS)\xrclib_xh_animatctrl.obj \
-       $(OBJS)\xrclib_xh_bmp.obj \
-       $(OBJS)\xrclib_xh_bmpcbox.obj \
-       $(OBJS)\xrclib_xh_bmpbt.obj \
-       $(OBJS)\xrclib_xh_bttn.obj \
-       $(OBJS)\xrclib_xh_cald.obj \
-       $(OBJS)\xrclib_xh_chckb.obj \
-       $(OBJS)\xrclib_xh_chckl.obj \
-       $(OBJS)\xrclib_xh_choic.obj \
-       $(OBJS)\xrclib_xh_choicbk.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_editlbox.obj \
-       $(OBJS)\xrclib_xh_filectrl.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_html.obj \
-       $(OBJS)\xrclib_xh_hyperlink.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_propdlg.obj \
-       $(OBJS)\xrclib_xh_radbt.obj \
-       $(OBJS)\xrclib_xh_radbx.obj \
-       $(OBJS)\xrclib_xh_scrol.obj \
-       $(OBJS)\xrclib_xh_scwin.obj \
-       $(OBJS)\xrclib_xh_htmllbox.obj \
-       $(OBJS)\xrclib_xh_sizer.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_stlin.obj \
-       $(OBJS)\xrclib_xh_sttxt.obj \
-       $(OBJS)\xrclib_xh_text.obj \
-       $(OBJS)\xrclib_xh_tglbtn.obj \
-       $(OBJS)\xrclib_xh_toolb.obj \
-       $(OBJS)\xrclib_xh_tree.obj \
-       $(OBJS)\xrclib_xh_treebk.obj \
-       $(OBJS)\xrclib_xh_unkwn.obj \
-       $(OBJS)\xrclib_xh_wizrd.obj \
-       $(OBJS)\xrclib_xmlres.obj \
-       $(OBJS)\xrclib_xmladv.obj \
-       $(OBJS)\xrclib_xmlrsall.obj
-AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+XRCDLL_OBJECTS =  \\r
+       $(OBJS)\xrcdll_dummy.obj \\r
+       $(OBJS)\xrcdll_xh_animatctrl.obj \\r
+       $(OBJS)\xrcdll_xh_bannerwindow.obj \\r
+       $(OBJS)\xrcdll_xh_bmp.obj \\r
+       $(OBJS)\xrcdll_xh_bmpcbox.obj \\r
+       $(OBJS)\xrcdll_xh_bmpbt.obj \\r
+       $(OBJS)\xrcdll_xh_bttn.obj \\r
+       $(OBJS)\xrcdll_xh_cald.obj \\r
+       $(OBJS)\xrcdll_xh_chckb.obj \\r
+       $(OBJS)\xrcdll_xh_chckl.obj \\r
+       $(OBJS)\xrcdll_xh_choic.obj \\r
+       $(OBJS)\xrcdll_xh_choicbk.obj \\r
+       $(OBJS)\xrcdll_xh_clrpicker.obj \\r
+       $(OBJS)\xrcdll_xh_cmdlinkbn.obj \\r
+       $(OBJS)\xrcdll_xh_collpane.obj \\r
+       $(OBJS)\xrcdll_xh_combo.obj \\r
+       $(OBJS)\xrcdll_xh_comboctrl.obj \\r
+       $(OBJS)\xrcdll_xh_datectrl.obj \\r
+       $(OBJS)\xrcdll_xh_dirpicker.obj \\r
+       $(OBJS)\xrcdll_xh_dlg.obj \\r
+       $(OBJS)\xrcdll_xh_editlbox.obj \\r
+       $(OBJS)\xrcdll_xh_filectrl.obj \\r
+       $(OBJS)\xrcdll_xh_filepicker.obj \\r
+       $(OBJS)\xrcdll_xh_fontpicker.obj \\r
+       $(OBJS)\xrcdll_xh_frame.obj \\r
+       $(OBJS)\xrcdll_xh_gauge.obj \\r
+       $(OBJS)\xrcdll_xh_gdctl.obj \\r
+       $(OBJS)\xrcdll_xh_grid.obj \\r
+       $(OBJS)\xrcdll_xh_html.obj \\r
+       $(OBJS)\xrcdll_xh_hyperlink.obj \\r
+       $(OBJS)\xrcdll_xh_listb.obj \\r
+       $(OBJS)\xrcdll_xh_listbk.obj \\r
+       $(OBJS)\xrcdll_xh_listc.obj \\r
+       $(OBJS)\xrcdll_xh_mdi.obj \\r
+       $(OBJS)\xrcdll_xh_menu.obj \\r
+       $(OBJS)\xrcdll_xh_notbk.obj \\r
+       $(OBJS)\xrcdll_xh_odcombo.obj \\r
+       $(OBJS)\xrcdll_xh_panel.obj \\r
+       $(OBJS)\xrcdll_xh_propdlg.obj \\r
+       $(OBJS)\xrcdll_xh_radbt.obj \\r
+       $(OBJS)\xrcdll_xh_radbx.obj \\r
+       $(OBJS)\xrcdll_xh_scrol.obj \\r
+       $(OBJS)\xrcdll_xh_scwin.obj \\r
+       $(OBJS)\xrcdll_xh_htmllbox.obj \\r
+       $(OBJS)\xrcdll_xh_sizer.obj \\r
+       $(OBJS)\xrcdll_xh_slidr.obj \\r
+       $(OBJS)\xrcdll_xh_spin.obj \\r
+       $(OBJS)\xrcdll_xh_split.obj \\r
+       $(OBJS)\xrcdll_xh_srchctrl.obj \\r
+       $(OBJS)\xrcdll_xh_statbar.obj \\r
+       $(OBJS)\xrcdll_xh_stbmp.obj \\r
+       $(OBJS)\xrcdll_xh_stbox.obj \\r
+       $(OBJS)\xrcdll_xh_stlin.obj \\r
+       $(OBJS)\xrcdll_xh_sttxt.obj \\r
+       $(OBJS)\xrcdll_xh_text.obj \\r
+       $(OBJS)\xrcdll_xh_tglbtn.obj \\r
+       $(OBJS)\xrcdll_xh_timectrl.obj \\r
+       $(OBJS)\xrcdll_xh_toolb.obj \\r
+       $(OBJS)\xrcdll_xh_toolbk.obj \\r
+       $(OBJS)\xrcdll_xh_tree.obj \\r
+       $(OBJS)\xrcdll_xh_treebk.obj \\r
+       $(OBJS)\xrcdll_xh_unkwn.obj \\r
+       $(OBJS)\xrcdll_xh_wizrd.obj \\r
+       $(OBJS)\xrcdll_xmlres.obj \\r
+       $(OBJS)\xrcdll_xmladv.obj \\r
+       $(OBJS)\xrcdll_xmlrsall.obj\r
+XRCDLL_RESOURCES =  \\r
+       $(OBJS)\xrcdll_version.res\r
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
-AUIDLL_OBJECTS =  \
-       $(OBJS)\auidll_dummy.obj \
-       $(OBJS)\auidll_framemanager.obj \
-       $(OBJS)\auidll_dockart.obj \
-       $(OBJS)\auidll_floatpane.obj \
-       $(OBJS)\auidll_auibook.obj \
-       $(OBJS)\auidll_auibar.obj \
-       $(OBJS)\auidll_tabmdi.obj
-AUIDLL_RESOURCES =  \
-       $(OBJS)\auidll_version.res
-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+XRCLIB_OBJECTS =  \\r
+       $(OBJS)\xrclib_dummy.obj \\r
+       $(OBJS)\xrclib_xh_animatctrl.obj \\r
+       $(OBJS)\xrclib_xh_bannerwindow.obj \\r
+       $(OBJS)\xrclib_xh_bmp.obj \\r
+       $(OBJS)\xrclib_xh_bmpcbox.obj \\r
+       $(OBJS)\xrclib_xh_bmpbt.obj \\r
+       $(OBJS)\xrclib_xh_bttn.obj \\r
+       $(OBJS)\xrclib_xh_cald.obj \\r
+       $(OBJS)\xrclib_xh_chckb.obj \\r
+       $(OBJS)\xrclib_xh_chckl.obj \\r
+       $(OBJS)\xrclib_xh_choic.obj \\r
+       $(OBJS)\xrclib_xh_choicbk.obj \\r
+       $(OBJS)\xrclib_xh_clrpicker.obj \\r
+       $(OBJS)\xrclib_xh_cmdlinkbn.obj \\r
+       $(OBJS)\xrclib_xh_collpane.obj \\r
+       $(OBJS)\xrclib_xh_combo.obj \\r
+       $(OBJS)\xrclib_xh_comboctrl.obj \\r
+       $(OBJS)\xrclib_xh_datectrl.obj \\r
+       $(OBJS)\xrclib_xh_dirpicker.obj \\r
+       $(OBJS)\xrclib_xh_dlg.obj \\r
+       $(OBJS)\xrclib_xh_editlbox.obj \\r
+       $(OBJS)\xrclib_xh_filectrl.obj \\r
+       $(OBJS)\xrclib_xh_filepicker.obj \\r
+       $(OBJS)\xrclib_xh_fontpicker.obj \\r
+       $(OBJS)\xrclib_xh_frame.obj \\r
+       $(OBJS)\xrclib_xh_gauge.obj \\r
+       $(OBJS)\xrclib_xh_gdctl.obj \\r
+       $(OBJS)\xrclib_xh_grid.obj \\r
+       $(OBJS)\xrclib_xh_html.obj \\r
+       $(OBJS)\xrclib_xh_hyperlink.obj \\r
+       $(OBJS)\xrclib_xh_listb.obj \\r
+       $(OBJS)\xrclib_xh_listbk.obj \\r
+       $(OBJS)\xrclib_xh_listc.obj \\r
+       $(OBJS)\xrclib_xh_mdi.obj \\r
+       $(OBJS)\xrclib_xh_menu.obj \\r
+       $(OBJS)\xrclib_xh_notbk.obj \\r
+       $(OBJS)\xrclib_xh_odcombo.obj \\r
+       $(OBJS)\xrclib_xh_panel.obj \\r
+       $(OBJS)\xrclib_xh_propdlg.obj \\r
+       $(OBJS)\xrclib_xh_radbt.obj \\r
+       $(OBJS)\xrclib_xh_radbx.obj \\r
+       $(OBJS)\xrclib_xh_scrol.obj \\r
+       $(OBJS)\xrclib_xh_scwin.obj \\r
+       $(OBJS)\xrclib_xh_htmllbox.obj \\r
+       $(OBJS)\xrclib_xh_sizer.obj \\r
+       $(OBJS)\xrclib_xh_slidr.obj \\r
+       $(OBJS)\xrclib_xh_spin.obj \\r
+       $(OBJS)\xrclib_xh_split.obj \\r
+       $(OBJS)\xrclib_xh_srchctrl.obj \\r
+       $(OBJS)\xrclib_xh_statbar.obj \\r
+       $(OBJS)\xrclib_xh_stbmp.obj \\r
+       $(OBJS)\xrclib_xh_stbox.obj \\r
+       $(OBJS)\xrclib_xh_stlin.obj \\r
+       $(OBJS)\xrclib_xh_sttxt.obj \\r
+       $(OBJS)\xrclib_xh_text.obj \\r
+       $(OBJS)\xrclib_xh_tglbtn.obj \\r
+       $(OBJS)\xrclib_xh_timectrl.obj \\r
+       $(OBJS)\xrclib_xh_toolb.obj \\r
+       $(OBJS)\xrclib_xh_toolbk.obj \\r
+       $(OBJS)\xrclib_xh_tree.obj \\r
+       $(OBJS)\xrclib_xh_treebk.obj \\r
+       $(OBJS)\xrclib_xh_unkwn.obj \\r
+       $(OBJS)\xrclib_xh_wizrd.obj \\r
+       $(OBJS)\xrclib_xmlres.obj \\r
+       $(OBJS)\xrclib_xmladv.obj \\r
+       $(OBJS)\xrclib_xmlrsall.obj\r
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_auilib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-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
-RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+AUIDLL_OBJECTS =  \\r
+       $(OBJS)\auidll_dummy.obj \\r
+       $(OBJS)\auidll_framemanager.obj \\r
+       $(OBJS)\auidll_dockart.obj \\r
+       $(OBJS)\auidll_floatpane.obj \\r
+       $(OBJS)\auidll_auibook.obj \\r
+       $(OBJS)\auidll_auibar.obj \\r
+       $(OBJS)\auidll_tabmdi.obj \\r
+       $(OBJS)\auidll_tabart.obj \\r
+       $(OBJS)\auidll_xh_auinotbk.obj \
+       $(____AUI_GTK_SRC_FILENAMES_2_OBJECTS)
+AUIDLL_RESOURCES =  \\r
+       $(OBJS)\auidll_version.res\r
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)
-RIBBONDLL_OBJECTS =  \
-       $(OBJS)\ribbondll_dummy.obj \
-       $(OBJS)\ribbondll_art_internal.obj \
-       $(OBJS)\ribbondll_art_msw.obj \
-       $(OBJS)\ribbondll_art_aui.obj \
-       $(OBJS)\ribbondll_bar.obj \
-       $(OBJS)\ribbondll_buttonbar.obj \
-       $(OBJS)\ribbondll_control.obj \
-       $(OBJS)\ribbondll_gallery.obj \
-       $(OBJS)\ribbondll_page.obj \
-       $(OBJS)\ribbondll_panel.obj \
-       $(OBJS)\ribbondll_toolbar.obj
-RIBBONDLL_RESOURCES =  \
-       $(OBJS)\ribbondll_version.res
-RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)
+AUILIB_OBJECTS =  \\r
+       $(OBJS)\auilib_dummy.obj \\r
+       $(OBJS)\auilib_framemanager.obj \\r
+       $(OBJS)\auilib_dockart.obj \\r
+       $(OBJS)\auilib_floatpane.obj \\r
+       $(OBJS)\auilib_auibook.obj \\r
+       $(OBJS)\auilib_auibar.obj \\r
+       $(OBJS)\auilib_tabmdi.obj \\r
+       $(OBJS)\auilib_tabart.obj \\r
+       $(OBJS)\auilib_xh_auinotbk.obj \
+       $(____AUI_GTK_SRC_FILENAMES_3_OBJECTS)
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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)
-RIBBONLIB_OBJECTS =  \
-       $(OBJS)\ribbonlib_dummy.obj \
-       $(OBJS)\ribbonlib_art_internal.obj \
-       $(OBJS)\ribbonlib_art_msw.obj \
-       $(OBJS)\ribbonlib_art_aui.obj \
-       $(OBJS)\ribbonlib_bar.obj \
-       $(OBJS)\ribbonlib_buttonbar.obj \
-       $(OBJS)\ribbonlib_control.obj \
-       $(OBJS)\ribbonlib_gallery.obj \
-       $(OBJS)\ribbonlib_page.obj \
-       $(OBJS)\ribbonlib_panel.obj \
-       $(OBJS)\ribbonlib_toolbar.obj
-PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+RIBBONDLL_OBJECTS =  \\r
+       $(OBJS)\ribbondll_dummy.obj \\r
+       $(OBJS)\ribbondll_art_internal.obj \\r
+       $(OBJS)\ribbondll_art_msw.obj \\r
+       $(OBJS)\ribbondll_art_aui.obj \\r
+       $(OBJS)\ribbondll_bar.obj \\r
+       $(OBJS)\ribbondll_buttonbar.obj \\r
+       $(OBJS)\ribbondll_control.obj \\r
+       $(OBJS)\ribbondll_gallery.obj \\r
+       $(OBJS)\ribbondll_page.obj \\r
+       $(OBJS)\ribbondll_panel.obj \\r
+       $(OBJS)\ribbondll_toolbar.obj \\r
+       $(OBJS)\ribbondll_xh_ribbon.obj\r
+RIBBONDLL_RESOURCES =  \\r
+       $(OBJS)\ribbondll_version.res\r
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_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
-PROPGRIDDLL_RESOURCES =  \
-       $(OBJS)\propgriddll_version.res
-PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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 =  \\r
+       $(OBJS)\ribbonlib_dummy.obj \\r
+       $(OBJS)\ribbonlib_art_internal.obj \\r
+       $(OBJS)\ribbonlib_art_msw.obj \\r
+       $(OBJS)\ribbonlib_art_aui.obj \\r
+       $(OBJS)\ribbonlib_bar.obj \\r
+       $(OBJS)\ribbonlib_buttonbar.obj \\r
+       $(OBJS)\ribbonlib_control.obj \\r
+       $(OBJS)\ribbonlib_gallery.obj \\r
+       $(OBJS)\ribbonlib_page.obj \\r
+       $(OBJS)\ribbonlib_panel.obj \\r
+       $(OBJS)\ribbonlib_toolbar.obj \\r
+       $(OBJS)\ribbonlib_xh_ribbon.obj\r
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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)
-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_519)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+PROPGRIDDLL_OBJECTS =  \\r
+       $(OBJS)\propgriddll_dummy.obj \\r
+       $(OBJS)\propgriddll_advprops.obj \\r
+       $(OBJS)\propgriddll_editors.obj \\r
+       $(OBJS)\propgriddll_manager.obj \\r
+       $(OBJS)\propgriddll_property.obj \\r
+       $(OBJS)\propgriddll_propgrid.obj \\r
+       $(OBJS)\propgriddll_propgridiface.obj \\r
+       $(OBJS)\propgriddll_propgridpagestate.obj \\r
+       $(OBJS)\propgriddll_props.obj\r
+PROPGRIDDLL_RESOURCES =  \\r
+       $(OBJS)\propgriddll_version.res\r
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-RICHTEXTDLL_OBJECTS =  \
-       $(OBJS)\richtextdll_dummy.obj \
-       $(OBJS)\richtextdll_richtextctrl.obj \
-       $(OBJS)\richtextdll_richtextbuffer.obj \
-       $(OBJS)\richtextdll_richtextstyles.obj \
-       $(OBJS)\richtextdll_richtextxml.obj \
-       $(OBJS)\richtextdll_richtexthtml.obj \
-       $(OBJS)\richtextdll_richtextformatdlg.obj \
-       $(OBJS)\richtextdll_richtextsymboldlg.obj \
-       $(OBJS)\richtextdll_richtextstyledlg.obj \
-       $(OBJS)\richtextdll_richtextprint.obj
-RICHTEXTDLL_RESOURCES =  \
-       $(OBJS)\richtextdll_version.res
-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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 =  \\r
+       $(OBJS)\propgridlib_dummy.obj \\r
+       $(OBJS)\propgridlib_advprops.obj \\r
+       $(OBJS)\propgridlib_editors.obj \\r
+       $(OBJS)\propgridlib_manager.obj \\r
+       $(OBJS)\propgridlib_property.obj \\r
+       $(OBJS)\propgridlib_propgrid.obj \\r
+       $(OBJS)\propgridlib_propgridiface.obj \\r
+       $(OBJS)\propgridlib_propgridpagestate.obj \\r
+       $(OBJS)\propgridlib_props.obj\r
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_richtextlib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-RICHTEXTLIB_OBJECTS =  \
-       $(OBJS)\richtextlib_dummy.obj \
-       $(OBJS)\richtextlib_richtextctrl.obj \
-       $(OBJS)\richtextlib_richtextbuffer.obj \
-       $(OBJS)\richtextlib_richtextstyles.obj \
-       $(OBJS)\richtextlib_richtextxml.obj \
-       $(OBJS)\richtextlib_richtexthtml.obj \
-       $(OBJS)\richtextlib_richtextformatdlg.obj \
-       $(OBJS)\richtextlib_richtextsymboldlg.obj \
-       $(OBJS)\richtextlib_richtextstyledlg.obj \
-       $(OBJS)\richtextlib_richtextprint.obj
-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+RICHTEXTDLL_OBJECTS =  \\r
+       $(OBJS)\richtextdll_dummy.obj \\r
+       $(OBJS)\richtextdll_richtextbuffer.obj \\r
+       $(OBJS)\richtextdll_richtextctrl.obj \\r
+       $(OBJS)\richtextdll_richtextformatdlg.obj \\r
+       $(OBJS)\richtextdll_richtexthtml.obj \\r
+       $(OBJS)\richtextdll_richtextimagedlg.obj \\r
+       $(OBJS)\richtextdll_richtextprint.obj \\r
+       $(OBJS)\richtextdll_richtextstyledlg.obj \\r
+       $(OBJS)\richtextdll_richtextstyles.obj \\r
+       $(OBJS)\richtextdll_richtextsymboldlg.obj \\r
+       $(OBJS)\richtextdll_richtextxml.obj \\r
+       $(OBJS)\richtextdll_xh_richtext.obj\r
+RICHTEXTDLL_RESOURCES =  \\r
+       $(OBJS)\richtextdll_version.res\r
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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__ \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXTLIB_OBJECTS =  \\r
+       $(OBJS)\richtextlib_dummy.obj \\r
+       $(OBJS)\richtextlib_richtextbuffer.obj \\r
+       $(OBJS)\richtextlib_richtextctrl.obj \\r
+       $(OBJS)\richtextlib_richtextformatdlg.obj \\r
+       $(OBJS)\richtextlib_richtexthtml.obj \\r
+       $(OBJS)\richtextlib_richtextimagedlg.obj \\r
+       $(OBJS)\richtextlib_richtextprint.obj \\r
+       $(OBJS)\richtextlib_richtextstyledlg.obj \\r
+       $(OBJS)\richtextlib_richtextstyles.obj \\r
+       $(OBJS)\richtextlib_richtextsymboldlg.obj \\r
+       $(OBJS)\richtextlib_richtextxml.obj \\r
+       $(OBJS)\richtextlib_xh_richtext.obj\r
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /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_stc.obj \
-       $(OBJS)\stcdll_PlatWX.obj \
-       $(OBJS)\stcdll_ScintillaWX.obj
-STCDLL_RESOURCES =  \
-       $(OBJS)\stcdll_version.res
-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+STCDLL_OBJECTS =  \\r
+       $(OBJS)\stcdll_dummy.obj \\r
+       $(OBJS)\stcdll_stc.obj \\r
+       $(OBJS)\stcdll_PlatWX.obj \\r
+       $(OBJS)\stcdll_ScintillaWX.obj\r
+STCDLL_RESOURCES =  \\r
+       $(OBJS)\stcdll_version.res\r
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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__ \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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\lexlib /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_581)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__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_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
-GLDLL_OBJECTS =  \
-       $(OBJS)\gldll_dummy.obj \
-       $(OBJS)\gldll_glcmn.obj \
-       $(OBJS)\gldll_glcanvas.obj
-GLDLL_RESOURCES =  \
-       $(OBJS)\gldll_version.res
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS)\r
+STCLIB_OBJECTS =  \\r
+       $(OBJS)\stclib_dummy.obj \\r
+       $(OBJS)\stclib_stc.obj \\r
+       $(OBJS)\stclib_PlatWX.obj \\r
+       $(OBJS)\stclib_ScintillaWX.obj\r
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_612)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_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_gllib.pch" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /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)
-GLLIB_OBJECTS =  \
-       $(OBJS)\gllib_dummy.obj \
-       $(OBJS)\gllib_glcmn.obj \
-       $(OBJS)\gllib_glcanvas.obj
-BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!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 "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!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 "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_25 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_25 = $(__THREADSFLAG)
-!endif
-!if "$(USE_GUI)" == "1"
-__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_40 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_40 = $(__THREADSFLAG)
-!endif
-!if "$(USE_GUI)" == "1"
-__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_55 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_55 = $(__THREADSFLAG)
-!endif
-!if "$(USE_GUI)" == "1"
-__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_70 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_70 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_85 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_85 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_100 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_100 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-__monodll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_108 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_108 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_116 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_116 = $(__THREADSFLAG)
-!endif
-!if "$(USE_GUI)" == "1"
-____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
-       $(____CORE_SRC_FILENAMES_OBJECTS) \
-       $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
-       $(OBJS)\monodll_mediactrlcmn.obj \
-       $(OBJS)\monodll_mediactrl_am.obj \
-       $(OBJS)\monodll_mediactrl_wmp10.obj \
-       $(OBJS)\monodll_mediactrl_qt.obj \
-       $(OBJS)\monodll_helpbest.obj \
-       $(OBJS)\monodll_helpctrl.obj \
-       $(OBJS)\monodll_helpdata.obj \
-       $(OBJS)\monodll_helpdlg.obj \
-       $(OBJS)\monodll_helpfrm.obj \
-       $(OBJS)\monodll_helpwnd.obj \
-       $(OBJS)\monodll_htmlcell.obj \
-       $(OBJS)\monodll_htmlfilt.obj \
-       $(OBJS)\monodll_htmlpars.obj \
-       $(OBJS)\monodll_htmltag.obj \
-       $(OBJS)\monodll_htmlwin.obj \
-       $(OBJS)\monodll_htmprint.obj \
-       $(OBJS)\monodll_m_dflist.obj \
-       $(OBJS)\monodll_m_fonts.obj \
-       $(OBJS)\monodll_m_hline.obj \
-       $(OBJS)\monodll_m_image.obj \
-       $(OBJS)\monodll_m_layout.obj \
-       $(OBJS)\monodll_m_links.obj \
-       $(OBJS)\monodll_m_list.obj \
-       $(OBJS)\monodll_m_pre.obj \
-       $(OBJS)\monodll_m_style.obj \
-       $(OBJS)\monodll_m_tables.obj \
-       $(OBJS)\monodll_winpars.obj \
-       $(OBJS)\monodll_htmllbox.obj \
-       $(OBJS)\monodll_debugrpt.obj \
-       $(OBJS)\monodll_dbgrptg.obj \
-       $(OBJS)\monodll_xh_animatctrl.obj \
-       $(OBJS)\monodll_xh_bmp.obj \
-       $(OBJS)\monodll_xh_bmpcbox.obj \
-       $(OBJS)\monodll_xh_bmpbt.obj \
-       $(OBJS)\monodll_xh_bttn.obj \
-       $(OBJS)\monodll_xh_cald.obj \
-       $(OBJS)\monodll_xh_chckb.obj \
-       $(OBJS)\monodll_xh_chckl.obj \
-       $(OBJS)\monodll_xh_choic.obj \
-       $(OBJS)\monodll_xh_choicbk.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_editlbox.obj \
-       $(OBJS)\monodll_xh_filectrl.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_html.obj \
-       $(OBJS)\monodll_xh_hyperlink.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_propdlg.obj \
-       $(OBJS)\monodll_xh_radbt.obj \
-       $(OBJS)\monodll_xh_radbx.obj \
-       $(OBJS)\monodll_xh_scrol.obj \
-       $(OBJS)\monodll_xh_scwin.obj \
-       $(OBJS)\monodll_xh_htmllbox.obj \
-       $(OBJS)\monodll_xh_sizer.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_stlin.obj \
-       $(OBJS)\monodll_xh_sttxt.obj \
-       $(OBJS)\monodll_xh_text.obj \
-       $(OBJS)\monodll_xh_tglbtn.obj \
-       $(OBJS)\monodll_xh_toolb.obj \
-       $(OBJS)\monodll_xh_tree.obj \
-       $(OBJS)\monodll_xh_treebk.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_auibar.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_art_internal.obj \
-       $(OBJS)\monodll_art_msw.obj \
-       $(OBJS)\monodll_art_aui.obj \
-       $(OBJS)\monodll_bar.obj \
-       $(OBJS)\monodll_ribbon_buttonbar.obj \
-       $(OBJS)\monodll_ribbon_control.obj \
-       $(OBJS)\monodll_gallery.obj \
-       $(OBJS)\monodll_page.obj \
-       $(OBJS)\monodll_panel.obj \
-       $(OBJS)\monodll_ribbon_toolbar.obj \
-       $(OBJS)\monodll_richtextctrl.obj \
-       $(OBJS)\monodll_richtextbuffer.obj \
-       $(OBJS)\monodll_richtextstyles.obj \
-       $(OBJS)\monodll_richtextxml.obj \
-       $(OBJS)\monodll_richtexthtml.obj \
-       $(OBJS)\monodll_richtextformatdlg.obj \
-       $(OBJS)\monodll_richtextsymboldlg.obj \
-       $(OBJS)\monodll_richtextstyledlg.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 =  \
-       $(OBJS)\monodll_activex.obj \
-       $(OBJS)\monodll_app.obj \
-       $(OBJS)\monodll_bitmap.obj \
-       $(OBJS)\monodll_brush.obj \
-       $(OBJS)\monodll_caret.obj \
-       $(OBJS)\monodll_clipbrd.obj \
-       $(OBJS)\monodll_colour.obj \
-       $(OBJS)\monodll_cursor.obj \
-       $(OBJS)\monodll_data.obj \
-       $(OBJS)\monodll_dc.obj \
-       $(OBJS)\monodll_dcclient.obj \
-       $(OBJS)\monodll_dcmemory.obj \
-       $(OBJS)\monodll_dcprint.obj \
-       $(OBJS)\monodll_dcscreen.obj \
-       $(OBJS)\monodll_dialup.obj \
-       $(OBJS)\monodll_dib.obj \
-       $(OBJS)\monodll_display.obj \
-       $(OBJS)\monodll_enhmeta.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_icon.obj \
-       $(OBJS)\monodll_imaglist.obj \
-       $(OBJS)\monodll_minifram.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_palette.obj \
-       $(OBJS)\monodll_pen.obj \
-       $(OBJS)\monodll_popupwin.obj \
-       $(OBJS)\monodll_printdlg.obj \
-       $(OBJS)\monodll_printwin.obj \
-       $(OBJS)\monodll_region.obj \
-       $(OBJS)\monodll_renderer.obj \
-       $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_tooltip.obj \
-       $(OBJS)\monodll_toplevel.obj \
-       $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_uxtheme.obj \
-       $(OBJS)\monodll_window.obj \
-       $(OBJS)\monodll_helpchm.obj \
-       $(OBJS)\monodll_helpwin.obj \
-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_uuid.obj \
+GLDLL_OBJECTS =  \\r
+       $(OBJS)\gldll_dummy.obj \\r
+       $(OBJS)\gldll_glcmn.obj \\r
+       $(____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS)
+GLDLL_RESOURCES =  \\r
+       $(OBJS)\gldll_version.res\r
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_627)$(__DEBUGRUNTIME) /DWIN32 \\r
+       $(__DEBUGINFO) \\r
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \\r
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /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_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+GLLIB_OBJECTS =  \\r
+       $(OBJS)\gllib_dummy.obj \\r
+       $(OBJS)\gllib_glcmn.obj \\r
+       $(____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS)
+BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg\r
+\r
+### Conditionally set variables: ###\r
+\r
+!if "$(TARGET_CPU)" == "AMD64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(USE_GUI)" == "0"\r
+PORTNAME = base\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+!if "$(TOOLKIT)" == "MAC"
+WXBASEPORT = _carbon
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "0"\r
+WXCOMPILER = _vc\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+WXCOMPILER = _vc$(COMPILER_VERSION)$(ARCH_SUFFIX)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "0"\r
+VENDORTAG = _$(VENDOR)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+VENDORTAG = \r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+WXDEBUGFLAG = d\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+WXDEBUGFLAG = d\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+WXUNICODEFLAG = u\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+WXUNIVNAME = univ\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+WXDLLFLAG = dll\r
+!endif\r
+!if "$(SHARED)" == "0"\r
+LIBTYPE_SUFFIX = lib\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+LIBTYPE_SUFFIX = dll\r
+!endif\r
+!if "$(TARGET_CPU)" == "AMD64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+LINK_TARGET_CPU = /MACHINE:IA64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+LINK_TARGET_CPU = /MACHINE:IA64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_10 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_25 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_25 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_40 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_40 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_55 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_55 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_70 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_70 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_85 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_85 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_100 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_100 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+__wxscintilla_usingdll_p = /DWXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+EXTRALIBS_FOR_BASE = \r
+!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+EXTRALIBS_FOR_BASE =   \r
+!endif\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
+       glib-2.0.lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r
+__monodll___depname = \\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_11)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_108 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_108 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_11)\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_116 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_116 = $(__THREADSFLAG)\r
+!endif\r
+!if "$(TOOLKIT)" == "WINCE"
+____BASE_WINCE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_wince_time.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_carbon_utils.obj \
+       $(OBJS)\monodll_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_osx_cocoa_utils.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____NET_WINCE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_net.obj
+!endif
+!if "$(USE_GUI)" == "1"\r
+____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \\r
+       $(____CORE_SRC_FILENAMES_OBJECTS) \\r
+       $(____ADVANCED_SRC_FILENAMES_OBJECTS) \\r
+       $(OBJS)\monodll_mediactrlcmn.obj \\r
+       $(____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS) \
+       $(____HTML_SRC_PLATFORM_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_helpctrl.obj \\r
+       $(OBJS)\monodll_helpdata.obj \\r
+       $(OBJS)\monodll_helpdlg.obj \\r
+       $(OBJS)\monodll_helpfrm.obj \\r
+       $(OBJS)\monodll_helpwnd.obj \\r
+       $(OBJS)\monodll_htmlcell.obj \\r
+       $(OBJS)\monodll_htmlfilt.obj \\r
+       $(OBJS)\monodll_htmlpars.obj \\r
+       $(OBJS)\monodll_htmltag.obj \\r
+       $(OBJS)\monodll_htmlwin.obj \\r
+       $(OBJS)\monodll_htmprint.obj \\r
+       $(OBJS)\monodll_m_dflist.obj \\r
+       $(OBJS)\monodll_m_fonts.obj \\r
+       $(OBJS)\monodll_m_hline.obj \\r
+       $(OBJS)\monodll_m_image.obj \\r
+       $(OBJS)\monodll_m_layout.obj \\r
+       $(OBJS)\monodll_m_links.obj \\r
+       $(OBJS)\monodll_m_list.obj \\r
+       $(OBJS)\monodll_m_pre.obj \\r
+       $(OBJS)\monodll_m_span.obj \\r
+       $(OBJS)\monodll_m_style.obj \\r
+       $(OBJS)\monodll_m_tables.obj \\r
+       $(OBJS)\monodll_styleparams.obj \\r
+       $(OBJS)\monodll_winpars.obj \\r
+       $(OBJS)\monodll_htmllbox.obj \\r
+       $(____WEBVIEW_SRC_PLATFORM_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_webview.obj \\r
+       $(OBJS)\monodll_webviewarchivehandler.obj \\r
+       $(OBJS)\monodll_webviewfshandler.obj \\r
+       $(OBJS)\monodll_debugrpt.obj \\r
+       $(OBJS)\monodll_dbgrptg.obj \\r
+       $(OBJS)\monodll_xh_animatctrl.obj \\r
+       $(OBJS)\monodll_xh_bannerwindow.obj \\r
+       $(OBJS)\monodll_xh_bmp.obj \\r
+       $(OBJS)\monodll_xh_bmpcbox.obj \\r
+       $(OBJS)\monodll_xh_bmpbt.obj \\r
+       $(OBJS)\monodll_xh_bttn.obj \\r
+       $(OBJS)\monodll_xh_cald.obj \\r
+       $(OBJS)\monodll_xh_chckb.obj \\r
+       $(OBJS)\monodll_xh_chckl.obj \\r
+       $(OBJS)\monodll_xh_choic.obj \\r
+       $(OBJS)\monodll_xh_choicbk.obj \\r
+       $(OBJS)\monodll_xh_clrpicker.obj \\r
+       $(OBJS)\monodll_xh_cmdlinkbn.obj \\r
+       $(OBJS)\monodll_xh_collpane.obj \\r
+       $(OBJS)\monodll_xh_combo.obj \\r
+       $(OBJS)\monodll_xh_comboctrl.obj \\r
+       $(OBJS)\monodll_xh_datectrl.obj \\r
+       $(OBJS)\monodll_xh_dirpicker.obj \\r
+       $(OBJS)\monodll_xh_dlg.obj \\r
+       $(OBJS)\monodll_xh_editlbox.obj \\r
+       $(OBJS)\monodll_xh_filectrl.obj \\r
+       $(OBJS)\monodll_xh_filepicker.obj \\r
+       $(OBJS)\monodll_xh_fontpicker.obj \\r
+       $(OBJS)\monodll_xh_frame.obj \\r
+       $(OBJS)\monodll_xh_gauge.obj \\r
+       $(OBJS)\monodll_xh_gdctl.obj \\r
+       $(OBJS)\monodll_xh_grid.obj \\r
+       $(OBJS)\monodll_xh_html.obj \\r
+       $(OBJS)\monodll_xh_hyperlink.obj \\r
+       $(OBJS)\monodll_xh_listb.obj \\r
+       $(OBJS)\monodll_xh_listbk.obj \\r
+       $(OBJS)\monodll_xh_listc.obj \\r
+       $(OBJS)\monodll_xh_mdi.obj \\r
+       $(OBJS)\monodll_xh_menu.obj \\r
+       $(OBJS)\monodll_xh_notbk.obj \\r
+       $(OBJS)\monodll_xh_odcombo.obj \\r
+       $(OBJS)\monodll_xh_panel.obj \\r
+       $(OBJS)\monodll_xh_propdlg.obj \\r
+       $(OBJS)\monodll_xh_radbt.obj \\r
+       $(OBJS)\monodll_xh_radbx.obj \\r
+       $(OBJS)\monodll_xh_scrol.obj \\r
+       $(OBJS)\monodll_xh_scwin.obj \\r
+       $(OBJS)\monodll_xh_htmllbox.obj \\r
+       $(OBJS)\monodll_xh_sizer.obj \\r
+       $(OBJS)\monodll_xh_slidr.obj \\r
+       $(OBJS)\monodll_xh_spin.obj \\r
+       $(OBJS)\monodll_xh_split.obj \\r
+       $(OBJS)\monodll_xh_srchctrl.obj \\r
+       $(OBJS)\monodll_xh_statbar.obj \\r
+       $(OBJS)\monodll_xh_stbmp.obj \\r
+       $(OBJS)\monodll_xh_stbox.obj \\r
+       $(OBJS)\monodll_xh_stlin.obj \\r
+       $(OBJS)\monodll_xh_sttxt.obj \\r
+       $(OBJS)\monodll_xh_text.obj \\r
+       $(OBJS)\monodll_xh_tglbtn.obj \\r
+       $(OBJS)\monodll_xh_timectrl.obj \\r
+       $(OBJS)\monodll_xh_toolb.obj \\r
+       $(OBJS)\monodll_xh_toolbk.obj \\r
+       $(OBJS)\monodll_xh_tree.obj \\r
+       $(OBJS)\monodll_xh_treebk.obj \\r
+       $(OBJS)\monodll_xh_unkwn.obj \\r
+       $(OBJS)\monodll_xh_wizrd.obj \\r
+       $(OBJS)\monodll_xmlres.obj \\r
+       $(OBJS)\monodll_xmladv.obj \\r
+       $(OBJS)\monodll_xmlrsall.obj \\r
+       $(OBJS)\monodll_framemanager.obj \\r
+       $(OBJS)\monodll_dockart.obj \\r
+       $(OBJS)\monodll_floatpane.obj \\r
+       $(OBJS)\monodll_auibook.obj \\r
+       $(OBJS)\monodll_auibar.obj \\r
+       $(OBJS)\monodll_tabmdi.obj \\r
+       $(OBJS)\monodll_tabart.obj \\r
+       $(OBJS)\monodll_xh_auinotbk.obj \\r
+       $(____AUI_GTK_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_advprops.obj \\r
+       $(OBJS)\monodll_editors.obj \\r
+       $(OBJS)\monodll_manager.obj \\r
+       $(OBJS)\monodll_property.obj \\r
+       $(OBJS)\monodll_propgrid.obj \\r
+       $(OBJS)\monodll_propgridiface.obj \\r
+       $(OBJS)\monodll_propgridpagestate.obj \\r
+       $(OBJS)\monodll_props.obj \\r
+       $(OBJS)\monodll_art_internal.obj \\r
+       $(OBJS)\monodll_art_msw.obj \\r
+       $(OBJS)\monodll_art_aui.obj \\r
+       $(OBJS)\monodll_bar.obj \\r
+       $(OBJS)\monodll_ribbon_buttonbar.obj \\r
+       $(OBJS)\monodll_ribbon_control.obj \\r
+       $(OBJS)\monodll_gallery.obj \\r
+       $(OBJS)\monodll_page.obj \\r
+       $(OBJS)\monodll_ribbon_panel.obj \\r
+       $(OBJS)\monodll_ribbon_toolbar.obj \\r
+       $(OBJS)\monodll_xh_ribbon.obj \\r
+       $(OBJS)\monodll_richtextbuffer.obj \\r
+       $(OBJS)\monodll_richtextctrl.obj \\r
+       $(OBJS)\monodll_richtextformatdlg.obj \\r
+       $(OBJS)\monodll_richtexthtml.obj \\r
+       $(OBJS)\monodll_richtextimagedlg.obj \\r
+       $(OBJS)\monodll_richtextprint.obj \\r
+       $(OBJS)\monodll_richtextstyledlg.obj \\r
+       $(OBJS)\monodll_richtextstyles.obj \\r
+       $(OBJS)\monodll_richtextsymboldlg.obj \\r
+       $(OBJS)\monodll_richtextxml.obj \\r
+       $(OBJS)\monodll_xh_richtext.obj \\r
+       $(OBJS)\monodll_stc.obj \\r
+       $(OBJS)\monodll_PlatWX.obj \\r
+       $(OBJS)\monodll_ScintillaWX.obj\r
+!endif\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"\r
+____CORE_SRC_FILENAMES_OBJECTS =  \\r
+       $(____LOWLEVEL_SRC_FILENAMES) \
+       $(____GUI_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_accelcmn.obj \\r
+       $(OBJS)\monodll_accesscmn.obj \\r
+       $(OBJS)\monodll_anidecod.obj \\r
+       $(OBJS)\monodll_affinematrix2d.obj \\r
+       $(OBJS)\monodll_appcmn.obj \\r
+       $(OBJS)\monodll_artprov.obj \\r
+       $(OBJS)\monodll_artstd.obj \\r
+       $(OBJS)\monodll_arttango.obj \\r
+       $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
+       $(OBJS)\monodll_bookctrl.obj \\r
+       $(OBJS)\monodll_btncmn.obj \\r
+       $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
+       $(OBJS)\monodll_choiccmn.obj \\r
+       $(OBJS)\monodll_clipcmn.obj \\r
+       $(OBJS)\monodll_clrpickercmn.obj \\r
+       $(OBJS)\monodll_colourcmn.obj \\r
+       $(OBJS)\monodll_colourdata.obj \\r
+       $(OBJS)\monodll_combocmn.obj \\r
+       $(OBJS)\monodll_cmdproc.obj \\r
+       $(OBJS)\monodll_cmndata.obj \\r
+       $(OBJS)\monodll_containr.obj \\r
+       $(OBJS)\monodll_cshelp.obj \\r
+       $(OBJS)\monodll_ctrlcmn.obj \\r
+       $(OBJS)\monodll_ctrlsub.obj \\r
+       $(OBJS)\monodll_dcbase.obj \\r
+       $(OBJS)\monodll_dcbufcmn.obj \\r
+       $(OBJS)\monodll_dcgraph.obj \\r
+       $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
+       $(OBJS)\monodll_dlgcmn.obj \\r
+       $(OBJS)\monodll_dndcmn.obj \\r
+       $(OBJS)\monodll_dobjcmn.obj \\r
+       $(OBJS)\monodll_docmdi.obj \\r
+       $(OBJS)\monodll_docview.obj \\r
+       $(OBJS)\monodll_dpycmn.obj \\r
+       $(OBJS)\monodll_dseldlg.obj \\r
+       $(OBJS)\monodll_effects.obj \\r
+       $(OBJS)\monodll_fddlgcmn.obj \\r
+       $(OBJS)\monodll_filectrlcmn.obj \\r
+       $(OBJS)\monodll_filehistorycmn.obj \\r
+       $(OBJS)\monodll_filepickercmn.obj \\r
+       $(OBJS)\monodll_fontpickercmn.obj \\r
+       $(OBJS)\monodll_fldlgcmn.obj \\r
+       $(OBJS)\monodll_fontcmn.obj \\r
+       $(OBJS)\monodll_fontdata.obj \\r
+       $(OBJS)\monodll_graphicc.obj \\r
+       $(OBJS)\monodll_fontenumcmn.obj \\r
+       $(OBJS)\monodll_fontmap.obj \\r
+       $(OBJS)\monodll_fontutilcmn.obj \\r
+       $(OBJS)\monodll_framecmn.obj \\r
+       $(OBJS)\monodll_gaugecmn.obj \\r
+       $(OBJS)\monodll_gbsizer.obj \\r
+       $(OBJS)\monodll_gdicmn.obj \\r
+       $(OBJS)\monodll_geometry.obj \\r
+       $(OBJS)\monodll_gifdecod.obj \\r
+       $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_headercolcmn.obj \\r
+       $(OBJS)\monodll_headerctrlcmn.obj \\r
+       $(OBJS)\monodll_helpbase.obj \\r
+       $(OBJS)\monodll_iconbndl.obj \\r
+       $(OBJS)\monodll_imagall.obj \\r
+       $(OBJS)\monodll_imagbmp.obj \\r
+       $(OBJS)\monodll_image.obj \\r
+       $(OBJS)\monodll_imagfill.obj \\r
+       $(OBJS)\monodll_imaggif.obj \\r
+       $(OBJS)\monodll_imagiff.obj \\r
+       $(OBJS)\monodll_imagjpeg.obj \\r
+       $(OBJS)\monodll_imagpcx.obj \\r
+       $(OBJS)\monodll_imagpng.obj \\r
+       $(OBJS)\monodll_imagpnm.obj \\r
+       $(OBJS)\monodll_imagtga.obj \\r
+       $(OBJS)\monodll_imagtiff.obj \\r
+       $(OBJS)\monodll_imagxpm.obj \\r
+       $(OBJS)\monodll_layout.obj \\r
+       $(OBJS)\monodll_lboxcmn.obj \\r
+       $(OBJS)\monodll_listctrlcmn.obj \\r
+       $(OBJS)\monodll_markupparser.obj \\r
+       $(OBJS)\monodll_matrix.obj \\r
+       $(OBJS)\monodll_menucmn.obj \\r
+       $(OBJS)\monodll_mousemanager.obj \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
+       $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_prntbase.obj \\r
+       $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
+       $(OBJS)\monodll_radiocmn.obj \\r
+       $(OBJS)\monodll_rearrangectrl.obj \\r
+       $(OBJS)\monodll_rendcmn.obj \\r
+       $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
+       $(OBJS)\monodll_settcmn.obj \\r
+       $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
+       $(OBJS)\monodll_spinctrlcmn.obj \\r
+       $(OBJS)\monodll_srchcmn.obj \\r
+       $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
+       $(OBJS)\monodll_stattextcmn.obj \\r
+       $(OBJS)\monodll_stockitem.obj \\r
+       $(OBJS)\monodll_tbarbase.obj \\r
+       $(OBJS)\monodll_textcmn.obj \\r
+       $(OBJS)\monodll_textentrycmn.obj \\r
+       $(OBJS)\monodll_textmeasurecmn.obj \\r
+       $(OBJS)\monodll_toplvcmn.obj \\r
+       $(OBJS)\monodll_treebase.obj \\r
+       $(OBJS)\monodll_uiactioncmn.obj \\r
+       $(OBJS)\monodll_valgen.obj \\r
+       $(OBJS)\monodll_validate.obj \\r
+       $(OBJS)\monodll_valtext.obj \\r
+       $(OBJS)\monodll_valnum.obj \\r
+       $(OBJS)\monodll_wincmn.obj \\r
+       $(OBJS)\monodll_windowid.obj \\r
+       $(OBJS)\monodll_wrapsizer.obj \\r
+       $(OBJS)\monodll_xpmdecod.obj \\r
+       $(OBJS)\monodll_busyinfo.obj \\r
+       $(OBJS)\monodll_generic_buttonbar.obj \\r
+       $(OBJS)\monodll_choicdgg.obj \\r
+       $(OBJS)\monodll_choicbkg.obj \\r
+       $(OBJS)\monodll_combog.obj \\r
+       $(OBJS)\monodll_dcpsg.obj \\r
+       $(OBJS)\monodll_dirctrlg.obj \\r
+       $(OBJS)\monodll_dragimgg.obj \\r
+       $(OBJS)\monodll_filectrlg.obj \\r
+       $(OBJS)\monodll_headerctrlg.obj \\r
+       $(OBJS)\monodll_generic_infobar.obj \
+       $(OBJS)\monodll_listbkg.obj \\r
+       $(OBJS)\monodll_logg.obj \\r
+       $(OBJS)\monodll_markuptext.obj \\r
+       $(OBJS)\monodll_msgdlgg.obj \\r
+       $(OBJS)\monodll_numdlgg.obj \\r
+       $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_printps.obj \\r
+       $(OBJS)\monodll_renderg.obj \\r
+       $(OBJS)\monodll_richmsgdlgg.obj \\r
+       $(OBJS)\monodll_scrlwing.obj \\r
+       $(OBJS)\monodll_selstore.obj \\r
+       $(OBJS)\monodll_spinctlg.obj \\r
+       $(OBJS)\monodll_splitter.obj \\r
+       $(OBJS)\monodll_srchctlg.obj \\r
+       $(OBJS)\monodll_statbmpg.obj \\r
+       $(OBJS)\monodll_stattextg.obj \\r
+       $(OBJS)\monodll_textdlgg.obj \\r
+       $(OBJS)\monodll_tipwin.obj \\r
+       $(OBJS)\monodll_toolbkg.obj \\r
+       $(OBJS)\monodll_treectlg.obj \\r
+       $(OBJS)\monodll_treebkg.obj \\r
+       $(OBJS)\monodll_vlbox.obj \\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r
+!endif\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
+____CORE_SRC_FILENAMES_OBJECTS =  \\r
+       $(____LOWLEVEL_SRC_FILENAMES) \
+       $(____UNIV_PLATFORM_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_generic_accel.obj \\r
+       $(OBJS)\monodll_clrpickerg.obj \\r
+       $(OBJS)\monodll_collpaneg.obj \\r
+       $(OBJS)\monodll_colrdlgg.obj \\r
+       $(OBJS)\monodll_dirdlgg.obj \\r
+       $(OBJS)\monodll_generic_fdrepdlg.obj \\r
+       $(OBJS)\monodll_filedlgg.obj \\r
+       $(OBJS)\monodll_filepickerg.obj \\r
+       $(OBJS)\monodll_fontdlgg.obj \\r
+       $(OBJS)\monodll_fontpickerg.obj \\r
+       $(OBJS)\monodll_generic_listctrl.obj \\r
+       $(OBJS)\monodll_mdig.obj \\r
+       $(OBJS)\monodll_prntdlgg.obj \\r
+       $(OBJS)\monodll_univ_bmpbuttn.obj \\r
+       $(OBJS)\monodll_univ_button.obj \\r
+       $(OBJS)\monodll_univ_checkbox.obj \\r
+       $(OBJS)\monodll_univ_checklst.obj \\r
+       $(OBJS)\monodll_univ_choice.obj \\r
+       $(OBJS)\monodll_univ_combobox.obj \\r
+       $(OBJS)\monodll_univ_control.obj \\r
+       $(OBJS)\monodll_ctrlrend.obj \\r
+       $(OBJS)\monodll_univ_dialog.obj \\r
+       $(OBJS)\monodll_framuniv.obj \\r
+       $(OBJS)\monodll_univ_gauge.obj \\r
+       $(OBJS)\monodll_inpcons.obj \\r
+       $(OBJS)\monodll_inphand.obj \\r
+       $(OBJS)\monodll_univ_listbox.obj \\r
+       $(OBJS)\monodll_univ_menu.obj \\r
+       $(OBJS)\monodll_univ_notebook.obj \\r
+       $(OBJS)\monodll_univ_radiobox.obj \\r
+       $(OBJS)\monodll_univ_radiobut.obj \\r
+       $(OBJS)\monodll_scrarrow.obj \\r
+       $(OBJS)\monodll_univ_scrolbar.obj \\r
+       $(OBJS)\monodll_scrthumb.obj \\r
+       $(OBJS)\monodll_settingsuniv.obj \\r
+       $(OBJS)\monodll_univ_slider.obj \\r
+       $(OBJS)\monodll_univ_spinbutt.obj \\r
+       $(OBJS)\monodll_univ_statbmp.obj \\r
+       $(OBJS)\monodll_univ_statbox.obj \\r
+       $(OBJS)\monodll_univ_statline.obj \\r
+       $(OBJS)\monodll_univ_stattext.obj \\r
+       $(OBJS)\monodll_univ_statusbr.obj \\r
+       $(OBJS)\monodll_stdrend.obj \\r
+       $(OBJS)\monodll_univ_textctrl.obj \\r
+       $(OBJS)\monodll_univ_tglbtn.obj \\r
+       $(OBJS)\monodll_theme.obj \\r
+       $(OBJS)\monodll_univ_toolbar.obj \\r
+       $(OBJS)\monodll_topluniv.obj \\r
+       $(OBJS)\monodll_winuniv.obj \\r
+       $(OBJS)\monodll_gtk.obj \\r
+       $(OBJS)\monodll_metal.obj \\r
+       $(OBJS)\monodll_mono.obj \\r
+       $(OBJS)\monodll_win32.obj \\r
+       $(OBJS)\monodll_accelcmn.obj \\r
+       $(OBJS)\monodll_accesscmn.obj \\r
+       $(OBJS)\monodll_anidecod.obj \\r
+       $(OBJS)\monodll_affinematrix2d.obj \\r
+       $(OBJS)\monodll_appcmn.obj \\r
+       $(OBJS)\monodll_artprov.obj \\r
+       $(OBJS)\monodll_artstd.obj \\r
+       $(OBJS)\monodll_arttango.obj \\r
+       $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
+       $(OBJS)\monodll_bookctrl.obj \\r
+       $(OBJS)\monodll_btncmn.obj \\r
+       $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
+       $(OBJS)\monodll_choiccmn.obj \\r
+       $(OBJS)\monodll_clipcmn.obj \\r
+       $(OBJS)\monodll_clrpickercmn.obj \\r
+       $(OBJS)\monodll_colourcmn.obj \\r
+       $(OBJS)\monodll_colourdata.obj \\r
+       $(OBJS)\monodll_combocmn.obj \\r
+       $(OBJS)\monodll_cmdproc.obj \\r
+       $(OBJS)\monodll_cmndata.obj \\r
+       $(OBJS)\monodll_containr.obj \\r
+       $(OBJS)\monodll_cshelp.obj \\r
+       $(OBJS)\monodll_ctrlcmn.obj \\r
+       $(OBJS)\monodll_ctrlsub.obj \\r
+       $(OBJS)\monodll_dcbase.obj \\r
+       $(OBJS)\monodll_dcbufcmn.obj \\r
+       $(OBJS)\monodll_dcgraph.obj \\r
+       $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
+       $(OBJS)\monodll_dlgcmn.obj \\r
+       $(OBJS)\monodll_dndcmn.obj \\r
+       $(OBJS)\monodll_dobjcmn.obj \\r
+       $(OBJS)\monodll_docmdi.obj \\r
+       $(OBJS)\monodll_docview.obj \\r
+       $(OBJS)\monodll_dpycmn.obj \\r
+       $(OBJS)\monodll_dseldlg.obj \\r
+       $(OBJS)\monodll_effects.obj \\r
+       $(OBJS)\monodll_fddlgcmn.obj \\r
+       $(OBJS)\monodll_filectrlcmn.obj \\r
+       $(OBJS)\monodll_filehistorycmn.obj \\r
+       $(OBJS)\monodll_filepickercmn.obj \\r
+       $(OBJS)\monodll_fontpickercmn.obj \\r
+       $(OBJS)\monodll_fldlgcmn.obj \\r
+       $(OBJS)\monodll_fontcmn.obj \\r
+       $(OBJS)\monodll_fontdata.obj \\r
+       $(OBJS)\monodll_graphicc.obj \\r
+       $(OBJS)\monodll_fontenumcmn.obj \\r
+       $(OBJS)\monodll_fontmap.obj \\r
+       $(OBJS)\monodll_fontutilcmn.obj \\r
+       $(OBJS)\monodll_framecmn.obj \\r
+       $(OBJS)\monodll_gaugecmn.obj \\r
+       $(OBJS)\monodll_gbsizer.obj \\r
+       $(OBJS)\monodll_gdicmn.obj \\r
+       $(OBJS)\monodll_geometry.obj \\r
+       $(OBJS)\monodll_gifdecod.obj \\r
+       $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_headercolcmn.obj \\r
+       $(OBJS)\monodll_headerctrlcmn.obj \\r
+       $(OBJS)\monodll_helpbase.obj \\r
+       $(OBJS)\monodll_iconbndl.obj \\r
+       $(OBJS)\monodll_imagall.obj \\r
+       $(OBJS)\monodll_imagbmp.obj \\r
+       $(OBJS)\monodll_image.obj \\r
+       $(OBJS)\monodll_imagfill.obj \\r
+       $(OBJS)\monodll_imaggif.obj \\r
+       $(OBJS)\monodll_imagiff.obj \\r
+       $(OBJS)\monodll_imagjpeg.obj \\r
+       $(OBJS)\monodll_imagpcx.obj \\r
+       $(OBJS)\monodll_imagpng.obj \\r
+       $(OBJS)\monodll_imagpnm.obj \\r
+       $(OBJS)\monodll_imagtga.obj \\r
+       $(OBJS)\monodll_imagtiff.obj \\r
+       $(OBJS)\monodll_imagxpm.obj \\r
+       $(OBJS)\monodll_layout.obj \\r
+       $(OBJS)\monodll_lboxcmn.obj \\r
+       $(OBJS)\monodll_listctrlcmn.obj \\r
+       $(OBJS)\monodll_markupparser.obj \\r
+       $(OBJS)\monodll_matrix.obj \\r
+       $(OBJS)\monodll_menucmn.obj \\r
+       $(OBJS)\monodll_mousemanager.obj \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
+       $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_prntbase.obj \\r
+       $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
+       $(OBJS)\monodll_radiocmn.obj \\r
+       $(OBJS)\monodll_rearrangectrl.obj \\r
+       $(OBJS)\monodll_rendcmn.obj \\r
+       $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
+       $(OBJS)\monodll_settcmn.obj \\r
+       $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
+       $(OBJS)\monodll_spinctrlcmn.obj \\r
+       $(OBJS)\monodll_srchcmn.obj \\r
+       $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
+       $(OBJS)\monodll_stattextcmn.obj \\r
+       $(OBJS)\monodll_stockitem.obj \\r
+       $(OBJS)\monodll_tbarbase.obj \\r
+       $(OBJS)\monodll_textcmn.obj \\r
+       $(OBJS)\monodll_textentrycmn.obj \\r
+       $(OBJS)\monodll_textmeasurecmn.obj \\r
+       $(OBJS)\monodll_toplvcmn.obj \\r
+       $(OBJS)\monodll_treebase.obj \\r
+       $(OBJS)\monodll_uiactioncmn.obj \\r
+       $(OBJS)\monodll_valgen.obj \\r
+       $(OBJS)\monodll_validate.obj \\r
+       $(OBJS)\monodll_valtext.obj \\r
+       $(OBJS)\monodll_valnum.obj \\r
+       $(OBJS)\monodll_wincmn.obj \\r
+       $(OBJS)\monodll_windowid.obj \\r
+       $(OBJS)\monodll_wrapsizer.obj \\r
+       $(OBJS)\monodll_xpmdecod.obj \\r
+       $(OBJS)\monodll_busyinfo.obj \\r
+       $(OBJS)\monodll_generic_buttonbar.obj \\r
+       $(OBJS)\monodll_choicdgg.obj \\r
+       $(OBJS)\monodll_choicbkg.obj \\r
+       $(OBJS)\monodll_combog.obj \\r
+       $(OBJS)\monodll_dcpsg.obj \\r
+       $(OBJS)\monodll_dirctrlg.obj \\r
+       $(OBJS)\monodll_dragimgg.obj \\r
+       $(OBJS)\monodll_filectrlg.obj \\r
+       $(OBJS)\monodll_headerctrlg.obj \\r
+       $(OBJS)\monodll_generic_infobar.obj \
+       $(OBJS)\monodll_listbkg.obj \\r
+       $(OBJS)\monodll_logg.obj \\r
+       $(OBJS)\monodll_markuptext.obj \\r
+       $(OBJS)\monodll_msgdlgg.obj \\r
+       $(OBJS)\monodll_numdlgg.obj \\r
+       $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_printps.obj \\r
+       $(OBJS)\monodll_renderg.obj \\r
+       $(OBJS)\monodll_richmsgdlgg.obj \\r
+       $(OBJS)\monodll_scrlwing.obj \\r
+       $(OBJS)\monodll_selstore.obj \\r
+       $(OBJS)\monodll_spinctlg.obj \\r
+       $(OBJS)\monodll_splitter.obj \\r
+       $(OBJS)\monodll_srchctlg.obj \\r
+       $(OBJS)\monodll_statbmpg.obj \\r
+       $(OBJS)\monodll_stattextg.obj \\r
+       $(OBJS)\monodll_textdlgg.obj \\r
+       $(OBJS)\monodll_tipwin.obj \\r
+       $(OBJS)\monodll_toolbkg.obj \\r
+       $(OBJS)\monodll_treectlg.obj \\r
+       $(OBJS)\monodll_treebkg.obj \\r
+       $(OBJS)\monodll_vlbox.obj \\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r
+!endif\r
+!if "$(TOOLKIT)" == "COCOA"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_NSBox.obj \
+       $(OBJS)\monodll_NSButton.obj \
+       $(OBJS)\monodll_NSControl.obj \
+       $(OBJS)\monodll_NSMenu.obj \
+       $(OBJS)\monodll_NSPanel.obj \
+       $(OBJS)\monodll_NSScroller.obj \
+       $(OBJS)\monodll_NSSlider.obj \
+       $(OBJS)\monodll_NSTabView.obj \
+       $(OBJS)\monodll_NSTableView.obj \
+       $(OBJS)\monodll_NSTextField.obj \
+       $(OBJS)\monodll_NSView.obj \
+       $(OBJS)\monodll_NSWindow.obj \
+       $(OBJS)\monodll_ObjcRef.obj \
+       $(OBJS)\monodll_cocoa_app.obj \
+       $(OBJS)\monodll_cocoa_bitmap.obj \
+       $(OBJS)\monodll_cocoa_bmpbuttn.obj \
+       $(OBJS)\monodll_cocoa_brush.obj \
+       $(OBJS)\monodll_src_cocoa_button.obj \
+       $(OBJS)\monodll_src_cocoa_checkbox.obj \
+       $(OBJS)\monodll_cocoa_checklst.obj \
+       $(OBJS)\monodll_src_cocoa_choice.obj \
+       $(OBJS)\monodll_cocoa_clipbrd.obj \
+       $(OBJS)\monodll_cocoa_colordlg.obj \
+       $(OBJS)\monodll_src_cocoa_colour.obj \
+       $(OBJS)\monodll_src_cocoa_combobox.obj \
+       $(OBJS)\monodll_cocoa_control.obj \
+       $(OBJS)\monodll_cocoa_cursor.obj \
+       $(OBJS)\monodll_cocoa_data.obj \
+       $(OBJS)\monodll_cocoa_dataobj.obj \
+       $(OBJS)\monodll_cocoa_dc.obj \
+       $(OBJS)\monodll_cocoa_dcclient.obj \
+       $(OBJS)\monodll_cocoa_dcmemory.obj \
+       $(OBJS)\monodll_cocoa_dcscreen.obj \
+       $(OBJS)\monodll_src_cocoa_dialog.obj \
+       $(OBJS)\monodll_src_cocoa_dirdlg.obj \
+       $(OBJS)\monodll_cocoa_display.obj \
+       $(OBJS)\monodll_cocoa_drawer.obj \
+       $(OBJS)\monodll_src_cocoa_evtloop.obj \
+       $(OBJS)\monodll_src_cocoa_filedlg.obj \
+       $(OBJS)\monodll_cocoa_font.obj \
+       $(OBJS)\monodll_cocoa_fontdlg.obj \
+       $(OBJS)\monodll_cocoa_fontenum.obj \
+       $(OBJS)\monodll_cocoa_fontutil.obj \
+       $(OBJS)\monodll_cocoa_frame.obj \
+       $(OBJS)\monodll_src_cocoa_gauge.obj \
+       $(OBJS)\monodll_cocoa_icon.obj \
+       $(OBJS)\monodll_src_cocoa_listbox.obj \
+       $(OBJS)\monodll_cocoa_main.obj \
+       $(OBJS)\monodll_mbarman.obj \
+       $(OBJS)\monodll_cocoa_mdi.obj \
+       $(OBJS)\monodll_src_cocoa_menu.obj \
+       $(OBJS)\monodll_src_cocoa_menuitem.obj \
+       $(OBJS)\monodll_src_cocoa_msgdlg.obj \
+       $(OBJS)\monodll_src_cocoa_notebook.obj \
+       $(OBJS)\monodll_cocoa_pen.obj \
+       $(OBJS)\monodll_cocoa_radiobox.obj \
+       $(OBJS)\monodll_src_cocoa_radiobut.obj \
+       $(OBJS)\monodll_cocoa_region.obj \
+       $(OBJS)\monodll_src_cocoa_scrolbar.obj \
+       $(OBJS)\monodll_cocoa_settings.obj \
+       $(OBJS)\monodll_src_cocoa_slider.obj \
+       $(OBJS)\monodll_cocoa_sound.obj \
+       $(OBJS)\monodll_src_cocoa_spinbutt.obj \
+       $(OBJS)\monodll_cocoa_statbmp.obj \
+       $(OBJS)\monodll_src_cocoa_statbox.obj \
+       $(OBJS)\monodll_statline2.obj \
+       $(OBJS)\monodll_src_cocoa_stattext.obj \
+       $(OBJS)\monodll_src_cocoa_textctrl.obj \
+       $(OBJS)\monodll_cocoa_timer.obj \
+       $(OBJS)\monodll_src_cocoa_toolbar.obj \
+       $(OBJS)\monodll_src_cocoa_tooltip.obj \
+       $(OBJS)\monodll_cocoa_toplevel.obj \
+       $(OBJS)\monodll_src_cocoa_utils.obj \
+       $(OBJS)\monodll_cocoa_utilsexc.obj \
+       $(OBJS)\monodll_src_cocoa_window.obj \
+       $(OBJS)\monodll_generic_accel.obj \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
+       $(OBJS)\monodll_paletteg.obj \
+       $(OBJS)\monodll_regiong.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj
+!endif\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_generic_accel.obj \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_gtk1_bmpbuttn.obj \
+       $(OBJS)\monodll_gtk1_button.obj \
+       $(OBJS)\monodll_gtk1_checkbox.obj \
+       $(OBJS)\monodll_gtk1_checklst.obj \
+       $(OBJS)\monodll_gtk1_choice.obj \
+       $(OBJS)\monodll_gtk1_combobox.obj \
+       $(OBJS)\monodll_gtk1_control.obj \
+       $(OBJS)\monodll_gtk1_dialog.obj \
+       $(OBJS)\monodll_gtk1_filedlg.obj \
+       $(OBJS)\monodll_gtk1_fontdlg.obj \
+       $(OBJS)\monodll_gtk1_frame.obj \
+       $(OBJS)\monodll_gtk1_gauge.obj \
+       $(OBJS)\monodll_gtk1_listbox.obj \
+       $(OBJS)\monodll_gtk1_mdi.obj \
+       $(OBJS)\monodll_gtk1_menu.obj \
+       $(OBJS)\monodll_gtk1_mnemonics.obj \
+       $(OBJS)\monodll_gtk1_notebook.obj \
+       $(OBJS)\monodll_gtk1_radiobox.obj \
+       $(OBJS)\monodll_gtk1_radiobut.obj \
+       $(OBJS)\monodll_gtk1_scrolbar.obj \
+       $(OBJS)\monodll_gtk1_scrolwin.obj \
+       $(OBJS)\monodll_gtk1_slider.obj \
+       $(OBJS)\monodll_gtk1_spinbutt.obj \
+       $(OBJS)\monodll_gtk1_spinctrl.obj \
+       $(OBJS)\monodll_gtk1_statbmp.obj \
+       $(OBJS)\monodll_gtk1_statbox.obj \
+       $(OBJS)\monodll_gtk1_statline.obj \
+       $(OBJS)\monodll_gtk1_stattext.obj \
+       $(OBJS)\monodll_gtk1_toolbar.obj \
+       $(OBJS)\monodll_gtk1_textctrl.obj \
+       $(OBJS)\monodll_gtk1_tglbtn.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_generic_accel.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_gtk_anybutton.obj \
+       $(OBJS)\monodll_artgtk.obj \
+       $(OBJS)\monodll_gtk_bmpbuttn.obj \
+       $(OBJS)\monodll_gtk_button.obj \
+       $(OBJS)\monodll_gtk_checkbox.obj \
+       $(OBJS)\monodll_gtk_checklst.obj \
+       $(OBJS)\monodll_gtk_choice.obj \
+       $(OBJS)\monodll_collpane.obj \
+       $(OBJS)\monodll_gtk_colordlg.obj \
+       $(OBJS)\monodll_gtk_combobox.obj \
+       $(OBJS)\monodll_gtk_control.obj \
+       $(OBJS)\monodll_clrpicker.obj \
+       $(OBJS)\monodll_gtk_dialog.obj \
+       $(OBJS)\monodll_fontpicker.obj \
+       $(OBJS)\monodll_filepicker.obj \
+       $(OBJS)\monodll_gtk_dirdlg.obj \
+       $(OBJS)\monodll_gtk_filedlg.obj \
+       $(OBJS)\monodll_gtk_fontdlg.obj \
+       $(OBJS)\monodll_gtk_frame.obj \
+       $(OBJS)\monodll_gtk_gauge.obj \
+       $(OBJS)\monodll_gvfs.obj \
+       $(OBJS)\monodll_gtk_infobar.obj \
+       $(OBJS)\monodll_gtk_listbox.obj \
+       $(OBJS)\monodll_gtk_mdi.obj \
+       $(OBJS)\monodll_gtk_menu.obj \
+       $(OBJS)\monodll_gtk_mnemonics.obj \
+       $(OBJS)\monodll_gtk_msgdlg.obj \
+       $(OBJS)\monodll_gtk_nativewin.obj \
+       $(OBJS)\monodll_gtk_notebook.obj \
+       $(OBJS)\monodll_gtk_print.obj \
+       $(OBJS)\monodll_gtk_radiobox.obj \
+       $(OBJS)\monodll_gtk_radiobut.obj \
+       $(OBJS)\monodll_gtk_scrolbar.obj \
+       $(OBJS)\monodll_gtk_scrolwin.obj \
+       $(OBJS)\monodll_gtk_slider.obj \
+       $(OBJS)\monodll_gtk_spinbutt.obj \
+       $(OBJS)\monodll_gtk_spinctrl.obj \
+       $(OBJS)\monodll_gtk_statbmp.obj \
+       $(OBJS)\monodll_gtk_statbox.obj \
+       $(OBJS)\monodll_gtk_statline.obj \
+       $(OBJS)\monodll_gtk_stattext.obj \
+       $(OBJS)\monodll_gtk_toolbar.obj \
+       $(OBJS)\monodll_gtk_textctrl.obj \
+       $(OBJS)\monodll_gtk_textentry.obj \
+       $(OBJS)\monodll_gtk_tglbtn.obj \
+       $(OBJS)\monodll_treeentry_gtk.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_gprint.obj
+!endif\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_generic_accel.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_gtk_anybutton.obj \
+       $(OBJS)\monodll_artgtk.obj \
+       $(OBJS)\monodll_gtk_bmpbuttn.obj \
+       $(OBJS)\monodll_gtk_button.obj \
+       $(OBJS)\monodll_gtk_checkbox.obj \
+       $(OBJS)\monodll_gtk_checklst.obj \
+       $(OBJS)\monodll_gtk_choice.obj \
+       $(OBJS)\monodll_collpane.obj \
+       $(OBJS)\monodll_gtk_colordlg.obj \
+       $(OBJS)\monodll_gtk_combobox.obj \
+       $(OBJS)\monodll_gtk_control.obj \
+       $(OBJS)\monodll_clrpicker.obj \
+       $(OBJS)\monodll_gtk_dialog.obj \
+       $(OBJS)\monodll_fontpicker.obj \
+       $(OBJS)\monodll_filepicker.obj \
+       $(OBJS)\monodll_gtk_dirdlg.obj \
+       $(OBJS)\monodll_gtk_filedlg.obj \
+       $(OBJS)\monodll_gtk_fontdlg.obj \
+       $(OBJS)\monodll_gtk_frame.obj \
+       $(OBJS)\monodll_gtk_gauge.obj \
+       $(OBJS)\monodll_gvfs.obj \
+       $(OBJS)\monodll_gtk_infobar.obj \
+       $(OBJS)\monodll_gtk_listbox.obj \
+       $(OBJS)\monodll_gtk_mdi.obj \
+       $(OBJS)\monodll_gtk_menu.obj \
+       $(OBJS)\monodll_gtk_mnemonics.obj \
+       $(OBJS)\monodll_gtk_msgdlg.obj \
+       $(OBJS)\monodll_gtk_nativewin.obj \
+       $(OBJS)\monodll_gtk_notebook.obj \
+       $(OBJS)\monodll_gtk_print.obj \
+       $(OBJS)\monodll_gtk_radiobox.obj \
+       $(OBJS)\monodll_gtk_radiobut.obj \
+       $(OBJS)\monodll_gtk_scrolbar.obj \
+       $(OBJS)\monodll_gtk_scrolwin.obj \
+       $(OBJS)\monodll_gtk_slider.obj \
+       $(OBJS)\monodll_gtk_spinbutt.obj \
+       $(OBJS)\monodll_gtk_spinctrl.obj \
+       $(OBJS)\monodll_gtk_statbmp.obj \
+       $(OBJS)\monodll_gtk_statbox.obj \
+       $(OBJS)\monodll_gtk_statline.obj \
+       $(OBJS)\monodll_gtk_stattext.obj \
+       $(OBJS)\monodll_gtk_toolbar.obj \
+       $(OBJS)\monodll_gtk_textctrl.obj \
+       $(OBJS)\monodll_gtk_textentry.obj \
+       $(OBJS)\monodll_gtk_tglbtn.obj \
+       $(OBJS)\monodll_treeentry_gtk.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_motif_accel.obj \
+       $(OBJS)\monodll_motif_app.obj \
+       $(OBJS)\monodll_motif_bmpbuttn.obj \
+       $(OBJS)\monodll_bmpmotif.obj \
+       $(OBJS)\monodll_motif_button.obj \
+       $(OBJS)\monodll_motif_checkbox.obj \
+       $(OBJS)\monodll_motif_checklst.obj \
+       $(OBJS)\monodll_motif_choice.obj \
+       $(OBJS)\monodll_motif_clipbrd.obj \
+       $(OBJS)\monodll_motif_colour.obj \
+       $(OBJS)\monodll_motif_combobox.obj \
+       $(OBJS)\monodll_combobox_native.obj \
+       $(OBJS)\monodll_motif_control.obj \
+       $(OBJS)\monodll_motif_cursor.obj \
+       $(OBJS)\monodll_motif_data.obj \
+       $(OBJS)\monodll_motif_dataobj.obj \
+       $(OBJS)\monodll_motif_dc.obj \
+       $(OBJS)\monodll_motif_dcclient.obj \
+       $(OBJS)\monodll_motif_dcmemory.obj \
+       $(OBJS)\monodll_motif_dcscreen.obj \
+       $(OBJS)\monodll_motif_dialog.obj \
+       $(OBJS)\monodll_motif_evtloop.obj \
+       $(OBJS)\monodll_motif_filedlg.obj \
+       $(OBJS)\monodll_motif_font.obj \
+       $(OBJS)\monodll_motif_frame.obj \
+       $(OBJS)\monodll_motif_gauge.obj \
+       $(OBJS)\monodll_sockmot.obj \
+       $(OBJS)\monodll_motif_icon.obj \
+       $(OBJS)\monodll_motif_listbox.obj \
+       $(OBJS)\monodll_motif_main.obj \
+       $(OBJS)\monodll_motif_menu.obj \
+       $(OBJS)\monodll_motif_menuitem.obj \
+       $(OBJS)\monodll_motif_minifram.obj \
+       $(OBJS)\monodll_motif_msgdlg.obj \
+       $(OBJS)\monodll_motif_popupwin.obj \
+       $(OBJS)\monodll_motif_radiobox.obj \
+       $(OBJS)\monodll_motif_radiobut.obj \
+       $(OBJS)\monodll_motif_scrolbar.obj \
+       $(OBJS)\monodll_motif_settings.obj \
+       $(OBJS)\monodll_motif_slider.obj \
+       $(OBJS)\monodll_motif_spinbutt.obj \
+       $(OBJS)\monodll_motif_statbmp.obj \
+       $(OBJS)\monodll_motif_statbox.obj \
+       $(OBJS)\monodll_motif_stattext.obj \
+       $(OBJS)\monodll_motif_textctrl.obj \
+       $(OBJS)\monodll_motif_textentry.obj \
+       $(OBJS)\monodll_motif_timer.obj \
+       $(OBJS)\monodll_motif_toolbar.obj \
+       $(OBJS)\monodll_motif_toplevel.obj \
+       $(OBJS)\monodll_motif_utils.obj \
+       $(OBJS)\monodll_motif_window.obj \
+       $(OBJS)\monodll_xmcombo.obj \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
+       $(OBJS)\monodll_mdig.obj \
+       $(OBJS)\monodll_generic_notebook.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_generic_statline.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_tabg.obj
+!endif\r
+!if "$(TOOLKIT)" == "MSW"
+____GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_clrpickerg.obj \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_filepickerg.obj \
@@ -1879,41 +2878,46 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_generic_statusbr.obj \
        $(OBJS)\monodll_prntdlgg.obj \
        $(OBJS)\monodll_msw_accel.obj \
+       $(OBJS)\monodll_msw_anybutton.obj \
        $(OBJS)\monodll_artmsw.obj \
        $(OBJS)\monodll_msw_bmpbuttn.obj \
        $(OBJS)\monodll_msw_button.obj \
        $(OBJS)\monodll_msw_checkbox.obj \
        $(OBJS)\monodll_msw_choice.obj \
-       $(OBJS)\monodll_colordlg.obj \
+       $(OBJS)\monodll_msw_colordlg.obj \
        $(OBJS)\monodll_combo.obj \
        $(OBJS)\monodll_msw_combobox.obj \
        $(OBJS)\monodll_msw_control.obj \
        $(OBJS)\monodll_msw_dialog.obj \
-       $(OBJS)\monodll_dirdlg.obj \
+       $(OBJS)\monodll_msw_dirdlg.obj \
        $(OBJS)\monodll_dragimag.obj \
-       $(OBJS)\monodll_filedlg.obj \
-       $(OBJS)\monodll_frame.obj \
+       $(OBJS)\monodll_msw_evtloop.obj \
+       $(OBJS)\monodll_msw_filedlg.obj \
+       $(OBJS)\monodll_msw_frame.obj \
        $(OBJS)\monodll_msw_gauge.obj \
        $(OBJS)\monodll_headerctrl.obj \
-       $(OBJS)\monodll_iniconf.obj \
+       $(OBJS)\monodll_msw_iniconf.obj \
        $(OBJS)\monodll_msw_listbox.obj \
        $(OBJS)\monodll_msw_listctrl.obj \
-       $(OBJS)\monodll_mdi.obj \
+       $(OBJS)\monodll_msw_mdi.obj \
        $(OBJS)\monodll_msw_menu.obj \
-       $(OBJS)\monodll_menuitem.obj \
-       $(OBJS)\monodll_metafile.obj \
-       $(OBJS)\monodll_msgdlg.obj \
-       $(OBJS)\monodll_nativdlg.obj \
-       $(OBJS)\monodll_nativewin.obj \
+       $(OBJS)\monodll_msw_menuitem.obj \
+       $(OBJS)\monodll_msw_metafile.obj \
+       $(OBJS)\monodll_msw_msgdlg.obj \
+       $(OBJS)\monodll_msw_nativdlg.obj \
+       $(OBJS)\monodll_msw_nativewin.obj \
        $(OBJS)\monodll_msw_notebook.obj \
        $(OBJS)\monodll_access.obj \
-       $(OBJS)\monodll_ownerdrw.obj \
+       $(OBJS)\monodll_msw_ownerdrw.obj \
+       $(OBJS)\monodll_msw_panel.obj \
+       $(OBJS)\monodll_progdlg.obj \
        $(OBJS)\monodll_msw_radiobox.obj \
        $(OBJS)\monodll_msw_radiobut.obj \
+       $(OBJS)\monodll_richmsgdlg.obj \
        $(OBJS)\monodll_msw_scrolbar.obj \
        $(OBJS)\monodll_msw_slider.obj \
        $(OBJS)\monodll_msw_spinbutt.obj \
-       $(OBJS)\monodll_spinctrl.obj \
+       $(OBJS)\monodll_msw_spinctrl.obj \
        $(OBJS)\monodll_msw_statbmp.obj \
        $(OBJS)\monodll_msw_statbox.obj \
        $(OBJS)\monodll_statusbar.obj \
@@ -1921,439 +2925,285 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msw_stattext.obj \
        $(OBJS)\monodll_msw_toolbar.obj \
        $(OBJS)\monodll_msw_textctrl.obj \
-       $(OBJS)\monodll_textentry.obj \
+       $(OBJS)\monodll_msw_textentry.obj \
        $(OBJS)\monodll_msw_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_msw_checklst.obj \
        $(OBJS)\monodll_msw_fdrepdlg.obj \
-       $(OBJS)\monodll_fontdlg.obj \
-       $(OBJS)\monodll_accelcmn.obj \
-       $(OBJS)\monodll_accesscmn.obj \
-       $(OBJS)\monodll_anidecod.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_artprov.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_colourcmn.obj \
-       $(OBJS)\monodll_combocmn.obj \
-       $(OBJS)\monodll_cmdproc.obj \
-       $(OBJS)\monodll_cmndata.obj \
-       $(OBJS)\monodll_containr.obj \
-       $(OBJS)\monodll_cshelp.obj \
-       $(OBJS)\monodll_ctrlcmn.obj \
-       $(OBJS)\monodll_ctrlsub.obj \
-       $(OBJS)\monodll_datacmn.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_docmdi.obj \
-       $(OBJS)\monodll_docview.obj \
-       $(OBJS)\monodll_dpycmn.obj \
-       $(OBJS)\monodll_dseldlg.obj \
-       $(OBJS)\monodll_effects.obj \
-       $(OBJS)\monodll_fddlgcmn.obj \
-       $(OBJS)\monodll_filectrlcmn.obj \
-       $(OBJS)\monodll_filepickercmn.obj \
-       $(OBJS)\monodll_fontpickercmn.obj \
-       $(OBJS)\monodll_fldlgcmn.obj \
-       $(OBJS)\monodll_fontcmn.obj \
-       $(OBJS)\monodll_fontenumcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
-       $(OBJS)\monodll_fontutilcmn.obj \
-       $(OBJS)\monodll_framecmn.obj \
-       $(OBJS)\monodll_gaugecmn.obj \
-       $(OBJS)\monodll_gbsizer.obj \
-       $(OBJS)\monodll_gdicmn.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_imagbmp.obj \
-       $(OBJS)\monodll_image.obj \
-       $(OBJS)\monodll_imagfill.obj \
-       $(OBJS)\monodll_imaggif.obj \
-       $(OBJS)\monodll_imagiff.obj \
-       $(OBJS)\monodll_imagjpeg.obj \
-       $(OBJS)\monodll_imagpcx.obj \
-       $(OBJS)\monodll_imagpng.obj \
-       $(OBJS)\monodll_imagpnm.obj \
-       $(OBJS)\monodll_imagtga.obj \
-       $(OBJS)\monodll_imagtiff.obj \
-       $(OBJS)\monodll_imagxpm.obj \
-       $(OBJS)\monodll_layout.obj \
-       $(OBJS)\monodll_lboxcmn.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_persist.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_spinctrlcmn.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_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_windowid.obj \
-       $(OBJS)\monodll_wrapsizer.obj \
-       $(OBJS)\monodll_xpmdecod.obj \
-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_generic_buttonbar.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_choicbkg.obj \
-       $(OBJS)\monodll_combog.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_filectrlg.obj \
-       $(OBJS)\monodll_headerctrlg.obj \
-       $(OBJS)\monodll_listbkg.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_printps.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.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_treectlg.obj \
-       $(OBJS)\monodll_treebkg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj
-!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_caret.obj \
-       $(OBJS)\monodll_clipbrd.obj \
-       $(OBJS)\monodll_colour.obj \
-       $(OBJS)\monodll_cursor.obj \
-       $(OBJS)\monodll_data.obj \
-       $(OBJS)\monodll_dc.obj \
-       $(OBJS)\monodll_dcclient.obj \
-       $(OBJS)\monodll_dcmemory.obj \
-       $(OBJS)\monodll_dcprint.obj \
-       $(OBJS)\monodll_dcscreen.obj \
-       $(OBJS)\monodll_dialup.obj \
-       $(OBJS)\monodll_dib.obj \
-       $(OBJS)\monodll_display.obj \
-       $(OBJS)\monodll_enhmeta.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_icon.obj \
-       $(OBJS)\monodll_imaglist.obj \
-       $(OBJS)\monodll_minifram.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_palette.obj \
-       $(OBJS)\monodll_pen.obj \
-       $(OBJS)\monodll_popupwin.obj \
-       $(OBJS)\monodll_printdlg.obj \
-       $(OBJS)\monodll_printwin.obj \
-       $(OBJS)\monodll_region.obj \
-       $(OBJS)\monodll_renderer.obj \
-       $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_tooltip.obj \
-       $(OBJS)\monodll_toplevel.obj \
-       $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_uxtheme.obj \
-       $(OBJS)\monodll_window.obj \
-       $(OBJS)\monodll_helpchm.obj \
-       $(OBJS)\monodll_helpwin.obj \
-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_uuid.obj \
-       $(OBJS)\monodll_generic_accel.obj \
+       $(OBJS)\monodll_msw_fontdlg.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_carbon_anybutton.obj \
+       $(OBJS)\monodll_carbon_bmpbuttn.obj \
+       $(OBJS)\monodll_carbon_button.obj \
+       $(OBJS)\monodll_carbon_checkbox.obj \
+       $(OBJS)\monodll_carbon_choice.obj \
+       $(OBJS)\monodll_carbon_colordlg.obj \
+       $(OBJS)\monodll_carbon_dialog.obj \
+       $(OBJS)\monodll_carbon_dirdlg.obj \
+       $(OBJS)\monodll_carbon_dnd.obj \
+       $(OBJS)\monodll_carbon_evtloop.obj \
+       $(OBJS)\monodll_carbon_filedlg.obj \
+       $(OBJS)\monodll_carbon_gauge.obj \
+       $(OBJS)\monodll_carbon_listbox.obj \
+       $(OBJS)\monodll_listctrl_mac.obj \
+       $(OBJS)\monodll_carbon_menu.obj \
+       $(OBJS)\monodll_carbon_menuitem.obj \
+       $(OBJS)\monodll_carbon_msgdlg.obj \
+       $(OBJS)\monodll_carbon_nonownedwnd.obj \
+       $(OBJS)\monodll_notebmac.obj \
+       $(OBJS)\monodll_carbon_printdlg.obj \
+       $(OBJS)\monodll_carbon_radiobut.obj \
+       $(OBJS)\monodll_carbon_scrolbar.obj \
+       $(OBJS)\monodll_carbon_slider.obj \
+       $(OBJS)\monodll_carbon_spinbutt.obj \
+       $(OBJS)\monodll_carbon_srchctrl.obj \
+       $(OBJS)\monodll_carbon_statbmp.obj \
+       $(OBJS)\monodll_carbon_statbox.obj \
+       $(OBJS)\monodll_statlmac.obj \
+       $(OBJS)\monodll_carbon_stattext.obj \
+       $(OBJS)\monodll_carbon_textctrl.obj \
+       $(OBJS)\monodll_carbon_tglbtn.obj \
+       $(OBJS)\monodll_carbon_toolbar.obj \
+       $(OBJS)\monodll_carbon_tooltip.obj \
+       $(OBJS)\monodll_carbon_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_cocoa_anybutton.obj \
+       $(OBJS)\monodll_osx_cocoa_button.obj \
+       $(OBJS)\monodll_osx_cocoa_checkbox.obj \
+       $(OBJS)\monodll_osx_cocoa_choice.obj \
+       $(OBJS)\monodll_osx_cocoa_colour.obj \
+       $(OBJS)\monodll_osx_cocoa_combobox.obj \
+       $(OBJS)\monodll_osx_cocoa_dialog.obj \
+       $(OBJS)\monodll_osx_cocoa_dirdlg.obj \
+       $(OBJS)\monodll_cocoa_dnd.obj \
+       $(OBJS)\monodll_osx_cocoa_evtloop.obj \
+       $(OBJS)\monodll_osx_cocoa_filedlg.obj \
+       $(OBJS)\monodll_osx_cocoa_gauge.obj \
+       $(OBJS)\monodll_osx_cocoa_listbox.obj \
+       $(OBJS)\monodll_osx_cocoa_menu.obj \
+       $(OBJS)\monodll_osx_cocoa_menuitem.obj \
+       $(OBJS)\monodll_osx_cocoa_msgdlg.obj \
+       $(OBJS)\monodll_cocoa_nonownedwnd.obj \
+       $(OBJS)\monodll_osx_cocoa_notebook.obj \
+       $(OBJS)\monodll_osx_cocoa_radiobut.obj \
+       $(OBJS)\monodll_cocoa_printdlg.obj \
+       $(OBJS)\monodll_osx_cocoa_scrolbar.obj \
+       $(OBJS)\monodll_osx_cocoa_slider.obj \
+       $(OBJS)\monodll_osx_cocoa_spinbutt.obj \
+       $(OBJS)\monodll_cocoa_srchctrl.obj \
+       $(OBJS)\monodll_osx_cocoa_statbox.obj \
+       $(OBJS)\monodll_cocoa_statline.obj \
+       $(OBJS)\monodll_osx_cocoa_stattext.obj \
+       $(OBJS)\monodll_osx_cocoa_textctrl.obj \
+       $(OBJS)\monodll_cocoa_tglbtn.obj \
+       $(OBJS)\monodll_osx_cocoa_toolbar.obj \
+       $(OBJS)\monodll_osx_cocoa_tooltip.obj \
+       $(OBJS)\monodll_osx_cocoa_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_regiong.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_iphone_anybutton.obj \
+       $(OBJS)\monodll_iphone_button.obj \
+       $(OBJS)\monodll_iphone_checkbox.obj \
+       $(OBJS)\monodll_iphone_dialog.obj \
+       $(OBJS)\monodll_iphone_evtloop.obj \
+       $(OBJS)\monodll_iphone_gauge.obj \
+       $(OBJS)\monodll_iphone_msgdlg.obj \
+       $(OBJS)\monodll_iphone_nonownedwnd.obj \
+       $(OBJS)\monodll_iphone_scrolbar.obj \
+       $(OBJS)\monodll_iphone_slider.obj \
+       $(OBJS)\monodll_iphone_stattext.obj \
+       $(OBJS)\monodll_iphone_textctrl.obj \
+       $(OBJS)\monodll_iphone_toolbar.obj \
+       $(OBJS)\monodll_iphone_utils.obj \
+       $(OBJS)\monodll_iphone_window.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_generic_caret.obj \
        $(OBJS)\monodll_clrpickerg.obj \
        $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_generic_fdrepdlg.obj \
-       $(OBJS)\monodll_filedlgg.obj \
        $(OBJS)\monodll_filepickerg.obj \
-       $(OBJS)\monodll_fontdlgg.obj \
        $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
        $(OBJS)\monodll_generic_listctrl.obj \
        $(OBJS)\monodll_mdig.obj \
-       $(OBJS)\monodll_msgdlgg.obj \
        $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_univ_bmpbuttn.obj \
-       $(OBJS)\monodll_univ_button.obj \
-       $(OBJS)\monodll_univ_checkbox.obj \
-       $(OBJS)\monodll_univ_checklst.obj \
-       $(OBJS)\monodll_univ_choice.obj \
-       $(OBJS)\monodll_univ_combobox.obj \
-       $(OBJS)\monodll_univ_control.obj \
-       $(OBJS)\monodll_ctrlrend.obj \
-       $(OBJS)\monodll_univ_dialog.obj \
-       $(OBJS)\monodll_framuniv.obj \
-       $(OBJS)\monodll_univ_gauge.obj \
-       $(OBJS)\monodll_inpcons.obj \
-       $(OBJS)\monodll_inphand.obj \
-       $(OBJS)\monodll_univ_listbox.obj \
-       $(OBJS)\monodll_univ_menu.obj \
-       $(OBJS)\monodll_univ_notebook.obj \
-       $(OBJS)\monodll_univ_radiobox.obj \
-       $(OBJS)\monodll_univ_radiobut.obj \
-       $(OBJS)\monodll_scrarrow.obj \
-       $(OBJS)\monodll_univ_scrolbar.obj \
-       $(OBJS)\monodll_scrthumb.obj \
-       $(OBJS)\monodll_settingsuniv.obj \
-       $(OBJS)\monodll_univ_slider.obj \
-       $(OBJS)\monodll_univ_spinbutt.obj \
-       $(OBJS)\monodll_univ_statbmp.obj \
-       $(OBJS)\monodll_univ_statbox.obj \
-       $(OBJS)\monodll_univ_statline.obj \
-       $(OBJS)\monodll_univ_stattext.obj \
-       $(OBJS)\monodll_univ_statusbr.obj \
-       $(OBJS)\monodll_stdrend.obj \
-       $(OBJS)\monodll_univ_textctrl.obj \
-       $(OBJS)\monodll_univ_tglbtn.obj \
-       $(OBJS)\monodll_theme.obj \
-       $(OBJS)\monodll_univ_toolbar.obj \
-       $(OBJS)\monodll_topluniv.obj \
-       $(OBJS)\monodll_winuniv.obj \
-       $(OBJS)\monodll_gtk.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_artprov.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_colourcmn.obj \
-       $(OBJS)\monodll_combocmn.obj \
-       $(OBJS)\monodll_cmdproc.obj \
-       $(OBJS)\monodll_cmndata.obj \
-       $(OBJS)\monodll_containr.obj \
-       $(OBJS)\monodll_cshelp.obj \
-       $(OBJS)\monodll_ctrlcmn.obj \
-       $(OBJS)\monodll_ctrlsub.obj \
-       $(OBJS)\monodll_datacmn.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_docmdi.obj \
-       $(OBJS)\monodll_docview.obj \
-       $(OBJS)\monodll_dpycmn.obj \
-       $(OBJS)\monodll_dseldlg.obj \
-       $(OBJS)\monodll_effects.obj \
-       $(OBJS)\monodll_fddlgcmn.obj \
-       $(OBJS)\monodll_filectrlcmn.obj \
-       $(OBJS)\monodll_filepickercmn.obj \
-       $(OBJS)\monodll_fontpickercmn.obj \
-       $(OBJS)\monodll_fldlgcmn.obj \
-       $(OBJS)\monodll_fontcmn.obj \
-       $(OBJS)\monodll_fontenumcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
-       $(OBJS)\monodll_fontutilcmn.obj \
-       $(OBJS)\monodll_framecmn.obj \
-       $(OBJS)\monodll_gaugecmn.obj \
-       $(OBJS)\monodll_gbsizer.obj \
-       $(OBJS)\monodll_gdicmn.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_imagbmp.obj \
-       $(OBJS)\monodll_image.obj \
-       $(OBJS)\monodll_imagfill.obj \
-       $(OBJS)\monodll_imaggif.obj \
-       $(OBJS)\monodll_imagiff.obj \
-       $(OBJS)\monodll_imagjpeg.obj \
-       $(OBJS)\monodll_imagpcx.obj \
-       $(OBJS)\monodll_imagpng.obj \
-       $(OBJS)\monodll_imagpnm.obj \
-       $(OBJS)\monodll_imagtga.obj \
-       $(OBJS)\monodll_imagtiff.obj \
-       $(OBJS)\monodll_imagxpm.obj \
-       $(OBJS)\monodll_layout.obj \
-       $(OBJS)\monodll_lboxcmn.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_persist.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_spinctrlcmn.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_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_windowid.obj \
-       $(OBJS)\monodll_wrapsizer.obj \
-       $(OBJS)\monodll_xpmdecod.obj \
-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_generic_buttonbar.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_choicbkg.obj \
-       $(OBJS)\monodll_combog.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_filectrlg.obj \
-       $(OBJS)\monodll_headerctrlg.obj \
-       $(OBJS)\monodll_listbkg.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_printps.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.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_treectlg.obj \
-       $(OBJS)\monodll_treebkg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj
-!endif
-!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_hyperlnkcmn.obj \
-       $(OBJS)\monodll_aboutdlgg.obj \
-       $(OBJS)\monodll_bmpcboxg.obj \
-       $(OBJS)\monodll_calctrlg.obj \
-       $(OBJS)\monodll_datavgen.obj \
-       $(OBJS)\monodll_datectlg.obj \
-       $(OBJS)\monodll_editlbox.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_grideditors.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_hyperlinkg.obj \
-       $(OBJS)\monodll_infobar.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_notifmsgg.obj \
-       $(OBJS)\monodll_odcombo.obj \
-       $(OBJS)\monodll_propdlg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_tipdlg.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_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_bmpcboxcmn.obj \
-       $(OBJS)\monodll_calctrlcmn.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj \
+       $(OBJS)\monodll_os2_accel.obj \
+       $(OBJS)\monodll_os2_app.obj \
+       $(OBJS)\monodll_os2_bitmap.obj \
+       $(OBJS)\monodll_os2_bmpbuttn.obj \
+       $(OBJS)\monodll_os2_brush.obj \
+       $(OBJS)\monodll_os2_button.obj \
+       $(OBJS)\monodll_os2_checkbox.obj \
+       $(OBJS)\monodll_os2_checklst.obj \
+       $(OBJS)\monodll_os2_choice.obj \
+       $(OBJS)\monodll_os2_clipbrd.obj \
+       $(OBJS)\monodll_os2_colour.obj \
+       $(OBJS)\monodll_os2_combobox.obj \
+       $(OBJS)\monodll_os2_control.obj \
+       $(OBJS)\monodll_os2_cursor.obj \
+       $(OBJS)\monodll_os2_data.obj \
+       $(OBJS)\monodll_os2_dataobj.obj \
+       $(OBJS)\monodll_os2_dc.obj \
+       $(OBJS)\monodll_os2_dcclient.obj \
+       $(OBJS)\monodll_os2_dcmemory.obj \
+       $(OBJS)\monodll_os2_dcprint.obj \
+       $(OBJS)\monodll_os2_dcscreen.obj \
+       $(OBJS)\monodll_os2_dialog.obj \
+       $(OBJS)\monodll_os2_dnd.obj \
+       $(OBJS)\monodll_os2_evtloop.obj \
+       $(OBJS)\monodll_os2_filedlg.obj \
+       $(OBJS)\monodll_os2_font.obj \
+       $(OBJS)\monodll_os2_fontdlg.obj \
+       $(OBJS)\monodll_os2_fontenum.obj \
+       $(OBJS)\monodll_os2_fontutil.obj \
+       $(OBJS)\monodll_os2_frame.obj \
+       $(OBJS)\monodll_os2_gauge.obj \
+       $(OBJS)\monodll_os2_gdiimage.obj \
+       $(OBJS)\monodll_sockpm.obj \
+       $(OBJS)\monodll_os2_helpwin.obj \
+       $(OBJS)\monodll_os2_icon.obj \
+       $(OBJS)\monodll_os2_iniconf.obj \
+       $(OBJS)\monodll_os2_listbox.obj \
+       $(OBJS)\monodll_os2_main.obj \
+       $(OBJS)\monodll_os2_menu.obj \
+       $(OBJS)\monodll_os2_menuitem.obj \
+       $(OBJS)\monodll_os2_metafile.obj \
+       $(OBJS)\monodll_os2_minifram.obj \
+       $(OBJS)\monodll_os2_msgdlg.obj \
+       $(OBJS)\monodll_os2_nativdlg.obj \
+       $(OBJS)\monodll_os2_notebook.obj \
+       $(OBJS)\monodll_os2_ownerdrw.obj \
+       $(OBJS)\monodll_os2_palette.obj \
+       $(OBJS)\monodll_os2_pen.obj \
+       $(OBJS)\monodll_os2_popupwin.obj \
+       $(OBJS)\monodll_os2_print.obj \
+       $(OBJS)\monodll_os2_radiobox.obj \
+       $(OBJS)\monodll_os2_radiobut.obj \
+       $(OBJS)\monodll_os2_region.obj \
+       $(OBJS)\monodll_os2_scrolbar.obj \
+       $(OBJS)\monodll_os2_settings.obj \
+       $(OBJS)\monodll_os2_slider.obj \
+       $(OBJS)\monodll_os2_spinbutt.obj \
+       $(OBJS)\monodll_os2_spinctrl.obj \
+       $(OBJS)\monodll_os2_statbmp.obj \
+       $(OBJS)\monodll_os2_statbox.obj \
+       $(OBJS)\monodll_os2_statline.obj \
+       $(OBJS)\monodll_os2_stattext.obj \
+       $(OBJS)\monodll_os2_textctrl.obj \
+       $(OBJS)\monodll_os2_textentry.obj \
+       $(OBJS)\monodll_os2_tglbtn.obj \
+       $(OBJS)\monodll_os2_timer.obj \
+       $(OBJS)\monodll_os2_toolbar.obj \
+       $(OBJS)\monodll_os2_tooltip.obj \
+       $(OBJS)\monodll_os2_toplevel.obj \
+       $(OBJS)\monodll_os2_utilsgui.obj \
+       $(OBJS)\monodll_os2_window.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____GUI_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_msw_accel.obj \
+       $(OBJS)\monodll_msw_anybutton.obj \
+       $(OBJS)\monodll_artmsw.obj \
+       $(OBJS)\monodll_msw_bmpbuttn.obj \
+       $(OBJS)\monodll_msw_button.obj \
+       $(OBJS)\monodll_msw_checkbox.obj \
+       $(OBJS)\monodll_msw_choice.obj \
+       $(OBJS)\monodll_msw_colordlg.obj \
+       $(OBJS)\monodll_combo.obj \
+       $(OBJS)\monodll_msw_combobox.obj \
+       $(OBJS)\monodll_msw_control.obj \
+       $(OBJS)\monodll_msw_dialog.obj \
+       $(OBJS)\monodll_msw_dirdlg.obj \
+       $(OBJS)\monodll_dragimag.obj \
+       $(OBJS)\monodll_msw_evtloop.obj \
+       $(OBJS)\monodll_msw_filedlg.obj \
+       $(OBJS)\monodll_msw_frame.obj \
+       $(OBJS)\monodll_msw_gauge.obj \
+       $(OBJS)\monodll_headerctrl.obj \
+       $(OBJS)\monodll_msw_iniconf.obj \
+       $(OBJS)\monodll_msw_listbox.obj \
+       $(OBJS)\monodll_msw_listctrl.obj \
+       $(OBJS)\monodll_msw_mdi.obj \
+       $(OBJS)\monodll_msw_menu.obj \
+       $(OBJS)\monodll_msw_menuitem.obj \
+       $(OBJS)\monodll_msw_metafile.obj \
+       $(OBJS)\monodll_msw_msgdlg.obj \
+       $(OBJS)\monodll_msw_nativdlg.obj \
+       $(OBJS)\monodll_msw_nativewin.obj \
+       $(OBJS)\monodll_msw_notebook.obj \
+       $(OBJS)\monodll_access.obj \
+       $(OBJS)\monodll_msw_ownerdrw.obj \
+       $(OBJS)\monodll_msw_panel.obj \
+       $(OBJS)\monodll_progdlg.obj \
+       $(OBJS)\monodll_msw_radiobox.obj \
+       $(OBJS)\monodll_msw_radiobut.obj \
+       $(OBJS)\monodll_richmsgdlg.obj \
+       $(OBJS)\monodll_msw_scrolbar.obj \
+       $(OBJS)\monodll_msw_slider.obj \
+       $(OBJS)\monodll_msw_spinbutt.obj \
+       $(OBJS)\monodll_msw_spinctrl.obj \
+       $(OBJS)\monodll_msw_statbmp.obj \
+       $(OBJS)\monodll_msw_statbox.obj \
+       $(OBJS)\monodll_statusbar.obj \
+       $(OBJS)\monodll_msw_statline.obj \
+       $(OBJS)\monodll_msw_stattext.obj \
+       $(OBJS)\monodll_msw_toolbar.obj \
+       $(OBJS)\monodll_msw_textctrl.obj \
+       $(OBJS)\monodll_msw_textentry.obj \
+       $(OBJS)\monodll_msw_tglbtn.obj \
+       $(OBJS)\monodll_treectrl.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
+       $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_wince_checklst.obj \
+       $(OBJS)\monodll_choicece.obj \
+       $(OBJS)\monodll_crt.obj \
+       $(OBJS)\monodll_filedlgwce.obj \
+       $(OBJS)\monodll_filefnwce.obj \
+       $(OBJS)\monodll_helpwce.obj \
+       $(OBJS)\monodll_menuce.obj \
+       $(OBJS)\monodll_tbarwce.obj \
+       $(OBJS)\monodll_textctrlce.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____UNIV_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_msw_evtloop.obj
+!endif
+!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_gridcmn.obj \
        $(OBJS)\monodll_hyperlnkcmn.obj \
+       $(OBJS)\monodll_odcombocmn.obj \
+       $(OBJS)\monodll_richtooltipcmn.obj \
        $(OBJS)\monodll_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_editlbox.obj \
@@ -2363,23 +3213,170 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
        $(OBJS)\monodll_hyperlinkg.obj \
-       $(OBJS)\monodll_infobar.obj \
        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_notifmsgg.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
+       $(OBJS)\monodll_richtooltipg.obj \
        $(OBJS)\monodll_sashwin.obj \
        $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_timectrlg.obj \
        $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_treelist.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 \
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES) \
+       $(____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_OBJECTS)
+!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_gridcmn.obj \
+       $(OBJS)\monodll_hyperlnkcmn.obj \
+       $(OBJS)\monodll_odcombocmn.obj \
+       $(OBJS)\monodll_richtooltipcmn.obj \
+       $(OBJS)\monodll_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
+       $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
+       $(OBJS)\monodll_datavgen.obj \
+       $(OBJS)\monodll_datectlg.obj \
+       $(OBJS)\monodll_editlbox.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_grideditors.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlinkg.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_notifmsgg.obj \
+       $(OBJS)\monodll_odcombo.obj \
+       $(OBJS)\monodll_propdlg.obj \
+       $(OBJS)\monodll_richtooltipg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_timectrlg.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_treelist.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES) \
+       $(____ADVANCED_UNIV_SRC_FILENAMES_OBJECTS)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_gtk_aboutdlg.obj \
+       $(OBJS)\monodll_animate.obj \
+       $(OBJS)\monodll_gtk_bmpcbox.obj \
+       $(OBJS)\monodll_gtk_calctrl.obj \
+       $(OBJS)\monodll_gtk_dataview.obj \
+       $(OBJS)\monodll_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_gtk_aboutdlg.obj \
+       $(OBJS)\monodll_animate.obj \
+       $(OBJS)\monodll_gtk_bmpcbox.obj \
+       $(OBJS)\monodll_gtk_calctrl.obj \
+       $(OBJS)\monodll_gtk_dataview.obj \
+       $(OBJS)\monodll_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_msw_bmpcbox.obj \
+       $(OBJS)\monodll_msw_calctrl.obj \
+       $(OBJS)\monodll_commandlinkbutton.obj \
+       $(OBJS)\monodll_datecontrols.obj \
+       $(OBJS)\monodll_datectrl.obj \
+       $(OBJS)\monodll_msw_datetimectrl.obj \
+       $(OBJS)\monodll_msw_hyperlink.obj \
+       $(OBJS)\monodll_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_msw_bmpcbox.obj \
+       $(OBJS)\monodll_msw_calctrl.obj \
+       $(OBJS)\monodll_commandlinkbutton.obj \
+       $(OBJS)\monodll_datecontrols.obj \
+       $(OBJS)\monodll_datectrl.obj \
+       $(OBJS)\monodll_msw_datetimectrl.obj \
+       $(OBJS)\monodll_msw_hyperlink.obj \
+       $(OBJS)\monodll_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_UNIV_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_UNIV_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_UNIV_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animateg.obj
 !endif
+!if "$(TOOLKIT)" == "COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_src_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_mediactrl_am.obj \
+       $(OBJS)\monodll_mediactrl_wmp10.obj \
+       $(OBJS)\monodll_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_carbon_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_osx_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "PM"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_mediactrl_am.obj \
+       $(OBJS)\monodll_mediactrl_wmp10.obj \
+       $(OBJS)\monodll_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____MEDIA_PLATFORM_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____HTML_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_helpbest.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_webview_webkit.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_webview_ie.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____AUI_GTK_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_tabartgtk.obj
+!endif
 !if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
@@ -2393,15 +3390,30 @@ __RUNTIME_LIBS_131 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_131 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "WINCE"
+____BASE_WINCE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_wince_time.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_carbon_utils.obj \
+       $(OBJS)\monolib_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_osx_cocoa_utils.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____NET_WINCE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_net.obj
+!endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_mediactrlcmn.obj \
-       $(OBJS)\monolib_mediactrl_am.obj \
-       $(OBJS)\monolib_mediactrl_wmp10.obj \
-       $(OBJS)\monolib_mediactrl_qt.obj \
-       $(OBJS)\monolib_helpbest.obj \
+       $(____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS) \
+       $(____HTML_SRC_PLATFORM_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpdlg.obj \
@@ -2421,13 +3433,20 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \
        $(OBJS)\monolib_m_pre.obj \
+       $(OBJS)\monolib_m_span.obj \
        $(OBJS)\monolib_m_style.obj \
        $(OBJS)\monolib_m_tables.obj \
+       $(OBJS)\monolib_styleparams.obj \
        $(OBJS)\monolib_winpars.obj \
        $(OBJS)\monolib_htmllbox.obj \
+       $(____WEBVIEW_SRC_PLATFORM_FILENAMES_1_OBJECTS) \
+       $(OBJS)\monolib_webview.obj \
+       $(OBJS)\monolib_webviewarchivehandler.obj \
+       $(OBJS)\monolib_webviewfshandler.obj \
        $(OBJS)\monolib_debugrpt.obj \
        $(OBJS)\monolib_dbgrptg.obj \
        $(OBJS)\monolib_xh_animatctrl.obj \
+       $(OBJS)\monolib_xh_bannerwindow.obj \
        $(OBJS)\monolib_xh_bmp.obj \
        $(OBJS)\monolib_xh_bmpcbox.obj \
        $(OBJS)\monolib_xh_bmpbt.obj \
@@ -2438,6 +3457,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_choic.obj \
        $(OBJS)\monolib_xh_choicbk.obj \
        $(OBJS)\monolib_xh_clrpicker.obj \
+       $(OBJS)\monolib_xh_cmdlinkbn.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \
        $(OBJS)\monolib_xh_comboctrl.obj \
@@ -2480,7 +3500,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_sttxt.obj \
        $(OBJS)\monolib_xh_text.obj \
        $(OBJS)\monolib_xh_tglbtn.obj \
+       $(OBJS)\monolib_xh_timectrl.obj \
        $(OBJS)\monolib_xh_toolb.obj \
+       $(OBJS)\monolib_xh_toolbk.obj \
        $(OBJS)\monolib_xh_tree.obj \
        $(OBJS)\monolib_xh_treebk.obj \
        $(OBJS)\monolib_xh_unkwn.obj \
@@ -2494,6 +3516,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_auibook.obj \
        $(OBJS)\monolib_auibar.obj \
        $(OBJS)\monolib_tabmdi.obj \
+       $(OBJS)\monolib_tabart.obj \
+       $(OBJS)\monolib_xh_auinotbk.obj \
+       $(____AUI_GTK_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_advprops.obj \
        $(OBJS)\monolib_editors.obj \
        $(OBJS)\monolib_manager.obj \
@@ -2510,141 +3535,48 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_ribbon_control.obj \
        $(OBJS)\monolib_gallery.obj \
        $(OBJS)\monolib_page.obj \
-       $(OBJS)\monolib_panel.obj \
+       $(OBJS)\monolib_ribbon_panel.obj \
        $(OBJS)\monolib_ribbon_toolbar.obj \
-       $(OBJS)\monolib_richtextctrl.obj \
+       $(OBJS)\monolib_xh_ribbon.obj \
        $(OBJS)\monolib_richtextbuffer.obj \
-       $(OBJS)\monolib_richtextstyles.obj \
-       $(OBJS)\monolib_richtextxml.obj \
-       $(OBJS)\monolib_richtexthtml.obj \
+       $(OBJS)\monolib_richtextctrl.obj \
        $(OBJS)\monolib_richtextformatdlg.obj \
-       $(OBJS)\monolib_richtextsymboldlg.obj \
-       $(OBJS)\monolib_richtextstyledlg.obj \
+       $(OBJS)\monolib_richtexthtml.obj \
+       $(OBJS)\monolib_richtextimagedlg.obj \
        $(OBJS)\monolib_richtextprint.obj \
+       $(OBJS)\monolib_richtextstyledlg.obj \
+       $(OBJS)\monolib_richtextstyles.obj \
+       $(OBJS)\monolib_richtextsymboldlg.obj \
+       $(OBJS)\monolib_richtextxml.obj \
+       $(OBJS)\monolib_xh_richtext.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 =  \
-       $(OBJS)\monolib_activex.obj \
-       $(OBJS)\monolib_app.obj \
-       $(OBJS)\monolib_bitmap.obj \
-       $(OBJS)\monolib_brush.obj \
-       $(OBJS)\monolib_caret.obj \
-       $(OBJS)\monolib_clipbrd.obj \
-       $(OBJS)\monolib_colour.obj \
-       $(OBJS)\monolib_cursor.obj \
-       $(OBJS)\monolib_data.obj \
-       $(OBJS)\monolib_dc.obj \
-       $(OBJS)\monolib_dcclient.obj \
-       $(OBJS)\monolib_dcmemory.obj \
-       $(OBJS)\monolib_dcprint.obj \
-       $(OBJS)\monolib_dcscreen.obj \
-       $(OBJS)\monolib_dialup.obj \
-       $(OBJS)\monolib_dib.obj \
-       $(OBJS)\monolib_display.obj \
-       $(OBJS)\monolib_enhmeta.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_icon.obj \
-       $(OBJS)\monolib_imaglist.obj \
-       $(OBJS)\monolib_minifram.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_palette.obj \
-       $(OBJS)\monolib_pen.obj \
-       $(OBJS)\monolib_popupwin.obj \
-       $(OBJS)\monolib_printdlg.obj \
-       $(OBJS)\monolib_printwin.obj \
-       $(OBJS)\monolib_region.obj \
-       $(OBJS)\monolib_renderer.obj \
-       $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_tooltip.obj \
-       $(OBJS)\monolib_toplevel.obj \
-       $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_uxtheme.obj \
-       $(OBJS)\monolib_window.obj \
-       $(OBJS)\monolib_helpchm.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_generic_statusbr.obj \
-       $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_msw_accel.obj \
-       $(OBJS)\monolib_artmsw.obj \
-       $(OBJS)\monolib_msw_bmpbuttn.obj \
-       $(OBJS)\monolib_msw_button.obj \
-       $(OBJS)\monolib_msw_checkbox.obj \
-       $(OBJS)\monolib_msw_choice.obj \
-       $(OBJS)\monolib_colordlg.obj \
-       $(OBJS)\monolib_combo.obj \
-       $(OBJS)\monolib_msw_combobox.obj \
-       $(OBJS)\monolib_msw_control.obj \
-       $(OBJS)\monolib_msw_dialog.obj \
-       $(OBJS)\monolib_dirdlg.obj \
-       $(OBJS)\monolib_dragimag.obj \
-       $(OBJS)\monolib_filedlg.obj \
-       $(OBJS)\monolib_frame.obj \
-       $(OBJS)\monolib_msw_gauge.obj \
-       $(OBJS)\monolib_headerctrl.obj \
-       $(OBJS)\monolib_iniconf.obj \
-       $(OBJS)\monolib_msw_listbox.obj \
-       $(OBJS)\monolib_msw_listctrl.obj \
-       $(OBJS)\monolib_mdi.obj \
-       $(OBJS)\monolib_msw_menu.obj \
-       $(OBJS)\monolib_menuitem.obj \
-       $(OBJS)\monolib_metafile.obj \
-       $(OBJS)\monolib_msgdlg.obj \
-       $(OBJS)\monolib_nativdlg.obj \
-       $(OBJS)\monolib_nativewin.obj \
-       $(OBJS)\monolib_msw_notebook.obj \
-       $(OBJS)\monolib_access.obj \
-       $(OBJS)\monolib_ownerdrw.obj \
-       $(OBJS)\monolib_msw_radiobox.obj \
-       $(OBJS)\monolib_msw_radiobut.obj \
-       $(OBJS)\monolib_msw_scrolbar.obj \
-       $(OBJS)\monolib_msw_slider.obj \
-       $(OBJS)\monolib_msw_spinbutt.obj \
-       $(OBJS)\monolib_spinctrl.obj \
-       $(OBJS)\monolib_msw_statbmp.obj \
-       $(OBJS)\monolib_msw_statbox.obj \
-       $(OBJS)\monolib_statusbar.obj \
-       $(OBJS)\monolib_msw_statline.obj \
-       $(OBJS)\monolib_msw_stattext.obj \
-       $(OBJS)\monolib_msw_toolbar.obj \
-       $(OBJS)\monolib_msw_textctrl.obj \
-       $(OBJS)\monolib_textentry.obj \
-       $(OBJS)\monolib_msw_tglbtn.obj \
-       $(OBJS)\monolib_treectrl.obj \
-       $(OBJS)\monolib_msw_checklst.obj \
-       $(OBJS)\monolib_msw_fdrepdlg.obj \
-       $(OBJS)\monolib_fontdlg.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_0) \
+       $(____GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_accelcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
+       $(OBJS)\monolib_affinematrix2d.obj \
        $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
+       $(OBJS)\monolib_arttango.obj \
        $(OBJS)\monolib_bmpbase.obj \
+       $(OBJS)\monolib_bmpbtncmn.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_btncmn.obj \
        $(OBJS)\monolib_cairo.obj \
+       $(OBJS)\monolib_checkboxcmn.obj \
+       $(OBJS)\monolib_checklstcmn.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_clrpickercmn.obj \
        $(OBJS)\monolib_colourcmn.obj \
+       $(OBJS)\monolib_colourdata.obj \
        $(OBJS)\monolib_combocmn.obj \
        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
@@ -2652,11 +3584,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_cshelp.obj \
        $(OBJS)\monolib_ctrlcmn.obj \
        $(OBJS)\monolib_ctrlsub.obj \
-       $(OBJS)\monolib_datacmn.obj \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dcbufcmn.obj \
        $(OBJS)\monolib_dcgraph.obj \
        $(OBJS)\monolib_dcsvg.obj \
+       $(OBJS)\monolib_dirctrlcmn.obj \
        $(OBJS)\monolib_dlgcmn.obj \
        $(OBJS)\monolib_dndcmn.obj \
        $(OBJS)\monolib_dobjcmn.obj \
@@ -2667,10 +3599,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_effects.obj \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_filectrlcmn.obj \
+       $(OBJS)\monolib_filehistorycmn.obj \
        $(OBJS)\monolib_filepickercmn.obj \
        $(OBJS)\monolib_fontpickercmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontdata.obj \
+       $(OBJS)\monolib_graphicc.obj \
        $(OBJS)\monolib_fontenumcmn.obj \
        $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_fontutilcmn.obj \
@@ -2701,36 +3636,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_listctrlcmn.obj \
+       $(OBJS)\monolib_markupparser.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \
        $(OBJS)\monolib_mousemanager.obj \
        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
+       $(OBJS)\monolib_ownerdrwcmn.obj \
        $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_panelcmn.obj \
        $(OBJS)\monolib_persist.obj \
        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
        $(OBJS)\monolib_quantize.obj \
+       $(OBJS)\monolib_radiobtncmn.obj \
        $(OBJS)\monolib_radiocmn.obj \
        $(OBJS)\monolib_rearrangectrl.obj \
        $(OBJS)\monolib_rendcmn.obj \
        $(OBJS)\monolib_rgncmn.obj \
+       $(OBJS)\monolib_scrolbarcmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_slidercmn.obj \
+       $(OBJS)\monolib_spinbtncmn.obj \
        $(OBJS)\monolib_spinctrlcmn.obj \
        $(OBJS)\monolib_srchcmn.obj \
        $(OBJS)\monolib_statbar.obj \
+       $(OBJS)\monolib_statbmpcmn.obj \
+       $(OBJS)\monolib_statboxcmn.obj \
+       $(OBJS)\monolib_statlinecmn.obj \
        $(OBJS)\monolib_stattextcmn.obj \
        $(OBJS)\monolib_stockitem.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_textentrycmn.obj \
+       $(OBJS)\monolib_textmeasurecmn.obj \
        $(OBJS)\monolib_toplvcmn.obj \
        $(OBJS)\monolib_treebase.obj \
+       $(OBJS)\monolib_uiactioncmn.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
+       $(OBJS)\monolib_valnum.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_windowid.obj \
        $(OBJS)\monolib_wrapsizer.obj \
@@ -2745,13 +3693,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dragimgg.obj \
        $(OBJS)\monolib_filectrlg.obj \
        $(OBJS)\monolib_headerctrlg.obj \
+       $(OBJS)\monolib_generic_infobar.obj \
        $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_markuptext.obj \
+       $(OBJS)\monolib_msgdlgg.obj \
        $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
        $(OBJS)\monolib_progdlgg.obj \
        $(OBJS)\monolib_printps.obj \
        $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_richmsgdlgg.obj \
        $(OBJS)\monolib_scrlwing.obj \
        $(OBJS)\monolib_selstore.obj \
        $(OBJS)\monolib_spinctlg.obj \
@@ -2765,59 +3716,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_treectlg.obj \
        $(OBJS)\monolib_treebkg.obj \
        $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj
+       $(OBJS)\monolib_vscroll.obj \
+       $(OBJS)\monolib_xmlreshandler.obj
 !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_caret.obj \
-       $(OBJS)\monolib_clipbrd.obj \
-       $(OBJS)\monolib_colour.obj \
-       $(OBJS)\monolib_cursor.obj \
-       $(OBJS)\monolib_data.obj \
-       $(OBJS)\monolib_dc.obj \
-       $(OBJS)\monolib_dcclient.obj \
-       $(OBJS)\monolib_dcmemory.obj \
-       $(OBJS)\monolib_dcprint.obj \
-       $(OBJS)\monolib_dcscreen.obj \
-       $(OBJS)\monolib_dialup.obj \
-       $(OBJS)\monolib_dib.obj \
-       $(OBJS)\monolib_display.obj \
-       $(OBJS)\monolib_enhmeta.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_icon.obj \
-       $(OBJS)\monolib_imaglist.obj \
-       $(OBJS)\monolib_minifram.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_palette.obj \
-       $(OBJS)\monolib_pen.obj \
-       $(OBJS)\monolib_popupwin.obj \
-       $(OBJS)\monolib_printdlg.obj \
-       $(OBJS)\monolib_printwin.obj \
-       $(OBJS)\monolib_region.obj \
-       $(OBJS)\monolib_renderer.obj \
-       $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_tooltip.obj \
-       $(OBJS)\monolib_toplevel.obj \
-       $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_uxtheme.obj \
-       $(OBJS)\monolib_window.obj \
-       $(OBJS)\monolib_helpchm.obj \
-       $(OBJS)\monolib_helpwin.obj \
-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_uuid.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_0) \
+       $(____UNIV_PLATFORM_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_generic_accel.obj \
        $(OBJS)\monolib_clrpickerg.obj \
        $(OBJS)\monolib_collpaneg.obj \
@@ -2830,7 +3735,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontpickerg.obj \
        $(OBJS)\monolib_generic_listctrl.obj \
        $(OBJS)\monolib_mdig.obj \
-       $(OBJS)\monolib_msgdlgg.obj \
        $(OBJS)\monolib_prntdlgg.obj \
        $(OBJS)\monolib_univ_bmpbuttn.obj \
        $(OBJS)\monolib_univ_button.obj \
@@ -2875,138 +3779,806 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_accelcmn.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_anidecod.obj \
+       $(OBJS)\monolib_affinematrix2d.obj \
        $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
+       $(OBJS)\monolib_arttango.obj \
        $(OBJS)\monolib_bmpbase.obj \
+       $(OBJS)\monolib_bmpbtncmn.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_colourcmn.obj \
-       $(OBJS)\monolib_combocmn.obj \
-       $(OBJS)\monolib_cmdproc.obj \
-       $(OBJS)\monolib_cmndata.obj \
-       $(OBJS)\monolib_containr.obj \
-       $(OBJS)\monolib_cshelp.obj \
-       $(OBJS)\monolib_ctrlcmn.obj \
-       $(OBJS)\monolib_ctrlsub.obj \
-       $(OBJS)\monolib_datacmn.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_docmdi.obj \
-       $(OBJS)\monolib_docview.obj \
-       $(OBJS)\monolib_dpycmn.obj \
-       $(OBJS)\monolib_dseldlg.obj \
-       $(OBJS)\monolib_effects.obj \
-       $(OBJS)\monolib_fddlgcmn.obj \
-       $(OBJS)\monolib_filectrlcmn.obj \
-       $(OBJS)\monolib_filepickercmn.obj \
-       $(OBJS)\monolib_fontpickercmn.obj \
-       $(OBJS)\monolib_fldlgcmn.obj \
-       $(OBJS)\monolib_fontcmn.obj \
-       $(OBJS)\monolib_fontenumcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
-       $(OBJS)\monolib_fontutilcmn.obj \
-       $(OBJS)\monolib_framecmn.obj \
-       $(OBJS)\monolib_gaugecmn.obj \
-       $(OBJS)\monolib_gbsizer.obj \
-       $(OBJS)\monolib_gdicmn.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_imagbmp.obj \
-       $(OBJS)\monolib_image.obj \
-       $(OBJS)\monolib_imagfill.obj \
-       $(OBJS)\monolib_imaggif.obj \
-       $(OBJS)\monolib_imagiff.obj \
-       $(OBJS)\monolib_imagjpeg.obj \
-       $(OBJS)\monolib_imagpcx.obj \
-       $(OBJS)\monolib_imagpng.obj \
-       $(OBJS)\monolib_imagpnm.obj \
-       $(OBJS)\monolib_imagtga.obj \
-       $(OBJS)\monolib_imagtiff.obj \
-       $(OBJS)\monolib_imagxpm.obj \
-       $(OBJS)\monolib_layout.obj \
-       $(OBJS)\monolib_lboxcmn.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_persist.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_spinctrlcmn.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_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_windowid.obj \
-       $(OBJS)\monolib_wrapsizer.obj \
-       $(OBJS)\monolib_xpmdecod.obj \
-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_generic_buttonbar.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_choicbkg.obj \
-       $(OBJS)\monolib_combog.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_filectrlg.obj \
-       $(OBJS)\monolib_headerctrlg.obj \
-       $(OBJS)\monolib_listbkg.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_printps.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.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_treectlg.obj \
-       $(OBJS)\monolib_treebkg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj
+       $(OBJS)\monolib_btncmn.obj \\r
+       $(OBJS)\monolib_cairo.obj \\r
+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r
+       $(OBJS)\monolib_choiccmn.obj \\r
+       $(OBJS)\monolib_clipcmn.obj \\r
+       $(OBJS)\monolib_clrpickercmn.obj \\r
+       $(OBJS)\monolib_colourcmn.obj \\r
+       $(OBJS)\monolib_colourdata.obj \\r
+       $(OBJS)\monolib_combocmn.obj \\r
+       $(OBJS)\monolib_cmdproc.obj \\r
+       $(OBJS)\monolib_cmndata.obj \\r
+       $(OBJS)\monolib_containr.obj \\r
+       $(OBJS)\monolib_cshelp.obj \\r
+       $(OBJS)\monolib_ctrlcmn.obj \\r
+       $(OBJS)\monolib_ctrlsub.obj \\r
+       $(OBJS)\monolib_dcbase.obj \\r
+       $(OBJS)\monolib_dcbufcmn.obj \\r
+       $(OBJS)\monolib_dcgraph.obj \\r
+       $(OBJS)\monolib_dcsvg.obj \\r
+       $(OBJS)\monolib_dirctrlcmn.obj \\r
+       $(OBJS)\monolib_dlgcmn.obj \\r
+       $(OBJS)\monolib_dndcmn.obj \\r
+       $(OBJS)\monolib_dobjcmn.obj \\r
+       $(OBJS)\monolib_docmdi.obj \\r
+       $(OBJS)\monolib_docview.obj \\r
+       $(OBJS)\monolib_dpycmn.obj \\r
+       $(OBJS)\monolib_dseldlg.obj \\r
+       $(OBJS)\monolib_effects.obj \\r
+       $(OBJS)\monolib_fddlgcmn.obj \\r
+       $(OBJS)\monolib_filectrlcmn.obj \\r
+       $(OBJS)\monolib_filehistorycmn.obj \\r
+       $(OBJS)\monolib_filepickercmn.obj \\r
+       $(OBJS)\monolib_fontpickercmn.obj \\r
+       $(OBJS)\monolib_fldlgcmn.obj \\r
+       $(OBJS)\monolib_fontcmn.obj \\r
+       $(OBJS)\monolib_fontdata.obj \\r
+       $(OBJS)\monolib_graphicc.obj \\r
+       $(OBJS)\monolib_fontenumcmn.obj \\r
+       $(OBJS)\monolib_fontmap.obj \\r
+       $(OBJS)\monolib_fontutilcmn.obj \\r
+       $(OBJS)\monolib_framecmn.obj \\r
+       $(OBJS)\monolib_gaugecmn.obj \\r
+       $(OBJS)\monolib_gbsizer.obj \\r
+       $(OBJS)\monolib_gdicmn.obj \\r
+       $(OBJS)\monolib_geometry.obj \\r
+       $(OBJS)\monolib_gifdecod.obj \\r
+       $(OBJS)\monolib_graphcmn.obj \\r
+       $(OBJS)\monolib_headercolcmn.obj \\r
+       $(OBJS)\monolib_headerctrlcmn.obj \\r
+       $(OBJS)\monolib_helpbase.obj \\r
+       $(OBJS)\monolib_iconbndl.obj \\r
+       $(OBJS)\monolib_imagall.obj \\r
+       $(OBJS)\monolib_imagbmp.obj \\r
+       $(OBJS)\monolib_image.obj \\r
+       $(OBJS)\monolib_imagfill.obj \\r
+       $(OBJS)\monolib_imaggif.obj \\r
+       $(OBJS)\monolib_imagiff.obj \\r
+       $(OBJS)\monolib_imagjpeg.obj \\r
+       $(OBJS)\monolib_imagpcx.obj \\r
+       $(OBJS)\monolib_imagpng.obj \\r
+       $(OBJS)\monolib_imagpnm.obj \\r
+       $(OBJS)\monolib_imagtga.obj \\r
+       $(OBJS)\monolib_imagtiff.obj \\r
+       $(OBJS)\monolib_imagxpm.obj \\r
+       $(OBJS)\monolib_layout.obj \\r
+       $(OBJS)\monolib_lboxcmn.obj \\r
+       $(OBJS)\monolib_listctrlcmn.obj \\r
+       $(OBJS)\monolib_markupparser.obj \\r
+       $(OBJS)\monolib_matrix.obj \\r
+       $(OBJS)\monolib_menucmn.obj \\r
+       $(OBJS)\monolib_mousemanager.obj \\r
+       $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_overlaycmn.obj \\r
+       $(OBJS)\monolib_ownerdrwcmn.obj \\r
+       $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_panelcmn.obj \\r
+       $(OBJS)\monolib_persist.obj \\r
+       $(OBJS)\monolib_pickerbase.obj \\r
+       $(OBJS)\monolib_popupcmn.obj \\r
+       $(OBJS)\monolib_prntbase.obj \\r
+       $(OBJS)\monolib_quantize.obj \\r
+       $(OBJS)\monolib_radiobtncmn.obj \\r
+       $(OBJS)\monolib_radiocmn.obj \\r
+       $(OBJS)\monolib_rearrangectrl.obj \\r
+       $(OBJS)\monolib_rendcmn.obj \\r
+       $(OBJS)\monolib_rgncmn.obj \\r
+       $(OBJS)\monolib_scrolbarcmn.obj \\r
+       $(OBJS)\monolib_settcmn.obj \\r
+       $(OBJS)\monolib_sizer.obj \\r
+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r
+       $(OBJS)\monolib_spinctrlcmn.obj \\r
+       $(OBJS)\monolib_srchcmn.obj \\r
+       $(OBJS)\monolib_statbar.obj \\r
+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r
+       $(OBJS)\monolib_stattextcmn.obj \\r
+       $(OBJS)\monolib_stockitem.obj \\r
+       $(OBJS)\monolib_tbarbase.obj \\r
+       $(OBJS)\monolib_textcmn.obj \\r
+       $(OBJS)\monolib_textentrycmn.obj \\r
+       $(OBJS)\monolib_textmeasurecmn.obj \\r
+       $(OBJS)\monolib_toplvcmn.obj \\r
+       $(OBJS)\monolib_treebase.obj \\r
+       $(OBJS)\monolib_uiactioncmn.obj \\r
+       $(OBJS)\monolib_valgen.obj \\r
+       $(OBJS)\monolib_validate.obj \\r
+       $(OBJS)\monolib_valtext.obj \\r
+       $(OBJS)\monolib_valnum.obj \\r
+       $(OBJS)\monolib_wincmn.obj \\r
+       $(OBJS)\monolib_windowid.obj \\r
+       $(OBJS)\monolib_wrapsizer.obj \\r
+       $(OBJS)\monolib_xpmdecod.obj \\r
+       $(OBJS)\monolib_busyinfo.obj \\r
+       $(OBJS)\monolib_generic_buttonbar.obj \\r
+       $(OBJS)\monolib_choicdgg.obj \\r
+       $(OBJS)\monolib_choicbkg.obj \\r
+       $(OBJS)\monolib_combog.obj \\r
+       $(OBJS)\monolib_dcpsg.obj \\r
+       $(OBJS)\monolib_dirctrlg.obj \\r
+       $(OBJS)\monolib_dragimgg.obj \\r
+       $(OBJS)\monolib_filectrlg.obj \\r
+       $(OBJS)\monolib_headerctrlg.obj \\r
+       $(OBJS)\monolib_generic_infobar.obj \
+       $(OBJS)\monolib_listbkg.obj \\r
+       $(OBJS)\monolib_logg.obj \\r
+       $(OBJS)\monolib_markuptext.obj \\r
+       $(OBJS)\monolib_msgdlgg.obj \\r
+       $(OBJS)\monolib_numdlgg.obj \\r
+       $(OBJS)\monolib_progdlgg.obj \\r
+       $(OBJS)\monolib_printps.obj \\r
+       $(OBJS)\monolib_renderg.obj \\r
+       $(OBJS)\monolib_richmsgdlgg.obj \\r
+       $(OBJS)\monolib_scrlwing.obj \\r
+       $(OBJS)\monolib_selstore.obj \\r
+       $(OBJS)\monolib_spinctlg.obj \\r
+       $(OBJS)\monolib_splitter.obj \\r
+       $(OBJS)\monolib_srchctlg.obj \\r
+       $(OBJS)\monolib_statbmpg.obj \\r
+       $(OBJS)\monolib_stattextg.obj \\r
+       $(OBJS)\monolib_textdlgg.obj \\r
+       $(OBJS)\monolib_tipwin.obj \\r
+       $(OBJS)\monolib_toolbkg.obj \\r
+       $(OBJS)\monolib_treectlg.obj \\r
+       $(OBJS)\monolib_treebkg.obj \\r
+       $(OBJS)\monolib_vlbox.obj \\r
+       $(OBJS)\monolib_vscroll.obj \\r
+       $(OBJS)\monolib_xmlreshandler.obj\r
+!endif\r
+!if "$(TOOLKIT)" == "COCOA"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_NSBox.obj \
+       $(OBJS)\monolib_NSButton.obj \
+       $(OBJS)\monolib_NSControl.obj \
+       $(OBJS)\monolib_NSMenu.obj \
+       $(OBJS)\monolib_NSPanel.obj \
+       $(OBJS)\monolib_NSScroller.obj \
+       $(OBJS)\monolib_NSSlider.obj \
+       $(OBJS)\monolib_NSTabView.obj \
+       $(OBJS)\monolib_NSTableView.obj \
+       $(OBJS)\monolib_NSTextField.obj \
+       $(OBJS)\monolib_NSView.obj \
+       $(OBJS)\monolib_NSWindow.obj \
+       $(OBJS)\monolib_ObjcRef.obj \
+       $(OBJS)\monolib_cocoa_app.obj \
+       $(OBJS)\monolib_cocoa_bitmap.obj \
+       $(OBJS)\monolib_cocoa_bmpbuttn.obj \
+       $(OBJS)\monolib_cocoa_brush.obj \
+       $(OBJS)\monolib_src_cocoa_button.obj \
+       $(OBJS)\monolib_src_cocoa_checkbox.obj \
+       $(OBJS)\monolib_cocoa_checklst.obj \
+       $(OBJS)\monolib_src_cocoa_choice.obj \
+       $(OBJS)\monolib_cocoa_clipbrd.obj \
+       $(OBJS)\monolib_cocoa_colordlg.obj \
+       $(OBJS)\monolib_src_cocoa_colour.obj \
+       $(OBJS)\monolib_src_cocoa_combobox.obj \
+       $(OBJS)\monolib_cocoa_control.obj \
+       $(OBJS)\monolib_cocoa_cursor.obj \
+       $(OBJS)\monolib_cocoa_data.obj \
+       $(OBJS)\monolib_cocoa_dataobj.obj \
+       $(OBJS)\monolib_cocoa_dc.obj \
+       $(OBJS)\monolib_cocoa_dcclient.obj \
+       $(OBJS)\monolib_cocoa_dcmemory.obj \
+       $(OBJS)\monolib_cocoa_dcscreen.obj \
+       $(OBJS)\monolib_src_cocoa_dialog.obj \
+       $(OBJS)\monolib_src_cocoa_dirdlg.obj \
+       $(OBJS)\monolib_cocoa_display.obj \
+       $(OBJS)\monolib_cocoa_drawer.obj \
+       $(OBJS)\monolib_src_cocoa_evtloop.obj \
+       $(OBJS)\monolib_src_cocoa_filedlg.obj \
+       $(OBJS)\monolib_cocoa_font.obj \
+       $(OBJS)\monolib_cocoa_fontdlg.obj \
+       $(OBJS)\monolib_cocoa_fontenum.obj \
+       $(OBJS)\monolib_cocoa_fontutil.obj \
+       $(OBJS)\monolib_cocoa_frame.obj \
+       $(OBJS)\monolib_src_cocoa_gauge.obj \
+       $(OBJS)\monolib_cocoa_icon.obj \
+       $(OBJS)\monolib_src_cocoa_listbox.obj \
+       $(OBJS)\monolib_cocoa_main.obj \
+       $(OBJS)\monolib_mbarman.obj \
+       $(OBJS)\monolib_cocoa_mdi.obj \
+       $(OBJS)\monolib_src_cocoa_menu.obj \
+       $(OBJS)\monolib_src_cocoa_menuitem.obj \
+       $(OBJS)\monolib_src_cocoa_msgdlg.obj \
+       $(OBJS)\monolib_src_cocoa_notebook.obj \
+       $(OBJS)\monolib_cocoa_pen.obj \
+       $(OBJS)\monolib_cocoa_radiobox.obj \
+       $(OBJS)\monolib_src_cocoa_radiobut.obj \
+       $(OBJS)\monolib_cocoa_region.obj \
+       $(OBJS)\monolib_src_cocoa_scrolbar.obj \
+       $(OBJS)\monolib_cocoa_settings.obj \
+       $(OBJS)\monolib_src_cocoa_slider.obj \
+       $(OBJS)\monolib_cocoa_sound.obj \
+       $(OBJS)\monolib_src_cocoa_spinbutt.obj \
+       $(OBJS)\monolib_cocoa_statbmp.obj \
+       $(OBJS)\monolib_src_cocoa_statbox.obj \
+       $(OBJS)\monolib_statline2.obj \
+       $(OBJS)\monolib_src_cocoa_stattext.obj \
+       $(OBJS)\monolib_src_cocoa_textctrl.obj \
+       $(OBJS)\monolib_cocoa_timer.obj \
+       $(OBJS)\monolib_src_cocoa_toolbar.obj \
+       $(OBJS)\monolib_src_cocoa_tooltip.obj \
+       $(OBJS)\monolib_cocoa_toplevel.obj \
+       $(OBJS)\monolib_src_cocoa_utils.obj \
+       $(OBJS)\monolib_cocoa_utilsexc.obj \
+       $(OBJS)\monolib_src_cocoa_window.obj \
+       $(OBJS)\monolib_generic_accel.obj \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_paletteg.obj \
+       $(OBJS)\monolib_regiong.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_generic_accel.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_gtk1_bmpbuttn.obj \
+       $(OBJS)\monolib_gtk1_button.obj \
+       $(OBJS)\monolib_gtk1_checkbox.obj \
+       $(OBJS)\monolib_gtk1_checklst.obj \
+       $(OBJS)\monolib_gtk1_choice.obj \
+       $(OBJS)\monolib_gtk1_combobox.obj \
+       $(OBJS)\monolib_gtk1_control.obj \
+       $(OBJS)\monolib_gtk1_dialog.obj \
+       $(OBJS)\monolib_gtk1_filedlg.obj \
+       $(OBJS)\monolib_gtk1_fontdlg.obj \
+       $(OBJS)\monolib_gtk1_frame.obj \
+       $(OBJS)\monolib_gtk1_gauge.obj \
+       $(OBJS)\monolib_gtk1_listbox.obj \
+       $(OBJS)\monolib_gtk1_mdi.obj \
+       $(OBJS)\monolib_gtk1_menu.obj \
+       $(OBJS)\monolib_gtk1_mnemonics.obj \
+       $(OBJS)\monolib_gtk1_notebook.obj \
+       $(OBJS)\monolib_gtk1_radiobox.obj \
+       $(OBJS)\monolib_gtk1_radiobut.obj \
+       $(OBJS)\monolib_gtk1_scrolbar.obj \
+       $(OBJS)\monolib_gtk1_scrolwin.obj \
+       $(OBJS)\monolib_gtk1_slider.obj \
+       $(OBJS)\monolib_gtk1_spinbutt.obj \
+       $(OBJS)\monolib_gtk1_spinctrl.obj \
+       $(OBJS)\monolib_gtk1_statbmp.obj \
+       $(OBJS)\monolib_gtk1_statbox.obj \
+       $(OBJS)\monolib_gtk1_statline.obj \
+       $(OBJS)\monolib_gtk1_stattext.obj \
+       $(OBJS)\monolib_gtk1_toolbar.obj \
+       $(OBJS)\monolib_gtk1_textctrl.obj \
+       $(OBJS)\monolib_gtk1_tglbtn.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_generic_accel.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_gtk_anybutton.obj \
+       $(OBJS)\monolib_artgtk.obj \
+       $(OBJS)\monolib_gtk_bmpbuttn.obj \
+       $(OBJS)\monolib_gtk_button.obj \
+       $(OBJS)\monolib_gtk_checkbox.obj \
+       $(OBJS)\monolib_gtk_checklst.obj \
+       $(OBJS)\monolib_gtk_choice.obj \
+       $(OBJS)\monolib_collpane.obj \
+       $(OBJS)\monolib_gtk_colordlg.obj \
+       $(OBJS)\monolib_gtk_combobox.obj \
+       $(OBJS)\monolib_gtk_control.obj \
+       $(OBJS)\monolib_clrpicker.obj \
+       $(OBJS)\monolib_gtk_dialog.obj \
+       $(OBJS)\monolib_fontpicker.obj \
+       $(OBJS)\monolib_filepicker.obj \
+       $(OBJS)\monolib_gtk_dirdlg.obj \
+       $(OBJS)\monolib_gtk_filedlg.obj \
+       $(OBJS)\monolib_gtk_fontdlg.obj \
+       $(OBJS)\monolib_gtk_frame.obj \
+       $(OBJS)\monolib_gtk_gauge.obj \
+       $(OBJS)\monolib_gvfs.obj \
+       $(OBJS)\monolib_gtk_infobar.obj \
+       $(OBJS)\monolib_gtk_listbox.obj \
+       $(OBJS)\monolib_gtk_mdi.obj \
+       $(OBJS)\monolib_gtk_menu.obj \
+       $(OBJS)\monolib_gtk_mnemonics.obj \
+       $(OBJS)\monolib_gtk_msgdlg.obj \
+       $(OBJS)\monolib_gtk_nativewin.obj \
+       $(OBJS)\monolib_gtk_notebook.obj \
+       $(OBJS)\monolib_gtk_print.obj \
+       $(OBJS)\monolib_gtk_radiobox.obj \
+       $(OBJS)\monolib_gtk_radiobut.obj \
+       $(OBJS)\monolib_gtk_scrolbar.obj \
+       $(OBJS)\monolib_gtk_scrolwin.obj \
+       $(OBJS)\monolib_gtk_slider.obj \
+       $(OBJS)\monolib_gtk_spinbutt.obj \
+       $(OBJS)\monolib_gtk_spinctrl.obj \
+       $(OBJS)\monolib_gtk_statbmp.obj \
+       $(OBJS)\monolib_gtk_statbox.obj \
+       $(OBJS)\monolib_gtk_statline.obj \
+       $(OBJS)\monolib_gtk_stattext.obj \
+       $(OBJS)\monolib_gtk_toolbar.obj \
+       $(OBJS)\monolib_gtk_textctrl.obj \
+       $(OBJS)\monolib_gtk_textentry.obj \
+       $(OBJS)\monolib_gtk_tglbtn.obj \
+       $(OBJS)\monolib_treeentry_gtk.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_gprint.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_generic_accel.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_gtk_anybutton.obj \
+       $(OBJS)\monolib_artgtk.obj \
+       $(OBJS)\monolib_gtk_bmpbuttn.obj \
+       $(OBJS)\monolib_gtk_button.obj \
+       $(OBJS)\monolib_gtk_checkbox.obj \
+       $(OBJS)\monolib_gtk_checklst.obj \
+       $(OBJS)\monolib_gtk_choice.obj \
+       $(OBJS)\monolib_collpane.obj \
+       $(OBJS)\monolib_gtk_colordlg.obj \
+       $(OBJS)\monolib_gtk_combobox.obj \
+       $(OBJS)\monolib_gtk_control.obj \
+       $(OBJS)\monolib_clrpicker.obj \
+       $(OBJS)\monolib_gtk_dialog.obj \
+       $(OBJS)\monolib_fontpicker.obj \
+       $(OBJS)\monolib_filepicker.obj \
+       $(OBJS)\monolib_gtk_dirdlg.obj \
+       $(OBJS)\monolib_gtk_filedlg.obj \
+       $(OBJS)\monolib_gtk_fontdlg.obj \
+       $(OBJS)\monolib_gtk_frame.obj \
+       $(OBJS)\monolib_gtk_gauge.obj \
+       $(OBJS)\monolib_gvfs.obj \
+       $(OBJS)\monolib_gtk_infobar.obj \
+       $(OBJS)\monolib_gtk_listbox.obj \
+       $(OBJS)\monolib_gtk_mdi.obj \
+       $(OBJS)\monolib_gtk_menu.obj \
+       $(OBJS)\monolib_gtk_mnemonics.obj \
+       $(OBJS)\monolib_gtk_msgdlg.obj \
+       $(OBJS)\monolib_gtk_nativewin.obj \
+       $(OBJS)\monolib_gtk_notebook.obj \
+       $(OBJS)\monolib_gtk_print.obj \
+       $(OBJS)\monolib_gtk_radiobox.obj \
+       $(OBJS)\monolib_gtk_radiobut.obj \
+       $(OBJS)\monolib_gtk_scrolbar.obj \
+       $(OBJS)\monolib_gtk_scrolwin.obj \
+       $(OBJS)\monolib_gtk_slider.obj \
+       $(OBJS)\monolib_gtk_spinbutt.obj \
+       $(OBJS)\monolib_gtk_spinctrl.obj \
+       $(OBJS)\monolib_gtk_statbmp.obj \
+       $(OBJS)\monolib_gtk_statbox.obj \
+       $(OBJS)\monolib_gtk_statline.obj \
+       $(OBJS)\monolib_gtk_stattext.obj \
+       $(OBJS)\monolib_gtk_toolbar.obj \
+       $(OBJS)\monolib_gtk_textctrl.obj \
+       $(OBJS)\monolib_gtk_textentry.obj \
+       $(OBJS)\monolib_gtk_tglbtn.obj \
+       $(OBJS)\monolib_treeentry_gtk.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_motif_accel.obj \
+       $(OBJS)\monolib_motif_app.obj \
+       $(OBJS)\monolib_motif_bmpbuttn.obj \
+       $(OBJS)\monolib_bmpmotif.obj \
+       $(OBJS)\monolib_motif_button.obj \
+       $(OBJS)\monolib_motif_checkbox.obj \
+       $(OBJS)\monolib_motif_checklst.obj \
+       $(OBJS)\monolib_motif_choice.obj \
+       $(OBJS)\monolib_motif_clipbrd.obj \
+       $(OBJS)\monolib_motif_colour.obj \
+       $(OBJS)\monolib_motif_combobox.obj \
+       $(OBJS)\monolib_combobox_native.obj \
+       $(OBJS)\monolib_motif_control.obj \
+       $(OBJS)\monolib_motif_cursor.obj \
+       $(OBJS)\monolib_motif_data.obj \
+       $(OBJS)\monolib_motif_dataobj.obj \
+       $(OBJS)\monolib_motif_dc.obj \
+       $(OBJS)\monolib_motif_dcclient.obj \
+       $(OBJS)\monolib_motif_dcmemory.obj \
+       $(OBJS)\monolib_motif_dcscreen.obj \
+       $(OBJS)\monolib_motif_dialog.obj \
+       $(OBJS)\monolib_motif_evtloop.obj \
+       $(OBJS)\monolib_motif_filedlg.obj \
+       $(OBJS)\monolib_motif_font.obj \
+       $(OBJS)\monolib_motif_frame.obj \
+       $(OBJS)\monolib_motif_gauge.obj \
+       $(OBJS)\monolib_sockmot.obj \
+       $(OBJS)\monolib_motif_icon.obj \
+       $(OBJS)\monolib_motif_listbox.obj \
+       $(OBJS)\monolib_motif_main.obj \
+       $(OBJS)\monolib_motif_menu.obj \
+       $(OBJS)\monolib_motif_menuitem.obj \
+       $(OBJS)\monolib_motif_minifram.obj \
+       $(OBJS)\monolib_motif_msgdlg.obj \
+       $(OBJS)\monolib_motif_popupwin.obj \
+       $(OBJS)\monolib_motif_radiobox.obj \
+       $(OBJS)\monolib_motif_radiobut.obj \
+       $(OBJS)\monolib_motif_scrolbar.obj \
+       $(OBJS)\monolib_motif_settings.obj \
+       $(OBJS)\monolib_motif_slider.obj \
+       $(OBJS)\monolib_motif_spinbutt.obj \
+       $(OBJS)\monolib_motif_statbmp.obj \
+       $(OBJS)\monolib_motif_statbox.obj \
+       $(OBJS)\monolib_motif_stattext.obj \
+       $(OBJS)\monolib_motif_textctrl.obj \
+       $(OBJS)\monolib_motif_textentry.obj \
+       $(OBJS)\monolib_motif_timer.obj \
+       $(OBJS)\monolib_motif_toolbar.obj \
+       $(OBJS)\monolib_motif_toplevel.obj \
+       $(OBJS)\monolib_motif_utils.obj \
+       $(OBJS)\monolib_motif_window.obj \
+       $(OBJS)\monolib_xmcombo.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_mdig.obj \
+       $(OBJS)\monolib_generic_notebook.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_generic_statline.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_tabg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_msw_accel.obj \
+       $(OBJS)\monolib_msw_anybutton.obj \
+       $(OBJS)\monolib_artmsw.obj \
+       $(OBJS)\monolib_msw_bmpbuttn.obj \
+       $(OBJS)\monolib_msw_button.obj \
+       $(OBJS)\monolib_msw_checkbox.obj \
+       $(OBJS)\monolib_msw_choice.obj \
+       $(OBJS)\monolib_msw_colordlg.obj \
+       $(OBJS)\monolib_combo.obj \
+       $(OBJS)\monolib_msw_combobox.obj \
+       $(OBJS)\monolib_msw_control.obj \
+       $(OBJS)\monolib_msw_dialog.obj \
+       $(OBJS)\monolib_msw_dirdlg.obj \
+       $(OBJS)\monolib_dragimag.obj \
+       $(OBJS)\monolib_msw_evtloop.obj \
+       $(OBJS)\monolib_msw_filedlg.obj \
+       $(OBJS)\monolib_msw_frame.obj \
+       $(OBJS)\monolib_msw_gauge.obj \
+       $(OBJS)\monolib_headerctrl.obj \
+       $(OBJS)\monolib_msw_iniconf.obj \
+       $(OBJS)\monolib_msw_listbox.obj \
+       $(OBJS)\monolib_msw_listctrl.obj \
+       $(OBJS)\monolib_msw_mdi.obj \
+       $(OBJS)\monolib_msw_menu.obj \
+       $(OBJS)\monolib_msw_menuitem.obj \
+       $(OBJS)\monolib_msw_metafile.obj \
+       $(OBJS)\monolib_msw_msgdlg.obj \
+       $(OBJS)\monolib_msw_nativdlg.obj \
+       $(OBJS)\monolib_msw_nativewin.obj \
+       $(OBJS)\monolib_msw_notebook.obj \
+       $(OBJS)\monolib_access.obj \
+       $(OBJS)\monolib_msw_ownerdrw.obj \
+       $(OBJS)\monolib_msw_panel.obj \
+       $(OBJS)\monolib_progdlg.obj \
+       $(OBJS)\monolib_msw_radiobox.obj \
+       $(OBJS)\monolib_msw_radiobut.obj \
+       $(OBJS)\monolib_richmsgdlg.obj \
+       $(OBJS)\monolib_msw_scrolbar.obj \
+       $(OBJS)\monolib_msw_slider.obj \
+       $(OBJS)\monolib_msw_spinbutt.obj \
+       $(OBJS)\monolib_msw_spinctrl.obj \
+       $(OBJS)\monolib_msw_statbmp.obj \
+       $(OBJS)\monolib_msw_statbox.obj \
+       $(OBJS)\monolib_statusbar.obj \
+       $(OBJS)\monolib_msw_statline.obj \
+       $(OBJS)\monolib_msw_stattext.obj \
+       $(OBJS)\monolib_msw_toolbar.obj \
+       $(OBJS)\monolib_msw_textctrl.obj \
+       $(OBJS)\monolib_msw_textentry.obj \
+       $(OBJS)\monolib_msw_tglbtn.obj \
+       $(OBJS)\monolib_treectrl.obj \
+       $(OBJS)\monolib_msw_checklst.obj \
+       $(OBJS)\monolib_msw_fdrepdlg.obj \
+       $(OBJS)\monolib_msw_fontdlg.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_carbon_anybutton.obj \
+       $(OBJS)\monolib_carbon_bmpbuttn.obj \
+       $(OBJS)\monolib_carbon_button.obj \
+       $(OBJS)\monolib_carbon_checkbox.obj \
+       $(OBJS)\monolib_carbon_choice.obj \
+       $(OBJS)\monolib_carbon_colordlg.obj \
+       $(OBJS)\monolib_carbon_dialog.obj \
+       $(OBJS)\monolib_carbon_dirdlg.obj \
+       $(OBJS)\monolib_carbon_dnd.obj \
+       $(OBJS)\monolib_carbon_evtloop.obj \
+       $(OBJS)\monolib_carbon_filedlg.obj \
+       $(OBJS)\monolib_carbon_gauge.obj \
+       $(OBJS)\monolib_carbon_listbox.obj \
+       $(OBJS)\monolib_listctrl_mac.obj \
+       $(OBJS)\monolib_carbon_menu.obj \
+       $(OBJS)\monolib_carbon_menuitem.obj \
+       $(OBJS)\monolib_carbon_msgdlg.obj \
+       $(OBJS)\monolib_carbon_nonownedwnd.obj \
+       $(OBJS)\monolib_notebmac.obj \
+       $(OBJS)\monolib_carbon_printdlg.obj \
+       $(OBJS)\monolib_carbon_radiobut.obj \
+       $(OBJS)\monolib_carbon_scrolbar.obj \
+       $(OBJS)\monolib_carbon_slider.obj \
+       $(OBJS)\monolib_carbon_spinbutt.obj \
+       $(OBJS)\monolib_carbon_srchctrl.obj \
+       $(OBJS)\monolib_carbon_statbmp.obj \
+       $(OBJS)\monolib_carbon_statbox.obj \
+       $(OBJS)\monolib_statlmac.obj \
+       $(OBJS)\monolib_carbon_stattext.obj \
+       $(OBJS)\monolib_carbon_textctrl.obj \
+       $(OBJS)\monolib_carbon_tglbtn.obj \
+       $(OBJS)\monolib_carbon_toolbar.obj \
+       $(OBJS)\monolib_carbon_tooltip.obj \
+       $(OBJS)\monolib_carbon_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_cocoa_anybutton.obj \
+       $(OBJS)\monolib_osx_cocoa_button.obj \
+       $(OBJS)\monolib_osx_cocoa_checkbox.obj \
+       $(OBJS)\monolib_osx_cocoa_choice.obj \
+       $(OBJS)\monolib_osx_cocoa_colour.obj \
+       $(OBJS)\monolib_osx_cocoa_combobox.obj \
+       $(OBJS)\monolib_osx_cocoa_dialog.obj \
+       $(OBJS)\monolib_osx_cocoa_dirdlg.obj \
+       $(OBJS)\monolib_cocoa_dnd.obj \
+       $(OBJS)\monolib_osx_cocoa_evtloop.obj \
+       $(OBJS)\monolib_osx_cocoa_filedlg.obj \
+       $(OBJS)\monolib_osx_cocoa_gauge.obj \
+       $(OBJS)\monolib_osx_cocoa_listbox.obj \
+       $(OBJS)\monolib_osx_cocoa_menu.obj \
+       $(OBJS)\monolib_osx_cocoa_menuitem.obj \
+       $(OBJS)\monolib_osx_cocoa_msgdlg.obj \
+       $(OBJS)\monolib_cocoa_nonownedwnd.obj \
+       $(OBJS)\monolib_osx_cocoa_notebook.obj \
+       $(OBJS)\monolib_osx_cocoa_radiobut.obj \
+       $(OBJS)\monolib_cocoa_printdlg.obj \
+       $(OBJS)\monolib_osx_cocoa_scrolbar.obj \
+       $(OBJS)\monolib_osx_cocoa_slider.obj \
+       $(OBJS)\monolib_osx_cocoa_spinbutt.obj \
+       $(OBJS)\monolib_cocoa_srchctrl.obj \
+       $(OBJS)\monolib_osx_cocoa_statbox.obj \
+       $(OBJS)\monolib_cocoa_statline.obj \
+       $(OBJS)\monolib_osx_cocoa_stattext.obj \
+       $(OBJS)\monolib_osx_cocoa_textctrl.obj \
+       $(OBJS)\monolib_cocoa_tglbtn.obj \
+       $(OBJS)\monolib_osx_cocoa_toolbar.obj \
+       $(OBJS)\monolib_osx_cocoa_tooltip.obj \
+       $(OBJS)\monolib_osx_cocoa_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_regiong.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_iphone_anybutton.obj \
+       $(OBJS)\monolib_iphone_button.obj \
+       $(OBJS)\monolib_iphone_checkbox.obj \
+       $(OBJS)\monolib_iphone_dialog.obj \
+       $(OBJS)\monolib_iphone_evtloop.obj \
+       $(OBJS)\monolib_iphone_gauge.obj \
+       $(OBJS)\monolib_iphone_msgdlg.obj \
+       $(OBJS)\monolib_iphone_nonownedwnd.obj \
+       $(OBJS)\monolib_iphone_scrolbar.obj \
+       $(OBJS)\monolib_iphone_slider.obj \
+       $(OBJS)\monolib_iphone_stattext.obj \
+       $(OBJS)\monolib_iphone_textctrl.obj \
+       $(OBJS)\monolib_iphone_toolbar.obj \
+       $(OBJS)\monolib_iphone_utils.obj \
+       $(OBJS)\monolib_iphone_window.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
+       $(OBJS)\monolib_mdig.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj \
+       $(OBJS)\monolib_os2_accel.obj \
+       $(OBJS)\monolib_os2_app.obj \
+       $(OBJS)\monolib_os2_bitmap.obj \
+       $(OBJS)\monolib_os2_bmpbuttn.obj \
+       $(OBJS)\monolib_os2_brush.obj \
+       $(OBJS)\monolib_os2_button.obj \
+       $(OBJS)\monolib_os2_checkbox.obj \
+       $(OBJS)\monolib_os2_checklst.obj \
+       $(OBJS)\monolib_os2_choice.obj \
+       $(OBJS)\monolib_os2_clipbrd.obj \
+       $(OBJS)\monolib_os2_colour.obj \
+       $(OBJS)\monolib_os2_combobox.obj \
+       $(OBJS)\monolib_os2_control.obj \
+       $(OBJS)\monolib_os2_cursor.obj \
+       $(OBJS)\monolib_os2_data.obj \
+       $(OBJS)\monolib_os2_dataobj.obj \
+       $(OBJS)\monolib_os2_dc.obj \
+       $(OBJS)\monolib_os2_dcclient.obj \
+       $(OBJS)\monolib_os2_dcmemory.obj \
+       $(OBJS)\monolib_os2_dcprint.obj \
+       $(OBJS)\monolib_os2_dcscreen.obj \
+       $(OBJS)\monolib_os2_dialog.obj \
+       $(OBJS)\monolib_os2_dnd.obj \
+       $(OBJS)\monolib_os2_evtloop.obj \
+       $(OBJS)\monolib_os2_filedlg.obj \
+       $(OBJS)\monolib_os2_font.obj \
+       $(OBJS)\monolib_os2_fontdlg.obj \
+       $(OBJS)\monolib_os2_fontenum.obj \
+       $(OBJS)\monolib_os2_fontutil.obj \
+       $(OBJS)\monolib_os2_frame.obj \
+       $(OBJS)\monolib_os2_gauge.obj \
+       $(OBJS)\monolib_os2_gdiimage.obj \
+       $(OBJS)\monolib_sockpm.obj \
+       $(OBJS)\monolib_os2_helpwin.obj \
+       $(OBJS)\monolib_os2_icon.obj \
+       $(OBJS)\monolib_os2_iniconf.obj \
+       $(OBJS)\monolib_os2_listbox.obj \
+       $(OBJS)\monolib_os2_main.obj \
+       $(OBJS)\monolib_os2_menu.obj \
+       $(OBJS)\monolib_os2_menuitem.obj \
+       $(OBJS)\monolib_os2_metafile.obj \
+       $(OBJS)\monolib_os2_minifram.obj \
+       $(OBJS)\monolib_os2_msgdlg.obj \
+       $(OBJS)\monolib_os2_nativdlg.obj \
+       $(OBJS)\monolib_os2_notebook.obj \
+       $(OBJS)\monolib_os2_ownerdrw.obj \
+       $(OBJS)\monolib_os2_palette.obj \
+       $(OBJS)\monolib_os2_pen.obj \
+       $(OBJS)\monolib_os2_popupwin.obj \
+       $(OBJS)\monolib_os2_print.obj \
+       $(OBJS)\monolib_os2_radiobox.obj \
+       $(OBJS)\monolib_os2_radiobut.obj \
+       $(OBJS)\monolib_os2_region.obj \
+       $(OBJS)\monolib_os2_scrolbar.obj \
+       $(OBJS)\monolib_os2_settings.obj \
+       $(OBJS)\monolib_os2_slider.obj \
+       $(OBJS)\monolib_os2_spinbutt.obj \
+       $(OBJS)\monolib_os2_spinctrl.obj \
+       $(OBJS)\monolib_os2_statbmp.obj \
+       $(OBJS)\monolib_os2_statbox.obj \
+       $(OBJS)\monolib_os2_statline.obj \
+       $(OBJS)\monolib_os2_stattext.obj \
+       $(OBJS)\monolib_os2_textctrl.obj \
+       $(OBJS)\monolib_os2_textentry.obj \
+       $(OBJS)\monolib_os2_tglbtn.obj \
+       $(OBJS)\monolib_os2_timer.obj \
+       $(OBJS)\monolib_os2_toolbar.obj \
+       $(OBJS)\monolib_os2_tooltip.obj \
+       $(OBJS)\monolib_os2_toplevel.obj \
+       $(OBJS)\monolib_os2_utilsgui.obj \
+       $(OBJS)\monolib_os2_window.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____GUI_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_msw_accel.obj \
+       $(OBJS)\monolib_msw_anybutton.obj \
+       $(OBJS)\monolib_artmsw.obj \
+       $(OBJS)\monolib_msw_bmpbuttn.obj \
+       $(OBJS)\monolib_msw_button.obj \
+       $(OBJS)\monolib_msw_checkbox.obj \
+       $(OBJS)\monolib_msw_choice.obj \
+       $(OBJS)\monolib_msw_colordlg.obj \
+       $(OBJS)\monolib_combo.obj \
+       $(OBJS)\monolib_msw_combobox.obj \
+       $(OBJS)\monolib_msw_control.obj \
+       $(OBJS)\monolib_msw_dialog.obj \
+       $(OBJS)\monolib_msw_dirdlg.obj \
+       $(OBJS)\monolib_dragimag.obj \
+       $(OBJS)\monolib_msw_evtloop.obj \
+       $(OBJS)\monolib_msw_filedlg.obj \
+       $(OBJS)\monolib_msw_frame.obj \
+       $(OBJS)\monolib_msw_gauge.obj \
+       $(OBJS)\monolib_headerctrl.obj \
+       $(OBJS)\monolib_msw_iniconf.obj \
+       $(OBJS)\monolib_msw_listbox.obj \
+       $(OBJS)\monolib_msw_listctrl.obj \
+       $(OBJS)\monolib_msw_mdi.obj \
+       $(OBJS)\monolib_msw_menu.obj \
+       $(OBJS)\monolib_msw_menuitem.obj \
+       $(OBJS)\monolib_msw_metafile.obj \
+       $(OBJS)\monolib_msw_msgdlg.obj \
+       $(OBJS)\monolib_msw_nativdlg.obj \
+       $(OBJS)\monolib_msw_nativewin.obj \
+       $(OBJS)\monolib_msw_notebook.obj \
+       $(OBJS)\monolib_access.obj \
+       $(OBJS)\monolib_msw_ownerdrw.obj \
+       $(OBJS)\monolib_msw_panel.obj \
+       $(OBJS)\monolib_progdlg.obj \
+       $(OBJS)\monolib_msw_radiobox.obj \
+       $(OBJS)\monolib_msw_radiobut.obj \
+       $(OBJS)\monolib_richmsgdlg.obj \
+       $(OBJS)\monolib_msw_scrolbar.obj \
+       $(OBJS)\monolib_msw_slider.obj \
+       $(OBJS)\monolib_msw_spinbutt.obj \
+       $(OBJS)\monolib_msw_spinctrl.obj \
+       $(OBJS)\monolib_msw_statbmp.obj \
+       $(OBJS)\monolib_msw_statbox.obj \
+       $(OBJS)\monolib_statusbar.obj \
+       $(OBJS)\monolib_msw_statline.obj \
+       $(OBJS)\monolib_msw_stattext.obj \
+       $(OBJS)\monolib_msw_toolbar.obj \
+       $(OBJS)\monolib_msw_textctrl.obj \
+       $(OBJS)\monolib_msw_textentry.obj \
+       $(OBJS)\monolib_msw_tglbtn.obj \
+       $(OBJS)\monolib_treectrl.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
+       $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_wince_checklst.obj \
+       $(OBJS)\monolib_choicece.obj \
+       $(OBJS)\monolib_crt.obj \
+       $(OBJS)\monolib_filedlgwce.obj \
+       $(OBJS)\monolib_filefnwce.obj \
+       $(OBJS)\monolib_helpwce.obj \
+       $(OBJS)\monolib_menuce.obj \
+       $(OBJS)\monolib_tbarwce.obj \
+       $(OBJS)\monolib_textctrlce.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____UNIV_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_msw_evtloop.obj
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3014,10 +4586,15 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bmpcboxcmn.obj \
        $(OBJS)\monolib_calctrlcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \
+       $(OBJS)\monolib_gridcmn.obj \
        $(OBJS)\monolib_hyperlnkcmn.obj \
+       $(OBJS)\monolib_odcombocmn.obj \
+       $(OBJS)\monolib_richtooltipcmn.obj \
        $(OBJS)\monolib_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_editlbox.obj \
@@ -3027,26 +4604,19 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \
-       $(OBJS)\monolib_infobar.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
+       $(OBJS)\monolib_richtooltipg.obj \
        $(OBJS)\monolib_sashwin.obj \
        $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_timectrlg.obj \
        $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_treelist.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_animateg.obj \
-       $(OBJS)\monolib_bmpcbox.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_datecontrols.obj \
-       $(OBJS)\monolib_datectrl.obj
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_0) \
+       $(____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_1_OBJECTS)
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3054,10 +4624,15 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bmpcboxcmn.obj \
        $(OBJS)\monolib_calctrlcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \
+       $(OBJS)\monolib_gridcmn.obj \
        $(OBJS)\monolib_hyperlnkcmn.obj \
+       $(OBJS)\monolib_odcombocmn.obj \
+       $(OBJS)\monolib_richtooltipcmn.obj \
        $(OBJS)\monolib_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_editlbox.obj \
@@ -3067,38 +4642,147 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
        $(OBJS)\monolib_hyperlinkg.obj \
-       $(OBJS)\monolib_infobar.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_notifmsgg.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
+       $(OBJS)\monolib_richtooltipg.obj \
        $(OBJS)\monolib_sashwin.obj \
        $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_timectrlg.obj \
        $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_treelist.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 \
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_0) \
+       $(____ADVANCED_UNIV_SRC_FILENAMES_1_OBJECTS)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_gtk_aboutdlg.obj \
+       $(OBJS)\monolib_animate.obj \
+       $(OBJS)\monolib_gtk_bmpcbox.obj \
+       $(OBJS)\monolib_gtk_calctrl.obj \
+       $(OBJS)\monolib_gtk_dataview.obj \
+       $(OBJS)\monolib_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_gtk_aboutdlg.obj \
+       $(OBJS)\monolib_animate.obj \
+       $(OBJS)\monolib_gtk_bmpcbox.obj \
+       $(OBJS)\monolib_gtk_calctrl.obj \
+       $(OBJS)\monolib_gtk_dataview.obj \
+       $(OBJS)\monolib_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_msw_bmpcbox.obj \
+       $(OBJS)\monolib_msw_calctrl.obj \
+       $(OBJS)\monolib_commandlinkbutton.obj \
+       $(OBJS)\monolib_datecontrols.obj \
+       $(OBJS)\monolib_datectrl.obj \
+       $(OBJS)\monolib_msw_datetimectrl.obj \
+       $(OBJS)\monolib_msw_hyperlink.obj \
+       $(OBJS)\monolib_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_msw_bmpcbox.obj \
+       $(OBJS)\monolib_msw_calctrl.obj \
+       $(OBJS)\monolib_commandlinkbutton.obj \
+       $(OBJS)\monolib_datecontrols.obj \
+       $(OBJS)\monolib_datectrl.obj \
+       $(OBJS)\monolib_msw_datetimectrl.obj \
+       $(OBJS)\monolib_msw_hyperlink.obj \
+       $(OBJS)\monolib_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_UNIV_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animateg.obj
 !endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_UNIV_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_UNIV_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_src_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_mediactrl_am.obj \
+       $(OBJS)\monolib_mediactrl_wmp10.obj \
+       $(OBJS)\monolib_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_carbon_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_osx_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "PM"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_mediactrl_am.obj \
+       $(OBJS)\monolib_mediactrl_wmp10.obj \
+       $(OBJS)\monolib_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____MEDIA_PLATFORM_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____HTML_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_helpbest.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_webview_webkit.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_webview_ie.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____AUI_GTK_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_tabartgtk.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_139 = 
+__DEBUGINFO_139 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_139 = 
+__DEBUGINFO_139 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_147 = D
@@ -3106,9 +4790,22 @@ __RUNTIME_LIBS_147 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_147 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "WINCE"
+____BASE_WINCE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\basedll_wince_time.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\basedll_carbon_utils.obj \
+       $(OBJS)\basedll_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\basedll_cocoa_utils.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __baselib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_162 = D
@@ -3116,6 +4813,19 @@ __RUNTIME_LIBS_162 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_162 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "WINCE"
+____BASE_WINCE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\baselib_wince_time.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\baselib_carbon_utils.obj \
+       $(OBJS)\baselib_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\baselib_cocoa_utils.obj
+!endif
 !if "$(SHARED)" == "1"
 ____wxbase_namedll_DEP = $(__basedll___depname)
 !endif
@@ -3124,19 +4834,19 @@ ____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
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_170 = 
+__DEBUGINFO_170 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_170 = 
+__DEBUGINFO_170 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_178 = D
@@ -3144,9 +4854,13 @@ __RUNTIME_LIBS_178 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_178 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "WINCE"
+____NET_WINCE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\netdll_net.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __netlib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_193 = D
@@ -3154,6 +4868,10 @@ __RUNTIME_LIBS_193 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_193 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "WINCE"
+____NET_WINCE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\netlib_net.obj
+!endif
 !if "$(SHARED)" == "1"
 ____wxnet_namedll_DEP = $(__netdll___depname)
 !endif
@@ -3162,19 +4880,19 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_201 = 
+__DEBUGINFO_201 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_201 = 
+__DEBUGINFO_201 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_209 = D
@@ -3182,126 +4900,39 @@ __RUNTIME_LIBS_209 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_209 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_4_OBJECTS =  \
+       $(OBJS)\coredll_carbon_utils.obj \
+       $(OBJS)\coredll_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_4_OBJECTS =  \
+       $(OBJS)\coredll_osx_cocoa_utils.obj
+!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_caret.obj \
-       $(OBJS)\coredll_clipbrd.obj \
-       $(OBJS)\coredll_colour.obj \
-       $(OBJS)\coredll_cursor.obj \
-       $(OBJS)\coredll_data.obj \
-       $(OBJS)\coredll_dc.obj \
-       $(OBJS)\coredll_dcclient.obj \
-       $(OBJS)\coredll_dcmemory.obj \
-       $(OBJS)\coredll_dcprint.obj \
-       $(OBJS)\coredll_dcscreen.obj \
-       $(OBJS)\coredll_dialup.obj \
-       $(OBJS)\coredll_dib.obj \
-       $(OBJS)\coredll_display.obj \
-       $(OBJS)\coredll_enhmeta.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_icon.obj \
-       $(OBJS)\coredll_imaglist.obj \
-       $(OBJS)\coredll_minifram.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_palette.obj \
-       $(OBJS)\coredll_pen.obj \
-       $(OBJS)\coredll_popupwin.obj \
-       $(OBJS)\coredll_printdlg.obj \
-       $(OBJS)\coredll_printwin.obj \
-       $(OBJS)\coredll_region.obj \
-       $(OBJS)\coredll_renderer.obj \
-       $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_tooltip.obj \
-       $(OBJS)\coredll_toplevel.obj \
-       $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_uxtheme.obj \
-       $(OBJS)\coredll_window.obj \
-       $(OBJS)\coredll_helpchm.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_generic_statusbr.obj \
-       $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_msw_accel.obj \
-       $(OBJS)\coredll_artmsw.obj \
-       $(OBJS)\coredll_msw_bmpbuttn.obj \
-       $(OBJS)\coredll_msw_button.obj \
-       $(OBJS)\coredll_msw_checkbox.obj \
-       $(OBJS)\coredll_msw_choice.obj \
-       $(OBJS)\coredll_colordlg.obj \
-       $(OBJS)\coredll_combo.obj \
-       $(OBJS)\coredll_msw_combobox.obj \
-       $(OBJS)\coredll_msw_control.obj \
-       $(OBJS)\coredll_msw_dialog.obj \
-       $(OBJS)\coredll_dirdlg.obj \
-       $(OBJS)\coredll_dragimag.obj \
-       $(OBJS)\coredll_filedlg.obj \
-       $(OBJS)\coredll_frame.obj \
-       $(OBJS)\coredll_msw_gauge.obj \
-       $(OBJS)\coredll_headerctrl.obj \
-       $(OBJS)\coredll_iniconf.obj \
-       $(OBJS)\coredll_msw_listbox.obj \
-       $(OBJS)\coredll_msw_listctrl.obj \
-       $(OBJS)\coredll_mdi.obj \
-       $(OBJS)\coredll_msw_menu.obj \
-       $(OBJS)\coredll_menuitem.obj \
-       $(OBJS)\coredll_metafile.obj \
-       $(OBJS)\coredll_msgdlg.obj \
-       $(OBJS)\coredll_nativdlg.obj \
-       $(OBJS)\coredll_nativewin.obj \
-       $(OBJS)\coredll_msw_notebook.obj \
-       $(OBJS)\coredll_access.obj \
-       $(OBJS)\coredll_ownerdrw.obj \
-       $(OBJS)\coredll_msw_radiobox.obj \
-       $(OBJS)\coredll_msw_radiobut.obj \
-       $(OBJS)\coredll_msw_scrolbar.obj \
-       $(OBJS)\coredll_msw_slider.obj \
-       $(OBJS)\coredll_msw_spinbutt.obj \
-       $(OBJS)\coredll_spinctrl.obj \
-       $(OBJS)\coredll_msw_statbmp.obj \
-       $(OBJS)\coredll_msw_statbox.obj \
-       $(OBJS)\coredll_statusbar.obj \
-       $(OBJS)\coredll_msw_statline.obj \
-       $(OBJS)\coredll_msw_stattext.obj \
-       $(OBJS)\coredll_msw_toolbar.obj \
-       $(OBJS)\coredll_msw_textctrl.obj \
-       $(OBJS)\coredll_textentry.obj \
-       $(OBJS)\coredll_msw_tglbtn.obj \
-       $(OBJS)\coredll_treectrl.obj \
-       $(OBJS)\coredll_msw_checklst.obj \
-       $(OBJS)\coredll_msw_fdrepdlg.obj \
-       $(OBJS)\coredll_fontdlg.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_1) \
+       $(____GUI_SRC_FILENAMES_2_OBJECTS) \
        $(OBJS)\coredll_accelcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
+       $(OBJS)\coredll_affinematrix2d.obj \
        $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
+       $(OBJS)\coredll_arttango.obj \
        $(OBJS)\coredll_bmpbase.obj \
+       $(OBJS)\coredll_bmpbtncmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_btncmn.obj \
        $(OBJS)\coredll_cairo.obj \
+       $(OBJS)\coredll_checkboxcmn.obj \
+       $(OBJS)\coredll_checklstcmn.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_clrpickercmn.obj \
        $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_colourdata.obj \
        $(OBJS)\coredll_combocmn.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
@@ -3309,11 +4940,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_cshelp.obj \
        $(OBJS)\coredll_ctrlcmn.obj \
        $(OBJS)\coredll_ctrlsub.obj \
-       $(OBJS)\coredll_datacmn.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \
        $(OBJS)\coredll_dcsvg.obj \
+       $(OBJS)\coredll_dirctrlcmn.obj \
        $(OBJS)\coredll_dlgcmn.obj \
        $(OBJS)\coredll_dndcmn.obj \
        $(OBJS)\coredll_dobjcmn.obj \
@@ -3324,10 +4955,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_effects.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_filectrlcmn.obj \
+       $(OBJS)\coredll_filehistorycmn.obj \
        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontdata.obj \
+       $(OBJS)\coredll_graphicc.obj \
        $(OBJS)\coredll_fontenumcmn.obj \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_fontutilcmn.obj \
@@ -3358,36 +4992,49 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_listctrlcmn.obj \
+       $(OBJS)\coredll_markupparser.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
        $(OBJS)\coredll_mousemanager.obj \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
+       $(OBJS)\coredll_ownerdrwcmn.obj \
        $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_panelcmn.obj \
        $(OBJS)\coredll_persist.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
+       $(OBJS)\coredll_radiobtncmn.obj \
        $(OBJS)\coredll_radiocmn.obj \
        $(OBJS)\coredll_rearrangectrl.obj \
        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
+       $(OBJS)\coredll_scrolbarcmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_slidercmn.obj \
+       $(OBJS)\coredll_spinbtncmn.obj \
        $(OBJS)\coredll_spinctrlcmn.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
+       $(OBJS)\coredll_statbmpcmn.obj \
+       $(OBJS)\coredll_statboxcmn.obj \
+       $(OBJS)\coredll_statlinecmn.obj \
        $(OBJS)\coredll_stattextcmn.obj \
        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_textentrycmn.obj \
+       $(OBJS)\coredll_textmeasurecmn.obj \
        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
+       $(OBJS)\coredll_uiactioncmn.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
+       $(OBJS)\coredll_valnum.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_windowid.obj \
        $(OBJS)\coredll_wrapsizer.obj \
@@ -3402,13 +5049,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dragimgg.obj \
        $(OBJS)\coredll_filectrlg.obj \
        $(OBJS)\coredll_headerctrlg.obj \
+       $(OBJS)\coredll_generic_infobar.obj \
        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_markuptext.obj \
+       $(OBJS)\coredll_msgdlgg.obj \
        $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
        $(OBJS)\coredll_progdlgg.obj \
        $(OBJS)\coredll_printps.obj \
        $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_richmsgdlgg.obj \
        $(OBJS)\coredll_scrlwing.obj \
        $(OBJS)\coredll_selstore.obj \
        $(OBJS)\coredll_spinctlg.obj \
@@ -3422,59 +5072,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \
        $(OBJS)\coredll_treebkg.obj \
        $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_xmlreshandler.obj
 !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_caret.obj \
-       $(OBJS)\coredll_clipbrd.obj \
-       $(OBJS)\coredll_colour.obj \
-       $(OBJS)\coredll_cursor.obj \
-       $(OBJS)\coredll_data.obj \
-       $(OBJS)\coredll_dc.obj \
-       $(OBJS)\coredll_dcclient.obj \
-       $(OBJS)\coredll_dcmemory.obj \
-       $(OBJS)\coredll_dcprint.obj \
-       $(OBJS)\coredll_dcscreen.obj \
-       $(OBJS)\coredll_dialup.obj \
-       $(OBJS)\coredll_dib.obj \
-       $(OBJS)\coredll_display.obj \
-       $(OBJS)\coredll_enhmeta.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_icon.obj \
-       $(OBJS)\coredll_imaglist.obj \
-       $(OBJS)\coredll_minifram.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_palette.obj \
-       $(OBJS)\coredll_pen.obj \
-       $(OBJS)\coredll_popupwin.obj \
-       $(OBJS)\coredll_printdlg.obj \
-       $(OBJS)\coredll_printwin.obj \
-       $(OBJS)\coredll_region.obj \
-       $(OBJS)\coredll_renderer.obj \
-       $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_tooltip.obj \
-       $(OBJS)\coredll_toplevel.obj \
-       $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_uxtheme.obj \
-       $(OBJS)\coredll_window.obj \
-       $(OBJS)\coredll_helpchm.obj \
-       $(OBJS)\coredll_helpwin.obj \
-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_uuid.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_1) \
+       $(____UNIV_PLATFORM_SRC_FILENAMES_2_OBJECTS) \
        $(OBJS)\coredll_generic_accel.obj \
        $(OBJS)\coredll_clrpickerg.obj \
        $(OBJS)\coredll_collpaneg.obj \
@@ -3487,7 +5091,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontpickerg.obj \
        $(OBJS)\coredll_generic_listctrl.obj \
        $(OBJS)\coredll_mdig.obj \
-       $(OBJS)\coredll_msgdlgg.obj \
        $(OBJS)\coredll_prntdlgg.obj \
        $(OBJS)\coredll_univ_bmpbuttn.obj \
        $(OBJS)\coredll_univ_button.obj \
@@ -3532,17 +5135,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_accelcmn.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_anidecod.obj \
+       $(OBJS)\coredll_affinematrix2d.obj \
        $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
+       $(OBJS)\coredll_arttango.obj \
        $(OBJS)\coredll_bmpbase.obj \
+       $(OBJS)\coredll_bmpbtncmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_btncmn.obj \
        $(OBJS)\coredll_cairo.obj \
+       $(OBJS)\coredll_checkboxcmn.obj \
+       $(OBJS)\coredll_checklstcmn.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_clrpickercmn.obj \
        $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_colourdata.obj \
        $(OBJS)\coredll_combocmn.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
@@ -3550,11 +5159,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_cshelp.obj \
        $(OBJS)\coredll_ctrlcmn.obj \
        $(OBJS)\coredll_ctrlsub.obj \
-       $(OBJS)\coredll_datacmn.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dcbufcmn.obj \
        $(OBJS)\coredll_dcgraph.obj \
        $(OBJS)\coredll_dcsvg.obj \
+       $(OBJS)\coredll_dirctrlcmn.obj \
        $(OBJS)\coredll_dlgcmn.obj \
        $(OBJS)\coredll_dndcmn.obj \
        $(OBJS)\coredll_dobjcmn.obj \
@@ -3565,10 +5174,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_effects.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_filectrlcmn.obj \
+       $(OBJS)\coredll_filehistorycmn.obj \
        $(OBJS)\coredll_filepickercmn.obj \
        $(OBJS)\coredll_fontpickercmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontdata.obj \
+       $(OBJS)\coredll_graphicc.obj \
        $(OBJS)\coredll_fontenumcmn.obj \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_fontutilcmn.obj \
@@ -3599,36 +5211,49 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_listctrlcmn.obj \
+       $(OBJS)\coredll_markupparser.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
        $(OBJS)\coredll_mousemanager.obj \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
+       $(OBJS)\coredll_ownerdrwcmn.obj \
        $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_panelcmn.obj \
        $(OBJS)\coredll_persist.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
        $(OBJS)\coredll_quantize.obj \
+       $(OBJS)\coredll_radiobtncmn.obj \
        $(OBJS)\coredll_radiocmn.obj \
        $(OBJS)\coredll_rearrangectrl.obj \
        $(OBJS)\coredll_rendcmn.obj \
        $(OBJS)\coredll_rgncmn.obj \
+       $(OBJS)\coredll_scrolbarcmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_slidercmn.obj \
+       $(OBJS)\coredll_spinbtncmn.obj \
        $(OBJS)\coredll_spinctrlcmn.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
+       $(OBJS)\coredll_statbmpcmn.obj \
+       $(OBJS)\coredll_statboxcmn.obj \
+       $(OBJS)\coredll_statlinecmn.obj \
        $(OBJS)\coredll_stattextcmn.obj \
        $(OBJS)\coredll_stockitem.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_textentrycmn.obj \
+       $(OBJS)\coredll_textmeasurecmn.obj \
        $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
+       $(OBJS)\coredll_uiactioncmn.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
+       $(OBJS)\coredll_valnum.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_windowid.obj \
        $(OBJS)\coredll_wrapsizer.obj \
@@ -3643,13 +5268,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dragimgg.obj \
        $(OBJS)\coredll_filectrlg.obj \
        $(OBJS)\coredll_headerctrlg.obj \
+       $(OBJS)\coredll_generic_infobar.obj \
        $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_markuptext.obj \
+       $(OBJS)\coredll_msgdlgg.obj \
        $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
        $(OBJS)\coredll_progdlgg.obj \
        $(OBJS)\coredll_printps.obj \
        $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_richmsgdlgg.obj \
        $(OBJS)\coredll_scrlwing.obj \
        $(OBJS)\coredll_selstore.obj \
        $(OBJS)\coredll_spinctlg.obj \
@@ -3663,7 +5291,650 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \
        $(OBJS)\coredll_treebkg.obj \
        $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_xmlreshandler.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_NSBox.obj \
+       $(OBJS)\coredll_NSButton.obj \
+       $(OBJS)\coredll_NSControl.obj \
+       $(OBJS)\coredll_NSMenu.obj \
+       $(OBJS)\coredll_NSPanel.obj \
+       $(OBJS)\coredll_NSScroller.obj \
+       $(OBJS)\coredll_NSSlider.obj \
+       $(OBJS)\coredll_NSTabView.obj \
+       $(OBJS)\coredll_NSTableView.obj \
+       $(OBJS)\coredll_NSTextField.obj \
+       $(OBJS)\coredll_NSView.obj \
+       $(OBJS)\coredll_NSWindow.obj \
+       $(OBJS)\coredll_ObjcRef.obj \
+       $(OBJS)\coredll_cocoa_app.obj \
+       $(OBJS)\coredll_cocoa_bitmap.obj \
+       $(OBJS)\coredll_cocoa_bmpbuttn.obj \
+       $(OBJS)\coredll_cocoa_brush.obj \
+       $(OBJS)\coredll_src_cocoa_button.obj \
+       $(OBJS)\coredll_src_cocoa_checkbox.obj \
+       $(OBJS)\coredll_cocoa_checklst.obj \
+       $(OBJS)\coredll_src_cocoa_choice.obj \
+       $(OBJS)\coredll_cocoa_clipbrd.obj \
+       $(OBJS)\coredll_cocoa_colordlg.obj \
+       $(OBJS)\coredll_src_cocoa_colour.obj \
+       $(OBJS)\coredll_src_cocoa_combobox.obj \
+       $(OBJS)\coredll_cocoa_control.obj \
+       $(OBJS)\coredll_cocoa_cursor.obj \
+       $(OBJS)\coredll_cocoa_data.obj \
+       $(OBJS)\coredll_cocoa_dataobj.obj \
+       $(OBJS)\coredll_cocoa_dc.obj \
+       $(OBJS)\coredll_cocoa_dcclient.obj \
+       $(OBJS)\coredll_cocoa_dcmemory.obj \
+       $(OBJS)\coredll_cocoa_dcscreen.obj \
+       $(OBJS)\coredll_src_cocoa_dialog.obj \
+       $(OBJS)\coredll_src_cocoa_dirdlg.obj \
+       $(OBJS)\coredll_cocoa_display.obj \
+       $(OBJS)\coredll_drawer.obj \
+       $(OBJS)\coredll_src_cocoa_evtloop.obj \
+       $(OBJS)\coredll_src_cocoa_filedlg.obj \
+       $(OBJS)\coredll_cocoa_font.obj \
+       $(OBJS)\coredll_cocoa_fontdlg.obj \
+       $(OBJS)\coredll_cocoa_fontenum.obj \
+       $(OBJS)\coredll_cocoa_fontutil.obj \
+       $(OBJS)\coredll_cocoa_frame.obj \
+       $(OBJS)\coredll_src_cocoa_gauge.obj \
+       $(OBJS)\coredll_cocoa_icon.obj \
+       $(OBJS)\coredll_src_cocoa_listbox.obj \
+       $(OBJS)\coredll_cocoa_main.obj \
+       $(OBJS)\coredll_mbarman.obj \
+       $(OBJS)\coredll_cocoa_mdi.obj \
+       $(OBJS)\coredll_src_cocoa_menu.obj \
+       $(OBJS)\coredll_src_cocoa_menuitem.obj \
+       $(OBJS)\coredll_src_cocoa_msgdlg.obj \
+       $(OBJS)\coredll_src_cocoa_notebook.obj \
+       $(OBJS)\coredll_cocoa_pen.obj \
+       $(OBJS)\coredll_cocoa_radiobox.obj \
+       $(OBJS)\coredll_src_cocoa_radiobut.obj \
+       $(OBJS)\coredll_cocoa_region.obj \
+       $(OBJS)\coredll_src_cocoa_scrolbar.obj \
+       $(OBJS)\coredll_cocoa_settings.obj \
+       $(OBJS)\coredll_src_cocoa_slider.obj \
+       $(OBJS)\coredll_sound.obj \
+       $(OBJS)\coredll_src_cocoa_spinbutt.obj \
+       $(OBJS)\coredll_cocoa_statbmp.obj \
+       $(OBJS)\coredll_src_cocoa_statbox.obj \
+       $(OBJS)\coredll_statline2.obj \
+       $(OBJS)\coredll_src_cocoa_stattext.obj \
+       $(OBJS)\coredll_src_cocoa_textctrl.obj \
+       $(OBJS)\coredll_cocoa_timer.obj \
+       $(OBJS)\coredll_src_cocoa_toolbar.obj \
+       $(OBJS)\coredll_src_cocoa_tooltip.obj \
+       $(OBJS)\coredll_cocoa_toplevel.obj \
+       $(OBJS)\coredll_src_cocoa_utils.obj \
+       $(OBJS)\coredll_utilsexc.obj \
+       $(OBJS)\coredll_src_cocoa_window.obj \
+       $(OBJS)\coredll_generic_accel.obj \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_paletteg.obj \
+       $(OBJS)\coredll_regiong.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_generic_accel.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filedlgg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_gtk1_bmpbuttn.obj \
+       $(OBJS)\coredll_gtk1_button.obj \
+       $(OBJS)\coredll_gtk1_checkbox.obj \
+       $(OBJS)\coredll_gtk1_checklst.obj \
+       $(OBJS)\coredll_gtk1_choice.obj \
+       $(OBJS)\coredll_gtk1_combobox.obj \
+       $(OBJS)\coredll_gtk1_control.obj \
+       $(OBJS)\coredll_gtk1_dialog.obj \
+       $(OBJS)\coredll_gtk1_filedlg.obj \
+       $(OBJS)\coredll_gtk1_fontdlg.obj \
+       $(OBJS)\coredll_gtk1_frame.obj \
+       $(OBJS)\coredll_gtk1_gauge.obj \
+       $(OBJS)\coredll_gtk1_listbox.obj \
+       $(OBJS)\coredll_gtk1_mdi.obj \
+       $(OBJS)\coredll_gtk1_menu.obj \
+       $(OBJS)\coredll_gtk1_mnemonics.obj \
+       $(OBJS)\coredll_gtk1_notebook.obj \
+       $(OBJS)\coredll_gtk1_radiobox.obj \
+       $(OBJS)\coredll_gtk1_radiobut.obj \
+       $(OBJS)\coredll_gtk1_scrolbar.obj \
+       $(OBJS)\coredll_gtk1_scrolwin.obj \
+       $(OBJS)\coredll_gtk1_slider.obj \
+       $(OBJS)\coredll_gtk1_spinbutt.obj \
+       $(OBJS)\coredll_gtk1_spinctrl.obj \
+       $(OBJS)\coredll_gtk1_statbmp.obj \
+       $(OBJS)\coredll_gtk1_statbox.obj \
+       $(OBJS)\coredll_gtk1_statline.obj \
+       $(OBJS)\coredll_gtk1_stattext.obj \
+       $(OBJS)\coredll_gtk1_toolbar.obj \
+       $(OBJS)\coredll_gtk1_textctrl.obj \
+       $(OBJS)\coredll_gtk1_tglbtn.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_generic_accel.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_gtk_anybutton.obj \
+       $(OBJS)\coredll_artgtk.obj \
+       $(OBJS)\coredll_gtk_bmpbuttn.obj \
+       $(OBJS)\coredll_gtk_button.obj \
+       $(OBJS)\coredll_gtk_checkbox.obj \
+       $(OBJS)\coredll_gtk_checklst.obj \
+       $(OBJS)\coredll_gtk_choice.obj \
+       $(OBJS)\coredll_collpane.obj \
+       $(OBJS)\coredll_gtk_colordlg.obj \
+       $(OBJS)\coredll_gtk_combobox.obj \
+       $(OBJS)\coredll_gtk_control.obj \
+       $(OBJS)\coredll_clrpicker.obj \
+       $(OBJS)\coredll_gtk_dialog.obj \
+       $(OBJS)\coredll_fontpicker.obj \
+       $(OBJS)\coredll_filepicker.obj \
+       $(OBJS)\coredll_gtk_dirdlg.obj \
+       $(OBJS)\coredll_gtk_filedlg.obj \
+       $(OBJS)\coredll_gtk_fontdlg.obj \
+       $(OBJS)\coredll_gtk_frame.obj \
+       $(OBJS)\coredll_gtk_gauge.obj \
+       $(OBJS)\coredll_gvfs.obj \
+       $(OBJS)\coredll_gtk_infobar.obj \
+       $(OBJS)\coredll_gtk_listbox.obj \
+       $(OBJS)\coredll_gtk_mdi.obj \
+       $(OBJS)\coredll_gtk_menu.obj \
+       $(OBJS)\coredll_gtk_mnemonics.obj \
+       $(OBJS)\coredll_gtk_msgdlg.obj \
+       $(OBJS)\coredll_gtk_nativewin.obj \
+       $(OBJS)\coredll_gtk_notebook.obj \
+       $(OBJS)\coredll_gtk_print.obj \
+       $(OBJS)\coredll_gtk_radiobox.obj \
+       $(OBJS)\coredll_gtk_radiobut.obj \
+       $(OBJS)\coredll_gtk_scrolbar.obj \
+       $(OBJS)\coredll_gtk_scrolwin.obj \
+       $(OBJS)\coredll_gtk_slider.obj \
+       $(OBJS)\coredll_gtk_spinbutt.obj \
+       $(OBJS)\coredll_gtk_spinctrl.obj \
+       $(OBJS)\coredll_gtk_statbmp.obj \
+       $(OBJS)\coredll_gtk_statbox.obj \
+       $(OBJS)\coredll_gtk_statline.obj \
+       $(OBJS)\coredll_gtk_stattext.obj \
+       $(OBJS)\coredll_gtk_toolbar.obj \
+       $(OBJS)\coredll_gtk_textctrl.obj \
+       $(OBJS)\coredll_gtk_textentry.obj \
+       $(OBJS)\coredll_gtk_tglbtn.obj \
+       $(OBJS)\coredll_treeentry_gtk.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_gprint.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_generic_accel.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_gtk_anybutton.obj \
+       $(OBJS)\coredll_artgtk.obj \
+       $(OBJS)\coredll_gtk_bmpbuttn.obj \
+       $(OBJS)\coredll_gtk_button.obj \
+       $(OBJS)\coredll_gtk_checkbox.obj \
+       $(OBJS)\coredll_gtk_checklst.obj \
+       $(OBJS)\coredll_gtk_choice.obj \
+       $(OBJS)\coredll_collpane.obj \
+       $(OBJS)\coredll_gtk_colordlg.obj \
+       $(OBJS)\coredll_gtk_combobox.obj \
+       $(OBJS)\coredll_gtk_control.obj \
+       $(OBJS)\coredll_clrpicker.obj \
+       $(OBJS)\coredll_gtk_dialog.obj \
+       $(OBJS)\coredll_fontpicker.obj \
+       $(OBJS)\coredll_filepicker.obj \
+       $(OBJS)\coredll_gtk_dirdlg.obj \
+       $(OBJS)\coredll_gtk_filedlg.obj \
+       $(OBJS)\coredll_gtk_fontdlg.obj \
+       $(OBJS)\coredll_gtk_frame.obj \
+       $(OBJS)\coredll_gtk_gauge.obj \
+       $(OBJS)\coredll_gvfs.obj \
+       $(OBJS)\coredll_gtk_infobar.obj \
+       $(OBJS)\coredll_gtk_listbox.obj \
+       $(OBJS)\coredll_gtk_mdi.obj \
+       $(OBJS)\coredll_gtk_menu.obj \
+       $(OBJS)\coredll_gtk_mnemonics.obj \
+       $(OBJS)\coredll_gtk_msgdlg.obj \
+       $(OBJS)\coredll_gtk_nativewin.obj \
+       $(OBJS)\coredll_gtk_notebook.obj \
+       $(OBJS)\coredll_gtk_print.obj \
+       $(OBJS)\coredll_gtk_radiobox.obj \
+       $(OBJS)\coredll_gtk_radiobut.obj \
+       $(OBJS)\coredll_gtk_scrolbar.obj \
+       $(OBJS)\coredll_gtk_scrolwin.obj \
+       $(OBJS)\coredll_gtk_slider.obj \
+       $(OBJS)\coredll_gtk_spinbutt.obj \
+       $(OBJS)\coredll_gtk_spinctrl.obj \
+       $(OBJS)\coredll_gtk_statbmp.obj \
+       $(OBJS)\coredll_gtk_statbox.obj \
+       $(OBJS)\coredll_gtk_statline.obj \
+       $(OBJS)\coredll_gtk_stattext.obj \
+       $(OBJS)\coredll_gtk_toolbar.obj \
+       $(OBJS)\coredll_gtk_textctrl.obj \
+       $(OBJS)\coredll_gtk_textentry.obj \
+       $(OBJS)\coredll_gtk_tglbtn.obj \
+       $(OBJS)\coredll_treeentry_gtk.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_motif_accel.obj \
+       $(OBJS)\coredll_motif_app.obj \
+       $(OBJS)\coredll_motif_bmpbuttn.obj \
+       $(OBJS)\coredll_bmpmotif.obj \
+       $(OBJS)\coredll_motif_button.obj \
+       $(OBJS)\coredll_motif_checkbox.obj \
+       $(OBJS)\coredll_motif_checklst.obj \
+       $(OBJS)\coredll_motif_choice.obj \
+       $(OBJS)\coredll_motif_clipbrd.obj \
+       $(OBJS)\coredll_motif_colour.obj \
+       $(OBJS)\coredll_motif_combobox.obj \
+       $(OBJS)\coredll_combobox_native.obj \
+       $(OBJS)\coredll_motif_control.obj \
+       $(OBJS)\coredll_motif_cursor.obj \
+       $(OBJS)\coredll_motif_data.obj \
+       $(OBJS)\coredll_motif_dataobj.obj \
+       $(OBJS)\coredll_motif_dc.obj \
+       $(OBJS)\coredll_motif_dcclient.obj \
+       $(OBJS)\coredll_motif_dcmemory.obj \
+       $(OBJS)\coredll_motif_dcscreen.obj \
+       $(OBJS)\coredll_motif_dialog.obj \
+       $(OBJS)\coredll_motif_evtloop.obj \
+       $(OBJS)\coredll_motif_filedlg.obj \
+       $(OBJS)\coredll_motif_font.obj \
+       $(OBJS)\coredll_motif_frame.obj \
+       $(OBJS)\coredll_motif_gauge.obj \
+       $(OBJS)\coredll_sockmot.obj \
+       $(OBJS)\coredll_motif_icon.obj \
+       $(OBJS)\coredll_motif_listbox.obj \
+       $(OBJS)\coredll_motif_main.obj \
+       $(OBJS)\coredll_motif_menu.obj \
+       $(OBJS)\coredll_motif_menuitem.obj \
+       $(OBJS)\coredll_motif_minifram.obj \
+       $(OBJS)\coredll_motif_msgdlg.obj \
+       $(OBJS)\coredll_motif_popupwin.obj \
+       $(OBJS)\coredll_motif_radiobox.obj \
+       $(OBJS)\coredll_motif_radiobut.obj \
+       $(OBJS)\coredll_motif_scrolbar.obj \
+       $(OBJS)\coredll_motif_settings.obj \
+       $(OBJS)\coredll_motif_slider.obj \
+       $(OBJS)\coredll_motif_spinbutt.obj \
+       $(OBJS)\coredll_motif_statbmp.obj \
+       $(OBJS)\coredll_motif_statbox.obj \
+       $(OBJS)\coredll_motif_stattext.obj \
+       $(OBJS)\coredll_motif_textctrl.obj \
+       $(OBJS)\coredll_motif_textentry.obj \
+       $(OBJS)\coredll_motif_timer.obj \
+       $(OBJS)\coredll_motif_toolbar.obj \
+       $(OBJS)\coredll_motif_toplevel.obj \
+       $(OBJS)\coredll_motif_utils.obj \
+       $(OBJS)\coredll_motif_window.obj \
+       $(OBJS)\coredll_xmcombo.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_mdig.obj \
+       $(OBJS)\coredll_generic_notebook.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_generic_statline.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_tabg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_msw_accel.obj \
+       $(OBJS)\coredll_msw_anybutton.obj \
+       $(OBJS)\coredll_artmsw.obj \
+       $(OBJS)\coredll_msw_bmpbuttn.obj \
+       $(OBJS)\coredll_msw_button.obj \
+       $(OBJS)\coredll_msw_checkbox.obj \
+       $(OBJS)\coredll_msw_choice.obj \
+       $(OBJS)\coredll_msw_colordlg.obj \
+       $(OBJS)\coredll_combo.obj \
+       $(OBJS)\coredll_msw_combobox.obj \
+       $(OBJS)\coredll_msw_control.obj \
+       $(OBJS)\coredll_msw_dialog.obj \
+       $(OBJS)\coredll_msw_dirdlg.obj \
+       $(OBJS)\coredll_dragimag.obj \
+       $(OBJS)\coredll_msw_evtloop.obj \
+       $(OBJS)\coredll_msw_filedlg.obj \
+       $(OBJS)\coredll_msw_frame.obj \
+       $(OBJS)\coredll_msw_gauge.obj \
+       $(OBJS)\coredll_headerctrl.obj \
+       $(OBJS)\coredll_msw_iniconf.obj \
+       $(OBJS)\coredll_msw_listbox.obj \
+       $(OBJS)\coredll_msw_listctrl.obj \
+       $(OBJS)\coredll_msw_mdi.obj \
+       $(OBJS)\coredll_msw_menu.obj \
+       $(OBJS)\coredll_msw_menuitem.obj \
+       $(OBJS)\coredll_msw_metafile.obj \
+       $(OBJS)\coredll_msw_msgdlg.obj \
+       $(OBJS)\coredll_msw_nativdlg.obj \
+       $(OBJS)\coredll_msw_nativewin.obj \
+       $(OBJS)\coredll_msw_notebook.obj \
+       $(OBJS)\coredll_access.obj \
+       $(OBJS)\coredll_msw_ownerdrw.obj \
+       $(OBJS)\coredll_panel.obj \
+       $(OBJS)\coredll_progdlg.obj \
+       $(OBJS)\coredll_msw_radiobox.obj \
+       $(OBJS)\coredll_msw_radiobut.obj \
+       $(OBJS)\coredll_richmsgdlg.obj \
+       $(OBJS)\coredll_msw_scrolbar.obj \
+       $(OBJS)\coredll_msw_slider.obj \
+       $(OBJS)\coredll_msw_spinbutt.obj \
+       $(OBJS)\coredll_msw_spinctrl.obj \
+       $(OBJS)\coredll_msw_statbmp.obj \
+       $(OBJS)\coredll_msw_statbox.obj \
+       $(OBJS)\coredll_statusbar.obj \
+       $(OBJS)\coredll_msw_statline.obj \
+       $(OBJS)\coredll_msw_stattext.obj \
+       $(OBJS)\coredll_msw_toolbar.obj \
+       $(OBJS)\coredll_msw_textctrl.obj \
+       $(OBJS)\coredll_msw_textentry.obj \
+       $(OBJS)\coredll_msw_tglbtn.obj \
+       $(OBJS)\coredll_treectrl.obj \
+       $(OBJS)\coredll_msw_checklst.obj \
+       $(OBJS)\coredll_msw_fdrepdlg.obj \
+       $(OBJS)\coredll_msw_fontdlg.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_carbon_anybutton.obj \
+       $(OBJS)\coredll_carbon_bmpbuttn.obj \
+       $(OBJS)\coredll_carbon_button.obj \
+       $(OBJS)\coredll_carbon_checkbox.obj \
+       $(OBJS)\coredll_carbon_choice.obj \
+       $(OBJS)\coredll_carbon_colordlg.obj \
+       $(OBJS)\coredll_carbon_dialog.obj \
+       $(OBJS)\coredll_carbon_dirdlg.obj \
+       $(OBJS)\coredll_carbon_dnd.obj \
+       $(OBJS)\coredll_carbon_evtloop.obj \
+       $(OBJS)\coredll_carbon_filedlg.obj \
+       $(OBJS)\coredll_carbon_gauge.obj \
+       $(OBJS)\coredll_carbon_listbox.obj \
+       $(OBJS)\coredll_listctrl_mac.obj \
+       $(OBJS)\coredll_carbon_menu.obj \
+       $(OBJS)\coredll_carbon_menuitem.obj \
+       $(OBJS)\coredll_carbon_msgdlg.obj \
+       $(OBJS)\coredll_carbon_nonownedwnd.obj \
+       $(OBJS)\coredll_notebmac.obj \
+       $(OBJS)\coredll_carbon_printdlg.obj \
+       $(OBJS)\coredll_carbon_radiobut.obj \
+       $(OBJS)\coredll_carbon_scrolbar.obj \
+       $(OBJS)\coredll_carbon_slider.obj \
+       $(OBJS)\coredll_carbon_spinbutt.obj \
+       $(OBJS)\coredll_carbon_srchctrl.obj \
+       $(OBJS)\coredll_carbon_statbmp.obj \
+       $(OBJS)\coredll_carbon_statbox.obj \
+       $(OBJS)\coredll_statlmac.obj \
+       $(OBJS)\coredll_carbon_stattext.obj \
+       $(OBJS)\coredll_carbon_textctrl.obj \
+       $(OBJS)\coredll_carbon_tglbtn.obj \
+       $(OBJS)\coredll_carbon_toolbar.obj \
+       $(OBJS)\coredll_carbon_tooltip.obj \
+       $(OBJS)\coredll_carbon_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_cocoa_anybutton.obj \
+       $(OBJS)\coredll_osx_cocoa_button.obj \
+       $(OBJS)\coredll_osx_cocoa_checkbox.obj \
+       $(OBJS)\coredll_osx_cocoa_choice.obj \
+       $(OBJS)\coredll_osx_cocoa_colour.obj \
+       $(OBJS)\coredll_osx_cocoa_combobox.obj \
+       $(OBJS)\coredll_osx_cocoa_dialog.obj \
+       $(OBJS)\coredll_osx_cocoa_dirdlg.obj \
+       $(OBJS)\coredll_cocoa_dnd.obj \
+       $(OBJS)\coredll_osx_cocoa_evtloop.obj \
+       $(OBJS)\coredll_osx_cocoa_filedlg.obj \
+       $(OBJS)\coredll_osx_cocoa_gauge.obj \
+       $(OBJS)\coredll_osx_cocoa_listbox.obj \
+       $(OBJS)\coredll_osx_cocoa_menu.obj \
+       $(OBJS)\coredll_osx_cocoa_menuitem.obj \
+       $(OBJS)\coredll_osx_cocoa_msgdlg.obj \
+       $(OBJS)\coredll_cocoa_nonownedwnd.obj \
+       $(OBJS)\coredll_osx_cocoa_notebook.obj \
+       $(OBJS)\coredll_osx_cocoa_radiobut.obj \
+       $(OBJS)\coredll_cocoa_printdlg.obj \
+       $(OBJS)\coredll_osx_cocoa_scrolbar.obj \
+       $(OBJS)\coredll_osx_cocoa_slider.obj \
+       $(OBJS)\coredll_osx_cocoa_spinbutt.obj \
+       $(OBJS)\coredll_cocoa_srchctrl.obj \
+       $(OBJS)\coredll_osx_cocoa_statbox.obj \
+       $(OBJS)\coredll_cocoa_statline.obj \
+       $(OBJS)\coredll_osx_cocoa_stattext.obj \
+       $(OBJS)\coredll_osx_cocoa_textctrl.obj \
+       $(OBJS)\coredll_cocoa_tglbtn.obj \
+       $(OBJS)\coredll_osx_cocoa_toolbar.obj \
+       $(OBJS)\coredll_osx_cocoa_tooltip.obj \
+       $(OBJS)\coredll_osx_cocoa_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_regiong.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_iphone_anybutton.obj \
+       $(OBJS)\coredll_iphone_button.obj \
+       $(OBJS)\coredll_iphone_checkbox.obj \
+       $(OBJS)\coredll_iphone_dialog.obj \
+       $(OBJS)\coredll_iphone_evtloop.obj \
+       $(OBJS)\coredll_iphone_gauge.obj \
+       $(OBJS)\coredll_iphone_msgdlg.obj \
+       $(OBJS)\coredll_iphone_nonownedwnd.obj \
+       $(OBJS)\coredll_iphone_scrolbar.obj \
+       $(OBJS)\coredll_iphone_slider.obj \
+       $(OBJS)\coredll_iphone_stattext.obj \
+       $(OBJS)\coredll_iphone_textctrl.obj \
+       $(OBJS)\coredll_iphone_toolbar.obj \
+       $(OBJS)\coredll_iphone_utils.obj \
+       $(OBJS)\coredll_iphone_window.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
+       $(OBJS)\coredll_mdig.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj \
+       $(OBJS)\coredll_os2_accel.obj \
+       $(OBJS)\coredll_os2_app.obj \
+       $(OBJS)\coredll_os2_bitmap.obj \
+       $(OBJS)\coredll_os2_bmpbuttn.obj \
+       $(OBJS)\coredll_os2_brush.obj \
+       $(OBJS)\coredll_os2_button.obj \
+       $(OBJS)\coredll_os2_checkbox.obj \
+       $(OBJS)\coredll_os2_checklst.obj \
+       $(OBJS)\coredll_os2_choice.obj \
+       $(OBJS)\coredll_os2_clipbrd.obj \
+       $(OBJS)\coredll_os2_colour.obj \
+       $(OBJS)\coredll_os2_combobox.obj \
+       $(OBJS)\coredll_os2_control.obj \
+       $(OBJS)\coredll_os2_cursor.obj \
+       $(OBJS)\coredll_os2_data.obj \
+       $(OBJS)\coredll_os2_dataobj.obj \
+       $(OBJS)\coredll_os2_dc.obj \
+       $(OBJS)\coredll_os2_dcclient.obj \
+       $(OBJS)\coredll_os2_dcmemory.obj \
+       $(OBJS)\coredll_os2_dcprint.obj \
+       $(OBJS)\coredll_os2_dcscreen.obj \
+       $(OBJS)\coredll_os2_dialog.obj \
+       $(OBJS)\coredll_os2_dnd.obj \
+       $(OBJS)\coredll_os2_evtloop.obj \
+       $(OBJS)\coredll_os2_filedlg.obj \
+       $(OBJS)\coredll_os2_font.obj \
+       $(OBJS)\coredll_os2_fontdlg.obj \
+       $(OBJS)\coredll_os2_fontenum.obj \
+       $(OBJS)\coredll_os2_fontutil.obj \
+       $(OBJS)\coredll_os2_frame.obj \
+       $(OBJS)\coredll_os2_gauge.obj \
+       $(OBJS)\coredll_os2_gdiimage.obj \
+       $(OBJS)\coredll_sockpm.obj \
+       $(OBJS)\coredll_os2_helpwin.obj \
+       $(OBJS)\coredll_os2_icon.obj \
+       $(OBJS)\coredll_os2_iniconf.obj \
+       $(OBJS)\coredll_os2_listbox.obj \
+       $(OBJS)\coredll_os2_main.obj \
+       $(OBJS)\coredll_os2_menu.obj \
+       $(OBJS)\coredll_os2_menuitem.obj \
+       $(OBJS)\coredll_os2_metafile.obj \
+       $(OBJS)\coredll_os2_minifram.obj \
+       $(OBJS)\coredll_os2_msgdlg.obj \
+       $(OBJS)\coredll_os2_nativdlg.obj \
+       $(OBJS)\coredll_os2_notebook.obj \
+       $(OBJS)\coredll_os2_ownerdrw.obj \
+       $(OBJS)\coredll_os2_palette.obj \
+       $(OBJS)\coredll_os2_pen.obj \
+       $(OBJS)\coredll_os2_popupwin.obj \
+       $(OBJS)\coredll_os2_print.obj \
+       $(OBJS)\coredll_os2_radiobox.obj \
+       $(OBJS)\coredll_os2_radiobut.obj \
+       $(OBJS)\coredll_os2_region.obj \
+       $(OBJS)\coredll_os2_scrolbar.obj \
+       $(OBJS)\coredll_os2_settings.obj \
+       $(OBJS)\coredll_os2_slider.obj \
+       $(OBJS)\coredll_os2_spinbutt.obj \
+       $(OBJS)\coredll_os2_spinctrl.obj \
+       $(OBJS)\coredll_os2_statbmp.obj \
+       $(OBJS)\coredll_os2_statbox.obj \
+       $(OBJS)\coredll_os2_statline.obj \
+       $(OBJS)\coredll_os2_stattext.obj \
+       $(OBJS)\coredll_os2_textctrl.obj \
+       $(OBJS)\coredll_os2_textentry.obj \
+       $(OBJS)\coredll_os2_tglbtn.obj \
+       $(OBJS)\coredll_os2_timer.obj \
+       $(OBJS)\coredll_os2_toolbar.obj \
+       $(OBJS)\coredll_os2_tooltip.obj \
+       $(OBJS)\coredll_os2_toplevel.obj \
+       $(OBJS)\coredll_os2_utilsgui.obj \
+       $(OBJS)\coredll_os2_window.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____GUI_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_msw_accel.obj \
+       $(OBJS)\coredll_msw_anybutton.obj \
+       $(OBJS)\coredll_artmsw.obj \
+       $(OBJS)\coredll_msw_bmpbuttn.obj \
+       $(OBJS)\coredll_msw_button.obj \
+       $(OBJS)\coredll_msw_checkbox.obj \
+       $(OBJS)\coredll_msw_choice.obj \
+       $(OBJS)\coredll_msw_colordlg.obj \
+       $(OBJS)\coredll_combo.obj \
+       $(OBJS)\coredll_msw_combobox.obj \
+       $(OBJS)\coredll_msw_control.obj \
+       $(OBJS)\coredll_msw_dialog.obj \
+       $(OBJS)\coredll_msw_dirdlg.obj \
+       $(OBJS)\coredll_dragimag.obj \
+       $(OBJS)\coredll_msw_evtloop.obj \
+       $(OBJS)\coredll_msw_filedlg.obj \
+       $(OBJS)\coredll_msw_frame.obj \
+       $(OBJS)\coredll_msw_gauge.obj \
+       $(OBJS)\coredll_headerctrl.obj \
+       $(OBJS)\coredll_msw_iniconf.obj \
+       $(OBJS)\coredll_msw_listbox.obj \
+       $(OBJS)\coredll_msw_listctrl.obj \
+       $(OBJS)\coredll_msw_mdi.obj \
+       $(OBJS)\coredll_msw_menu.obj \
+       $(OBJS)\coredll_msw_menuitem.obj \
+       $(OBJS)\coredll_msw_metafile.obj \
+       $(OBJS)\coredll_msw_msgdlg.obj \
+       $(OBJS)\coredll_msw_nativdlg.obj \
+       $(OBJS)\coredll_msw_nativewin.obj \
+       $(OBJS)\coredll_msw_notebook.obj \
+       $(OBJS)\coredll_access.obj \
+       $(OBJS)\coredll_msw_ownerdrw.obj \
+       $(OBJS)\coredll_panel.obj \
+       $(OBJS)\coredll_progdlg.obj \
+       $(OBJS)\coredll_msw_radiobox.obj \
+       $(OBJS)\coredll_msw_radiobut.obj \
+       $(OBJS)\coredll_richmsgdlg.obj \
+       $(OBJS)\coredll_msw_scrolbar.obj \
+       $(OBJS)\coredll_msw_slider.obj \
+       $(OBJS)\coredll_msw_spinbutt.obj \
+       $(OBJS)\coredll_msw_spinctrl.obj \
+       $(OBJS)\coredll_msw_statbmp.obj \
+       $(OBJS)\coredll_msw_statbox.obj \
+       $(OBJS)\coredll_statusbar.obj \
+       $(OBJS)\coredll_msw_statline.obj \
+       $(OBJS)\coredll_msw_stattext.obj \
+       $(OBJS)\coredll_msw_toolbar.obj \
+       $(OBJS)\coredll_msw_textctrl.obj \
+       $(OBJS)\coredll_msw_textentry.obj \
+       $(OBJS)\coredll_msw_tglbtn.obj \
+       $(OBJS)\coredll_treectrl.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
+       $(OBJS)\coredll_filedlgg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_wince_checklst.obj \
+       $(OBJS)\coredll_choicece.obj \
+       $(OBJS)\coredll_crt.obj \
+       $(OBJS)\coredll_filedlgwce.obj \
+       $(OBJS)\coredll_filefnwce.obj \
+       $(OBJS)\coredll_helpwce.obj \
+       $(OBJS)\coredll_menuce.obj \
+       $(OBJS)\coredll_tbarwce.obj \
+       $(OBJS)\coredll_textctrlce.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____UNIV_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_msw_evtloop.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __corelib___depname = \
@@ -3675,126 +5946,39 @@ __RUNTIME_LIBS_224 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_224 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_5_OBJECTS =  \
+       $(OBJS)\corelib_carbon_utils.obj \
+       $(OBJS)\corelib_uma.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____BASE_AND_GUI_TOOLKIT_SRC_FILENAMES_5_OBJECTS =  \
+       $(OBJS)\corelib_osx_cocoa_utils.obj
+!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_caret.obj \
-       $(OBJS)\corelib_clipbrd.obj \
-       $(OBJS)\corelib_colour.obj \
-       $(OBJS)\corelib_cursor.obj \
-       $(OBJS)\corelib_data.obj \
-       $(OBJS)\corelib_dc.obj \
-       $(OBJS)\corelib_dcclient.obj \
-       $(OBJS)\corelib_dcmemory.obj \
-       $(OBJS)\corelib_dcprint.obj \
-       $(OBJS)\corelib_dcscreen.obj \
-       $(OBJS)\corelib_dialup.obj \
-       $(OBJS)\corelib_dib.obj \
-       $(OBJS)\corelib_display.obj \
-       $(OBJS)\corelib_enhmeta.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_icon.obj \
-       $(OBJS)\corelib_imaglist.obj \
-       $(OBJS)\corelib_minifram.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_palette.obj \
-       $(OBJS)\corelib_pen.obj \
-       $(OBJS)\corelib_popupwin.obj \
-       $(OBJS)\corelib_printdlg.obj \
-       $(OBJS)\corelib_printwin.obj \
-       $(OBJS)\corelib_region.obj \
-       $(OBJS)\corelib_renderer.obj \
-       $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_tooltip.obj \
-       $(OBJS)\corelib_toplevel.obj \
-       $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_uxtheme.obj \
-       $(OBJS)\corelib_window.obj \
-       $(OBJS)\corelib_helpchm.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_generic_statusbr.obj \
-       $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_msw_accel.obj \
-       $(OBJS)\corelib_artmsw.obj \
-       $(OBJS)\corelib_msw_bmpbuttn.obj \
-       $(OBJS)\corelib_msw_button.obj \
-       $(OBJS)\corelib_msw_checkbox.obj \
-       $(OBJS)\corelib_msw_choice.obj \
-       $(OBJS)\corelib_colordlg.obj \
-       $(OBJS)\corelib_combo.obj \
-       $(OBJS)\corelib_msw_combobox.obj \
-       $(OBJS)\corelib_msw_control.obj \
-       $(OBJS)\corelib_msw_dialog.obj \
-       $(OBJS)\corelib_dirdlg.obj \
-       $(OBJS)\corelib_dragimag.obj \
-       $(OBJS)\corelib_filedlg.obj \
-       $(OBJS)\corelib_frame.obj \
-       $(OBJS)\corelib_msw_gauge.obj \
-       $(OBJS)\corelib_headerctrl.obj \
-       $(OBJS)\corelib_iniconf.obj \
-       $(OBJS)\corelib_msw_listbox.obj \
-       $(OBJS)\corelib_msw_listctrl.obj \
-       $(OBJS)\corelib_mdi.obj \
-       $(OBJS)\corelib_msw_menu.obj \
-       $(OBJS)\corelib_menuitem.obj \
-       $(OBJS)\corelib_metafile.obj \
-       $(OBJS)\corelib_msgdlg.obj \
-       $(OBJS)\corelib_nativdlg.obj \
-       $(OBJS)\corelib_nativewin.obj \
-       $(OBJS)\corelib_msw_notebook.obj \
-       $(OBJS)\corelib_access.obj \
-       $(OBJS)\corelib_ownerdrw.obj \
-       $(OBJS)\corelib_msw_radiobox.obj \
-       $(OBJS)\corelib_msw_radiobut.obj \
-       $(OBJS)\corelib_msw_scrolbar.obj \
-       $(OBJS)\corelib_msw_slider.obj \
-       $(OBJS)\corelib_msw_spinbutt.obj \
-       $(OBJS)\corelib_spinctrl.obj \
-       $(OBJS)\corelib_msw_statbmp.obj \
-       $(OBJS)\corelib_msw_statbox.obj \
-       $(OBJS)\corelib_statusbar.obj \
-       $(OBJS)\corelib_msw_statline.obj \
-       $(OBJS)\corelib_msw_stattext.obj \
-       $(OBJS)\corelib_msw_toolbar.obj \
-       $(OBJS)\corelib_msw_textctrl.obj \
-       $(OBJS)\corelib_textentry.obj \
-       $(OBJS)\corelib_msw_tglbtn.obj \
-       $(OBJS)\corelib_treectrl.obj \
-       $(OBJS)\corelib_msw_checklst.obj \
-       $(OBJS)\corelib_msw_fdrepdlg.obj \
-       $(OBJS)\corelib_fontdlg.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_2) \
+       $(____GUI_SRC_FILENAMES_3_OBJECTS) \
        $(OBJS)\corelib_accelcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
+       $(OBJS)\corelib_affinematrix2d.obj \
        $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
+       $(OBJS)\corelib_arttango.obj \
        $(OBJS)\corelib_bmpbase.obj \
+       $(OBJS)\corelib_bmpbtncmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_btncmn.obj \
        $(OBJS)\corelib_cairo.obj \
+       $(OBJS)\corelib_checkboxcmn.obj \
+       $(OBJS)\corelib_checklstcmn.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \
        $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_colourdata.obj \
        $(OBJS)\corelib_combocmn.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
@@ -3802,11 +5986,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_cshelp.obj \
        $(OBJS)\corelib_ctrlcmn.obj \
        $(OBJS)\corelib_ctrlsub.obj \
-       $(OBJS)\corelib_datacmn.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \
        $(OBJS)\corelib_dcsvg.obj \
+       $(OBJS)\corelib_dirctrlcmn.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \
@@ -3817,10 +6001,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_effects.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_filectrlcmn.obj \
+       $(OBJS)\corelib_filehistorycmn.obj \
        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontdata.obj \
+       $(OBJS)\corelib_graphicc.obj \
        $(OBJS)\corelib_fontenumcmn.obj \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_fontutilcmn.obj \
@@ -3851,36 +6038,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_listctrlcmn.obj \
+       $(OBJS)\corelib_markupparser.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
        $(OBJS)\corelib_mousemanager.obj \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
+       $(OBJS)\corelib_ownerdrwcmn.obj \
        $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_panelcmn.obj \
        $(OBJS)\corelib_persist.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
+       $(OBJS)\corelib_radiobtncmn.obj \
        $(OBJS)\corelib_radiocmn.obj \
        $(OBJS)\corelib_rearrangectrl.obj \
        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
+       $(OBJS)\corelib_scrolbarcmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_slidercmn.obj \
+       $(OBJS)\corelib_spinbtncmn.obj \
        $(OBJS)\corelib_spinctrlcmn.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
+       $(OBJS)\corelib_statbmpcmn.obj \
+       $(OBJS)\corelib_statboxcmn.obj \
+       $(OBJS)\corelib_statlinecmn.obj \
        $(OBJS)\corelib_stattextcmn.obj \
        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_textentrycmn.obj \
+       $(OBJS)\corelib_textmeasurecmn.obj \
        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
+       $(OBJS)\corelib_uiactioncmn.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
+       $(OBJS)\corelib_valnum.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_windowid.obj \
        $(OBJS)\corelib_wrapsizer.obj \
@@ -3895,13 +6095,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dragimgg.obj \
        $(OBJS)\corelib_filectrlg.obj \
        $(OBJS)\corelib_headerctrlg.obj \
+       $(OBJS)\corelib_generic_infobar.obj \
        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_markuptext.obj \
+       $(OBJS)\corelib_msgdlgg.obj \
        $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
        $(OBJS)\corelib_progdlgg.obj \
        $(OBJS)\corelib_printps.obj \
        $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_richmsgdlgg.obj \
        $(OBJS)\corelib_scrlwing.obj \
        $(OBJS)\corelib_selstore.obj \
        $(OBJS)\corelib_spinctlg.obj \
@@ -3915,59 +6118,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \
        $(OBJS)\corelib_treebkg.obj \
        $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_xmlreshandler.obj
 !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_caret.obj \
-       $(OBJS)\corelib_clipbrd.obj \
-       $(OBJS)\corelib_colour.obj \
-       $(OBJS)\corelib_cursor.obj \
-       $(OBJS)\corelib_data.obj \
-       $(OBJS)\corelib_dc.obj \
-       $(OBJS)\corelib_dcclient.obj \
-       $(OBJS)\corelib_dcmemory.obj \
-       $(OBJS)\corelib_dcprint.obj \
-       $(OBJS)\corelib_dcscreen.obj \
-       $(OBJS)\corelib_dialup.obj \
-       $(OBJS)\corelib_dib.obj \
-       $(OBJS)\corelib_display.obj \
-       $(OBJS)\corelib_enhmeta.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_icon.obj \
-       $(OBJS)\corelib_imaglist.obj \
-       $(OBJS)\corelib_minifram.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_palette.obj \
-       $(OBJS)\corelib_pen.obj \
-       $(OBJS)\corelib_popupwin.obj \
-       $(OBJS)\corelib_printdlg.obj \
-       $(OBJS)\corelib_printwin.obj \
-       $(OBJS)\corelib_region.obj \
-       $(OBJS)\corelib_renderer.obj \
-       $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_tooltip.obj \
-       $(OBJS)\corelib_toplevel.obj \
-       $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_uxtheme.obj \
-       $(OBJS)\corelib_window.obj \
-       $(OBJS)\corelib_helpchm.obj \
-       $(OBJS)\corelib_helpwin.obj \
-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_uuid.obj \
+       $(____LOWLEVEL_SRC_FILENAMES_2) \
+       $(____UNIV_PLATFORM_SRC_FILENAMES_3_OBJECTS) \
        $(OBJS)\corelib_generic_accel.obj \
        $(OBJS)\corelib_clrpickerg.obj \
        $(OBJS)\corelib_collpaneg.obj \
@@ -3980,7 +6137,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontpickerg.obj \
        $(OBJS)\corelib_generic_listctrl.obj \
        $(OBJS)\corelib_mdig.obj \
-       $(OBJS)\corelib_msgdlgg.obj \
        $(OBJS)\corelib_prntdlgg.obj \
        $(OBJS)\corelib_univ_bmpbuttn.obj \
        $(OBJS)\corelib_univ_button.obj \
@@ -4025,17 +6181,23 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_accelcmn.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_anidecod.obj \
+       $(OBJS)\corelib_affinematrix2d.obj \
        $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
+       $(OBJS)\corelib_arttango.obj \
        $(OBJS)\corelib_bmpbase.obj \
+       $(OBJS)\corelib_bmpbtncmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_btncmn.obj \
        $(OBJS)\corelib_cairo.obj \
+       $(OBJS)\corelib_checkboxcmn.obj \
+       $(OBJS)\corelib_checklstcmn.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_clrpickercmn.obj \
        $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_colourdata.obj \
        $(OBJS)\corelib_combocmn.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
@@ -4043,11 +6205,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_cshelp.obj \
        $(OBJS)\corelib_ctrlcmn.obj \
        $(OBJS)\corelib_ctrlsub.obj \
-       $(OBJS)\corelib_datacmn.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dcbufcmn.obj \
        $(OBJS)\corelib_dcgraph.obj \
        $(OBJS)\corelib_dcsvg.obj \
+       $(OBJS)\corelib_dirctrlcmn.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
        $(OBJS)\corelib_dobjcmn.obj \
@@ -4058,10 +6220,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_effects.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_filectrlcmn.obj \
+       $(OBJS)\corelib_filehistorycmn.obj \
        $(OBJS)\corelib_filepickercmn.obj \
        $(OBJS)\corelib_fontpickercmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontdata.obj \
+       $(OBJS)\corelib_graphicc.obj \
        $(OBJS)\corelib_fontenumcmn.obj \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_fontutilcmn.obj \
@@ -4092,36 +6257,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_listctrlcmn.obj \
+       $(OBJS)\corelib_markupparser.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
        $(OBJS)\corelib_mousemanager.obj \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
+       $(OBJS)\corelib_ownerdrwcmn.obj \
        $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_panelcmn.obj \
        $(OBJS)\corelib_persist.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
        $(OBJS)\corelib_quantize.obj \
+       $(OBJS)\corelib_radiobtncmn.obj \
        $(OBJS)\corelib_radiocmn.obj \
        $(OBJS)\corelib_rearrangectrl.obj \
        $(OBJS)\corelib_rendcmn.obj \
        $(OBJS)\corelib_rgncmn.obj \
+       $(OBJS)\corelib_scrolbarcmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_slidercmn.obj \
+       $(OBJS)\corelib_spinbtncmn.obj \
        $(OBJS)\corelib_spinctrlcmn.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
+       $(OBJS)\corelib_statbmpcmn.obj \
+       $(OBJS)\corelib_statboxcmn.obj \
+       $(OBJS)\corelib_statlinecmn.obj \
        $(OBJS)\corelib_stattextcmn.obj \
        $(OBJS)\corelib_stockitem.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_textentrycmn.obj \
+       $(OBJS)\corelib_textmeasurecmn.obj \
        $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
+       $(OBJS)\corelib_uiactioncmn.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
+       $(OBJS)\corelib_valnum.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_windowid.obj \
        $(OBJS)\corelib_wrapsizer.obj \
@@ -4136,13 +6314,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dragimgg.obj \
        $(OBJS)\corelib_filectrlg.obj \
        $(OBJS)\corelib_headerctrlg.obj \
+       $(OBJS)\corelib_generic_infobar.obj \
        $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_markuptext.obj \
+       $(OBJS)\corelib_msgdlgg.obj \
        $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
        $(OBJS)\corelib_progdlgg.obj \
        $(OBJS)\corelib_printps.obj \
        $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_richmsgdlgg.obj \
        $(OBJS)\corelib_scrlwing.obj \
        $(OBJS)\corelib_selstore.obj \
        $(OBJS)\corelib_spinctlg.obj \
@@ -4156,7 +6337,650 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \
        $(OBJS)\corelib_treebkg.obj \
        $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_xmlreshandler.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_NSBox.obj \
+       $(OBJS)\corelib_NSButton.obj \
+       $(OBJS)\corelib_NSControl.obj \
+       $(OBJS)\corelib_NSMenu.obj \
+       $(OBJS)\corelib_NSPanel.obj \
+       $(OBJS)\corelib_NSScroller.obj \
+       $(OBJS)\corelib_NSSlider.obj \
+       $(OBJS)\corelib_NSTabView.obj \
+       $(OBJS)\corelib_NSTableView.obj \
+       $(OBJS)\corelib_NSTextField.obj \
+       $(OBJS)\corelib_NSView.obj \
+       $(OBJS)\corelib_NSWindow.obj \
+       $(OBJS)\corelib_ObjcRef.obj \
+       $(OBJS)\corelib_cocoa_app.obj \
+       $(OBJS)\corelib_cocoa_bitmap.obj \
+       $(OBJS)\corelib_cocoa_bmpbuttn.obj \
+       $(OBJS)\corelib_cocoa_brush.obj \
+       $(OBJS)\corelib_src_cocoa_button.obj \
+       $(OBJS)\corelib_src_cocoa_checkbox.obj \
+       $(OBJS)\corelib_cocoa_checklst.obj \
+       $(OBJS)\corelib_src_cocoa_choice.obj \
+       $(OBJS)\corelib_cocoa_clipbrd.obj \
+       $(OBJS)\corelib_cocoa_colordlg.obj \
+       $(OBJS)\corelib_src_cocoa_colour.obj \
+       $(OBJS)\corelib_src_cocoa_combobox.obj \
+       $(OBJS)\corelib_cocoa_control.obj \
+       $(OBJS)\corelib_cocoa_cursor.obj \
+       $(OBJS)\corelib_cocoa_data.obj \
+       $(OBJS)\corelib_cocoa_dataobj.obj \
+       $(OBJS)\corelib_cocoa_dc.obj \
+       $(OBJS)\corelib_cocoa_dcclient.obj \
+       $(OBJS)\corelib_cocoa_dcmemory.obj \
+       $(OBJS)\corelib_cocoa_dcscreen.obj \
+       $(OBJS)\corelib_src_cocoa_dialog.obj \
+       $(OBJS)\corelib_src_cocoa_dirdlg.obj \
+       $(OBJS)\corelib_cocoa_display.obj \
+       $(OBJS)\corelib_drawer.obj \
+       $(OBJS)\corelib_src_cocoa_evtloop.obj \
+       $(OBJS)\corelib_src_cocoa_filedlg.obj \
+       $(OBJS)\corelib_cocoa_font.obj \
+       $(OBJS)\corelib_cocoa_fontdlg.obj \
+       $(OBJS)\corelib_cocoa_fontenum.obj \
+       $(OBJS)\corelib_cocoa_fontutil.obj \
+       $(OBJS)\corelib_cocoa_frame.obj \
+       $(OBJS)\corelib_src_cocoa_gauge.obj \
+       $(OBJS)\corelib_cocoa_icon.obj \
+       $(OBJS)\corelib_src_cocoa_listbox.obj \
+       $(OBJS)\corelib_cocoa_main.obj \
+       $(OBJS)\corelib_mbarman.obj \
+       $(OBJS)\corelib_cocoa_mdi.obj \
+       $(OBJS)\corelib_src_cocoa_menu.obj \
+       $(OBJS)\corelib_src_cocoa_menuitem.obj \
+       $(OBJS)\corelib_src_cocoa_msgdlg.obj \
+       $(OBJS)\corelib_src_cocoa_notebook.obj \
+       $(OBJS)\corelib_cocoa_pen.obj \
+       $(OBJS)\corelib_cocoa_radiobox.obj \
+       $(OBJS)\corelib_src_cocoa_radiobut.obj \
+       $(OBJS)\corelib_cocoa_region.obj \
+       $(OBJS)\corelib_src_cocoa_scrolbar.obj \
+       $(OBJS)\corelib_cocoa_settings.obj \
+       $(OBJS)\corelib_src_cocoa_slider.obj \
+       $(OBJS)\corelib_sound.obj \
+       $(OBJS)\corelib_src_cocoa_spinbutt.obj \
+       $(OBJS)\corelib_cocoa_statbmp.obj \
+       $(OBJS)\corelib_src_cocoa_statbox.obj \
+       $(OBJS)\corelib_statline2.obj \
+       $(OBJS)\corelib_src_cocoa_stattext.obj \
+       $(OBJS)\corelib_src_cocoa_textctrl.obj \
+       $(OBJS)\corelib_cocoa_timer.obj \
+       $(OBJS)\corelib_src_cocoa_toolbar.obj \
+       $(OBJS)\corelib_src_cocoa_tooltip.obj \
+       $(OBJS)\corelib_cocoa_toplevel.obj \
+       $(OBJS)\corelib_src_cocoa_utils.obj \
+       $(OBJS)\corelib_utilsexc.obj \
+       $(OBJS)\corelib_src_cocoa_window.obj \
+       $(OBJS)\corelib_generic_accel.obj \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_paletteg.obj \
+       $(OBJS)\corelib_regiong.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_generic_accel.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filedlgg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_gtk1_bmpbuttn.obj \
+       $(OBJS)\corelib_gtk1_button.obj \
+       $(OBJS)\corelib_gtk1_checkbox.obj \
+       $(OBJS)\corelib_gtk1_checklst.obj \
+       $(OBJS)\corelib_gtk1_choice.obj \
+       $(OBJS)\corelib_gtk1_combobox.obj \
+       $(OBJS)\corelib_gtk1_control.obj \
+       $(OBJS)\corelib_gtk1_dialog.obj \
+       $(OBJS)\corelib_gtk1_filedlg.obj \
+       $(OBJS)\corelib_gtk1_fontdlg.obj \
+       $(OBJS)\corelib_gtk1_frame.obj \
+       $(OBJS)\corelib_gtk1_gauge.obj \
+       $(OBJS)\corelib_gtk1_listbox.obj \
+       $(OBJS)\corelib_gtk1_mdi.obj \
+       $(OBJS)\corelib_gtk1_menu.obj \
+       $(OBJS)\corelib_gtk1_mnemonics.obj \
+       $(OBJS)\corelib_gtk1_notebook.obj \
+       $(OBJS)\corelib_gtk1_radiobox.obj \
+       $(OBJS)\corelib_gtk1_radiobut.obj \
+       $(OBJS)\corelib_gtk1_scrolbar.obj \
+       $(OBJS)\corelib_gtk1_scrolwin.obj \
+       $(OBJS)\corelib_gtk1_slider.obj \
+       $(OBJS)\corelib_gtk1_spinbutt.obj \
+       $(OBJS)\corelib_gtk1_spinctrl.obj \
+       $(OBJS)\corelib_gtk1_statbmp.obj \
+       $(OBJS)\corelib_gtk1_statbox.obj \
+       $(OBJS)\corelib_gtk1_statline.obj \
+       $(OBJS)\corelib_gtk1_stattext.obj \
+       $(OBJS)\corelib_gtk1_toolbar.obj \
+       $(OBJS)\corelib_gtk1_textctrl.obj \
+       $(OBJS)\corelib_gtk1_tglbtn.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_generic_accel.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_gtk_anybutton.obj \
+       $(OBJS)\corelib_artgtk.obj \
+       $(OBJS)\corelib_gtk_bmpbuttn.obj \
+       $(OBJS)\corelib_gtk_button.obj \
+       $(OBJS)\corelib_gtk_checkbox.obj \
+       $(OBJS)\corelib_gtk_checklst.obj \
+       $(OBJS)\corelib_gtk_choice.obj \
+       $(OBJS)\corelib_collpane.obj \
+       $(OBJS)\corelib_gtk_colordlg.obj \
+       $(OBJS)\corelib_gtk_combobox.obj \
+       $(OBJS)\corelib_gtk_control.obj \
+       $(OBJS)\corelib_clrpicker.obj \
+       $(OBJS)\corelib_gtk_dialog.obj \
+       $(OBJS)\corelib_fontpicker.obj \
+       $(OBJS)\corelib_filepicker.obj \
+       $(OBJS)\corelib_gtk_dirdlg.obj \
+       $(OBJS)\corelib_gtk_filedlg.obj \
+       $(OBJS)\corelib_gtk_fontdlg.obj \
+       $(OBJS)\corelib_gtk_frame.obj \
+       $(OBJS)\corelib_gtk_gauge.obj \
+       $(OBJS)\corelib_gvfs.obj \
+       $(OBJS)\corelib_gtk_infobar.obj \
+       $(OBJS)\corelib_gtk_listbox.obj \
+       $(OBJS)\corelib_gtk_mdi.obj \
+       $(OBJS)\corelib_gtk_menu.obj \
+       $(OBJS)\corelib_gtk_mnemonics.obj \
+       $(OBJS)\corelib_gtk_msgdlg.obj \
+       $(OBJS)\corelib_gtk_nativewin.obj \
+       $(OBJS)\corelib_gtk_notebook.obj \
+       $(OBJS)\corelib_gtk_print.obj \
+       $(OBJS)\corelib_gtk_radiobox.obj \
+       $(OBJS)\corelib_gtk_radiobut.obj \
+       $(OBJS)\corelib_gtk_scrolbar.obj \
+       $(OBJS)\corelib_gtk_scrolwin.obj \
+       $(OBJS)\corelib_gtk_slider.obj \
+       $(OBJS)\corelib_gtk_spinbutt.obj \
+       $(OBJS)\corelib_gtk_spinctrl.obj \
+       $(OBJS)\corelib_gtk_statbmp.obj \
+       $(OBJS)\corelib_gtk_statbox.obj \
+       $(OBJS)\corelib_gtk_statline.obj \
+       $(OBJS)\corelib_gtk_stattext.obj \
+       $(OBJS)\corelib_gtk_toolbar.obj \
+       $(OBJS)\corelib_gtk_textctrl.obj \
+       $(OBJS)\corelib_gtk_textentry.obj \
+       $(OBJS)\corelib_gtk_tglbtn.obj \
+       $(OBJS)\corelib_treeentry_gtk.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_gprint.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_generic_accel.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_gtk_anybutton.obj \
+       $(OBJS)\corelib_artgtk.obj \
+       $(OBJS)\corelib_gtk_bmpbuttn.obj \
+       $(OBJS)\corelib_gtk_button.obj \
+       $(OBJS)\corelib_gtk_checkbox.obj \
+       $(OBJS)\corelib_gtk_checklst.obj \
+       $(OBJS)\corelib_gtk_choice.obj \
+       $(OBJS)\corelib_collpane.obj \
+       $(OBJS)\corelib_gtk_colordlg.obj \
+       $(OBJS)\corelib_gtk_combobox.obj \
+       $(OBJS)\corelib_gtk_control.obj \
+       $(OBJS)\corelib_clrpicker.obj \
+       $(OBJS)\corelib_gtk_dialog.obj \
+       $(OBJS)\corelib_fontpicker.obj \
+       $(OBJS)\corelib_filepicker.obj \
+       $(OBJS)\corelib_gtk_dirdlg.obj \
+       $(OBJS)\corelib_gtk_filedlg.obj \
+       $(OBJS)\corelib_gtk_fontdlg.obj \
+       $(OBJS)\corelib_gtk_frame.obj \
+       $(OBJS)\corelib_gtk_gauge.obj \
+       $(OBJS)\corelib_gvfs.obj \
+       $(OBJS)\corelib_gtk_infobar.obj \
+       $(OBJS)\corelib_gtk_listbox.obj \
+       $(OBJS)\corelib_gtk_mdi.obj \
+       $(OBJS)\corelib_gtk_menu.obj \
+       $(OBJS)\corelib_gtk_mnemonics.obj \
+       $(OBJS)\corelib_gtk_msgdlg.obj \
+       $(OBJS)\corelib_gtk_nativewin.obj \
+       $(OBJS)\corelib_gtk_notebook.obj \
+       $(OBJS)\corelib_gtk_print.obj \
+       $(OBJS)\corelib_gtk_radiobox.obj \
+       $(OBJS)\corelib_gtk_radiobut.obj \
+       $(OBJS)\corelib_gtk_scrolbar.obj \
+       $(OBJS)\corelib_gtk_scrolwin.obj \
+       $(OBJS)\corelib_gtk_slider.obj \
+       $(OBJS)\corelib_gtk_spinbutt.obj \
+       $(OBJS)\corelib_gtk_spinctrl.obj \
+       $(OBJS)\corelib_gtk_statbmp.obj \
+       $(OBJS)\corelib_gtk_statbox.obj \
+       $(OBJS)\corelib_gtk_statline.obj \
+       $(OBJS)\corelib_gtk_stattext.obj \
+       $(OBJS)\corelib_gtk_toolbar.obj \
+       $(OBJS)\corelib_gtk_textctrl.obj \
+       $(OBJS)\corelib_gtk_textentry.obj \
+       $(OBJS)\corelib_gtk_tglbtn.obj \
+       $(OBJS)\corelib_treeentry_gtk.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_motif_accel.obj \
+       $(OBJS)\corelib_motif_app.obj \
+       $(OBJS)\corelib_motif_bmpbuttn.obj \
+       $(OBJS)\corelib_bmpmotif.obj \
+       $(OBJS)\corelib_motif_button.obj \
+       $(OBJS)\corelib_motif_checkbox.obj \
+       $(OBJS)\corelib_motif_checklst.obj \
+       $(OBJS)\corelib_motif_choice.obj \
+       $(OBJS)\corelib_motif_clipbrd.obj \
+       $(OBJS)\corelib_motif_colour.obj \
+       $(OBJS)\corelib_motif_combobox.obj \
+       $(OBJS)\corelib_combobox_native.obj \
+       $(OBJS)\corelib_motif_control.obj \
+       $(OBJS)\corelib_motif_cursor.obj \
+       $(OBJS)\corelib_motif_data.obj \
+       $(OBJS)\corelib_motif_dataobj.obj \
+       $(OBJS)\corelib_motif_dc.obj \
+       $(OBJS)\corelib_motif_dcclient.obj \
+       $(OBJS)\corelib_motif_dcmemory.obj \
+       $(OBJS)\corelib_motif_dcscreen.obj \
+       $(OBJS)\corelib_motif_dialog.obj \
+       $(OBJS)\corelib_motif_evtloop.obj \
+       $(OBJS)\corelib_motif_filedlg.obj \
+       $(OBJS)\corelib_motif_font.obj \
+       $(OBJS)\corelib_motif_frame.obj \
+       $(OBJS)\corelib_motif_gauge.obj \
+       $(OBJS)\corelib_sockmot.obj \
+       $(OBJS)\corelib_motif_icon.obj \
+       $(OBJS)\corelib_motif_listbox.obj \
+       $(OBJS)\corelib_motif_main.obj \
+       $(OBJS)\corelib_motif_menu.obj \
+       $(OBJS)\corelib_motif_menuitem.obj \
+       $(OBJS)\corelib_motif_minifram.obj \
+       $(OBJS)\corelib_motif_msgdlg.obj \
+       $(OBJS)\corelib_motif_popupwin.obj \
+       $(OBJS)\corelib_motif_radiobox.obj \
+       $(OBJS)\corelib_motif_radiobut.obj \
+       $(OBJS)\corelib_motif_scrolbar.obj \
+       $(OBJS)\corelib_motif_settings.obj \
+       $(OBJS)\corelib_motif_slider.obj \
+       $(OBJS)\corelib_motif_spinbutt.obj \
+       $(OBJS)\corelib_motif_statbmp.obj \
+       $(OBJS)\corelib_motif_statbox.obj \
+       $(OBJS)\corelib_motif_stattext.obj \
+       $(OBJS)\corelib_motif_textctrl.obj \
+       $(OBJS)\corelib_motif_textentry.obj \
+       $(OBJS)\corelib_motif_timer.obj \
+       $(OBJS)\corelib_motif_toolbar.obj \
+       $(OBJS)\corelib_motif_toplevel.obj \
+       $(OBJS)\corelib_motif_utils.obj \
+       $(OBJS)\corelib_motif_window.obj \
+       $(OBJS)\corelib_xmcombo.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_mdig.obj \
+       $(OBJS)\corelib_generic_notebook.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_generic_statline.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_tabg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_msw_accel.obj \
+       $(OBJS)\corelib_msw_anybutton.obj \
+       $(OBJS)\corelib_artmsw.obj \
+       $(OBJS)\corelib_msw_bmpbuttn.obj \
+       $(OBJS)\corelib_msw_button.obj \
+       $(OBJS)\corelib_msw_checkbox.obj \
+       $(OBJS)\corelib_msw_choice.obj \
+       $(OBJS)\corelib_msw_colordlg.obj \
+       $(OBJS)\corelib_combo.obj \
+       $(OBJS)\corelib_msw_combobox.obj \
+       $(OBJS)\corelib_msw_control.obj \
+       $(OBJS)\corelib_msw_dialog.obj \
+       $(OBJS)\corelib_msw_dirdlg.obj \
+       $(OBJS)\corelib_dragimag.obj \
+       $(OBJS)\corelib_msw_evtloop.obj \
+       $(OBJS)\corelib_msw_filedlg.obj \
+       $(OBJS)\corelib_msw_frame.obj \
+       $(OBJS)\corelib_msw_gauge.obj \
+       $(OBJS)\corelib_headerctrl.obj \
+       $(OBJS)\corelib_msw_iniconf.obj \
+       $(OBJS)\corelib_msw_listbox.obj \
+       $(OBJS)\corelib_msw_listctrl.obj \
+       $(OBJS)\corelib_msw_mdi.obj \
+       $(OBJS)\corelib_msw_menu.obj \
+       $(OBJS)\corelib_msw_menuitem.obj \
+       $(OBJS)\corelib_msw_metafile.obj \
+       $(OBJS)\corelib_msw_msgdlg.obj \
+       $(OBJS)\corelib_msw_nativdlg.obj \
+       $(OBJS)\corelib_msw_nativewin.obj \
+       $(OBJS)\corelib_msw_notebook.obj \
+       $(OBJS)\corelib_access.obj \
+       $(OBJS)\corelib_msw_ownerdrw.obj \
+       $(OBJS)\corelib_panel.obj \
+       $(OBJS)\corelib_progdlg.obj \
+       $(OBJS)\corelib_msw_radiobox.obj \
+       $(OBJS)\corelib_msw_radiobut.obj \
+       $(OBJS)\corelib_richmsgdlg.obj \
+       $(OBJS)\corelib_msw_scrolbar.obj \
+       $(OBJS)\corelib_msw_slider.obj \
+       $(OBJS)\corelib_msw_spinbutt.obj \
+       $(OBJS)\corelib_msw_spinctrl.obj \
+       $(OBJS)\corelib_msw_statbmp.obj \
+       $(OBJS)\corelib_msw_statbox.obj \
+       $(OBJS)\corelib_statusbar.obj \
+       $(OBJS)\corelib_msw_statline.obj \
+       $(OBJS)\corelib_msw_stattext.obj \
+       $(OBJS)\corelib_msw_toolbar.obj \
+       $(OBJS)\corelib_msw_textctrl.obj \
+       $(OBJS)\corelib_msw_textentry.obj \
+       $(OBJS)\corelib_msw_tglbtn.obj \
+       $(OBJS)\corelib_treectrl.obj \
+       $(OBJS)\corelib_msw_checklst.obj \
+       $(OBJS)\corelib_msw_fdrepdlg.obj \
+       $(OBJS)\corelib_msw_fontdlg.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_carbon_anybutton.obj \
+       $(OBJS)\corelib_carbon_bmpbuttn.obj \
+       $(OBJS)\corelib_carbon_button.obj \
+       $(OBJS)\corelib_carbon_checkbox.obj \
+       $(OBJS)\corelib_carbon_choice.obj \
+       $(OBJS)\corelib_carbon_colordlg.obj \
+       $(OBJS)\corelib_carbon_dialog.obj \
+       $(OBJS)\corelib_carbon_dirdlg.obj \
+       $(OBJS)\corelib_carbon_dnd.obj \
+       $(OBJS)\corelib_carbon_evtloop.obj \
+       $(OBJS)\corelib_carbon_filedlg.obj \
+       $(OBJS)\corelib_carbon_gauge.obj \
+       $(OBJS)\corelib_carbon_listbox.obj \
+       $(OBJS)\corelib_listctrl_mac.obj \
+       $(OBJS)\corelib_carbon_menu.obj \
+       $(OBJS)\corelib_carbon_menuitem.obj \
+       $(OBJS)\corelib_carbon_msgdlg.obj \
+       $(OBJS)\corelib_carbon_nonownedwnd.obj \
+       $(OBJS)\corelib_notebmac.obj \
+       $(OBJS)\corelib_carbon_printdlg.obj \
+       $(OBJS)\corelib_carbon_radiobut.obj \
+       $(OBJS)\corelib_carbon_scrolbar.obj \
+       $(OBJS)\corelib_carbon_slider.obj \
+       $(OBJS)\corelib_carbon_spinbutt.obj \
+       $(OBJS)\corelib_carbon_srchctrl.obj \
+       $(OBJS)\corelib_carbon_statbmp.obj \
+       $(OBJS)\corelib_carbon_statbox.obj \
+       $(OBJS)\corelib_statlmac.obj \
+       $(OBJS)\corelib_carbon_stattext.obj \
+       $(OBJS)\corelib_carbon_textctrl.obj \
+       $(OBJS)\corelib_carbon_tglbtn.obj \
+       $(OBJS)\corelib_carbon_toolbar.obj \
+       $(OBJS)\corelib_carbon_tooltip.obj \
+       $(OBJS)\corelib_carbon_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_cocoa_anybutton.obj \
+       $(OBJS)\corelib_osx_cocoa_button.obj \
+       $(OBJS)\corelib_osx_cocoa_checkbox.obj \
+       $(OBJS)\corelib_osx_cocoa_choice.obj \
+       $(OBJS)\corelib_osx_cocoa_colour.obj \
+       $(OBJS)\corelib_osx_cocoa_combobox.obj \
+       $(OBJS)\corelib_osx_cocoa_dialog.obj \
+       $(OBJS)\corelib_osx_cocoa_dirdlg.obj \
+       $(OBJS)\corelib_cocoa_dnd.obj \
+       $(OBJS)\corelib_osx_cocoa_evtloop.obj \
+       $(OBJS)\corelib_osx_cocoa_filedlg.obj \
+       $(OBJS)\corelib_osx_cocoa_gauge.obj \
+       $(OBJS)\corelib_osx_cocoa_listbox.obj \
+       $(OBJS)\corelib_osx_cocoa_menu.obj \
+       $(OBJS)\corelib_osx_cocoa_menuitem.obj \
+       $(OBJS)\corelib_osx_cocoa_msgdlg.obj \
+       $(OBJS)\corelib_cocoa_nonownedwnd.obj \
+       $(OBJS)\corelib_osx_cocoa_notebook.obj \
+       $(OBJS)\corelib_osx_cocoa_radiobut.obj \
+       $(OBJS)\corelib_cocoa_printdlg.obj \
+       $(OBJS)\corelib_osx_cocoa_scrolbar.obj \
+       $(OBJS)\corelib_osx_cocoa_slider.obj \
+       $(OBJS)\corelib_osx_cocoa_spinbutt.obj \
+       $(OBJS)\corelib_cocoa_srchctrl.obj \
+       $(OBJS)\corelib_osx_cocoa_statbox.obj \
+       $(OBJS)\corelib_cocoa_statline.obj \
+       $(OBJS)\corelib_osx_cocoa_stattext.obj \
+       $(OBJS)\corelib_osx_cocoa_textctrl.obj \
+       $(OBJS)\corelib_cocoa_tglbtn.obj \
+       $(OBJS)\corelib_osx_cocoa_toolbar.obj \
+       $(OBJS)\corelib_osx_cocoa_tooltip.obj \
+       $(OBJS)\corelib_osx_cocoa_window.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_regiong.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_iphone_anybutton.obj \
+       $(OBJS)\corelib_iphone_button.obj \
+       $(OBJS)\corelib_iphone_checkbox.obj \
+       $(OBJS)\corelib_iphone_dialog.obj \
+       $(OBJS)\corelib_iphone_evtloop.obj \
+       $(OBJS)\corelib_iphone_gauge.obj \
+       $(OBJS)\corelib_iphone_msgdlg.obj \
+       $(OBJS)\corelib_iphone_nonownedwnd.obj \
+       $(OBJS)\corelib_iphone_scrolbar.obj \
+       $(OBJS)\corelib_iphone_slider.obj \
+       $(OBJS)\corelib_iphone_stattext.obj \
+       $(OBJS)\corelib_iphone_textctrl.obj \
+       $(OBJS)\corelib_iphone_toolbar.obj \
+       $(OBJS)\corelib_iphone_utils.obj \
+       $(OBJS)\corelib_iphone_window.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
+       $(OBJS)\corelib_mdig.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj \
+       $(OBJS)\corelib_os2_accel.obj \
+       $(OBJS)\corelib_os2_app.obj \
+       $(OBJS)\corelib_os2_bitmap.obj \
+       $(OBJS)\corelib_os2_bmpbuttn.obj \
+       $(OBJS)\corelib_os2_brush.obj \
+       $(OBJS)\corelib_os2_button.obj \
+       $(OBJS)\corelib_os2_checkbox.obj \
+       $(OBJS)\corelib_os2_checklst.obj \
+       $(OBJS)\corelib_os2_choice.obj \
+       $(OBJS)\corelib_os2_clipbrd.obj \
+       $(OBJS)\corelib_os2_colour.obj \
+       $(OBJS)\corelib_os2_combobox.obj \
+       $(OBJS)\corelib_os2_control.obj \
+       $(OBJS)\corelib_os2_cursor.obj \
+       $(OBJS)\corelib_os2_data.obj \
+       $(OBJS)\corelib_os2_dataobj.obj \
+       $(OBJS)\corelib_os2_dc.obj \
+       $(OBJS)\corelib_os2_dcclient.obj \
+       $(OBJS)\corelib_os2_dcmemory.obj \
+       $(OBJS)\corelib_os2_dcprint.obj \
+       $(OBJS)\corelib_os2_dcscreen.obj \
+       $(OBJS)\corelib_os2_dialog.obj \
+       $(OBJS)\corelib_os2_dnd.obj \
+       $(OBJS)\corelib_os2_evtloop.obj \
+       $(OBJS)\corelib_os2_filedlg.obj \
+       $(OBJS)\corelib_os2_font.obj \
+       $(OBJS)\corelib_os2_fontdlg.obj \
+       $(OBJS)\corelib_os2_fontenum.obj \
+       $(OBJS)\corelib_os2_fontutil.obj \
+       $(OBJS)\corelib_os2_frame.obj \
+       $(OBJS)\corelib_os2_gauge.obj \
+       $(OBJS)\corelib_os2_gdiimage.obj \
+       $(OBJS)\corelib_sockpm.obj \
+       $(OBJS)\corelib_os2_helpwin.obj \
+       $(OBJS)\corelib_os2_icon.obj \
+       $(OBJS)\corelib_os2_iniconf.obj \
+       $(OBJS)\corelib_os2_listbox.obj \
+       $(OBJS)\corelib_os2_main.obj \
+       $(OBJS)\corelib_os2_menu.obj \
+       $(OBJS)\corelib_os2_menuitem.obj \
+       $(OBJS)\corelib_os2_metafile.obj \
+       $(OBJS)\corelib_os2_minifram.obj \
+       $(OBJS)\corelib_os2_msgdlg.obj \
+       $(OBJS)\corelib_os2_nativdlg.obj \
+       $(OBJS)\corelib_os2_notebook.obj \
+       $(OBJS)\corelib_os2_ownerdrw.obj \
+       $(OBJS)\corelib_os2_palette.obj \
+       $(OBJS)\corelib_os2_pen.obj \
+       $(OBJS)\corelib_os2_popupwin.obj \
+       $(OBJS)\corelib_os2_print.obj \
+       $(OBJS)\corelib_os2_radiobox.obj \
+       $(OBJS)\corelib_os2_radiobut.obj \
+       $(OBJS)\corelib_os2_region.obj \
+       $(OBJS)\corelib_os2_scrolbar.obj \
+       $(OBJS)\corelib_os2_settings.obj \
+       $(OBJS)\corelib_os2_slider.obj \
+       $(OBJS)\corelib_os2_spinbutt.obj \
+       $(OBJS)\corelib_os2_spinctrl.obj \
+       $(OBJS)\corelib_os2_statbmp.obj \
+       $(OBJS)\corelib_os2_statbox.obj \
+       $(OBJS)\corelib_os2_statline.obj \
+       $(OBJS)\corelib_os2_stattext.obj \
+       $(OBJS)\corelib_os2_textctrl.obj \
+       $(OBJS)\corelib_os2_textentry.obj \
+       $(OBJS)\corelib_os2_tglbtn.obj \
+       $(OBJS)\corelib_os2_timer.obj \
+       $(OBJS)\corelib_os2_toolbar.obj \
+       $(OBJS)\corelib_os2_tooltip.obj \
+       $(OBJS)\corelib_os2_toplevel.obj \
+       $(OBJS)\corelib_os2_utilsgui.obj \
+       $(OBJS)\corelib_os2_window.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____GUI_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_msw_accel.obj \
+       $(OBJS)\corelib_msw_anybutton.obj \
+       $(OBJS)\corelib_artmsw.obj \
+       $(OBJS)\corelib_msw_bmpbuttn.obj \
+       $(OBJS)\corelib_msw_button.obj \
+       $(OBJS)\corelib_msw_checkbox.obj \
+       $(OBJS)\corelib_msw_choice.obj \
+       $(OBJS)\corelib_msw_colordlg.obj \
+       $(OBJS)\corelib_combo.obj \
+       $(OBJS)\corelib_msw_combobox.obj \
+       $(OBJS)\corelib_msw_control.obj \
+       $(OBJS)\corelib_msw_dialog.obj \
+       $(OBJS)\corelib_msw_dirdlg.obj \
+       $(OBJS)\corelib_dragimag.obj \
+       $(OBJS)\corelib_msw_evtloop.obj \
+       $(OBJS)\corelib_msw_filedlg.obj \
+       $(OBJS)\corelib_msw_frame.obj \
+       $(OBJS)\corelib_msw_gauge.obj \
+       $(OBJS)\corelib_headerctrl.obj \
+       $(OBJS)\corelib_msw_iniconf.obj \
+       $(OBJS)\corelib_msw_listbox.obj \
+       $(OBJS)\corelib_msw_listctrl.obj \
+       $(OBJS)\corelib_msw_mdi.obj \
+       $(OBJS)\corelib_msw_menu.obj \
+       $(OBJS)\corelib_msw_menuitem.obj \
+       $(OBJS)\corelib_msw_metafile.obj \
+       $(OBJS)\corelib_msw_msgdlg.obj \
+       $(OBJS)\corelib_msw_nativdlg.obj \
+       $(OBJS)\corelib_msw_nativewin.obj \
+       $(OBJS)\corelib_msw_notebook.obj \
+       $(OBJS)\corelib_access.obj \
+       $(OBJS)\corelib_msw_ownerdrw.obj \
+       $(OBJS)\corelib_panel.obj \
+       $(OBJS)\corelib_progdlg.obj \
+       $(OBJS)\corelib_msw_radiobox.obj \
+       $(OBJS)\corelib_msw_radiobut.obj \
+       $(OBJS)\corelib_richmsgdlg.obj \
+       $(OBJS)\corelib_msw_scrolbar.obj \
+       $(OBJS)\corelib_msw_slider.obj \
+       $(OBJS)\corelib_msw_spinbutt.obj \
+       $(OBJS)\corelib_msw_spinctrl.obj \
+       $(OBJS)\corelib_msw_statbmp.obj \
+       $(OBJS)\corelib_msw_statbox.obj \
+       $(OBJS)\corelib_statusbar.obj \
+       $(OBJS)\corelib_msw_statline.obj \
+       $(OBJS)\corelib_msw_stattext.obj \
+       $(OBJS)\corelib_msw_toolbar.obj \
+       $(OBJS)\corelib_msw_textctrl.obj \
+       $(OBJS)\corelib_msw_textentry.obj \
+       $(OBJS)\corelib_msw_tglbtn.obj \
+       $(OBJS)\corelib_treectrl.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
+       $(OBJS)\corelib_filedlgg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_wince_checklst.obj \
+       $(OBJS)\corelib_choicece.obj \
+       $(OBJS)\corelib_crt.obj \
+       $(OBJS)\corelib_filedlgwce.obj \
+       $(OBJS)\corelib_filefnwce.obj \
+       $(OBJS)\corelib_helpwce.obj \
+       $(OBJS)\corelib_menuce.obj \
+       $(OBJS)\corelib_tbarwce.obj \
+       $(OBJS)\corelib_textctrlce.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____UNIV_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_msw_evtloop.obj
 !endif
 !if "$(SHARED)" == "1"
 ____wxcore_namedll_DEP = $(__coredll___depname)
@@ -4166,19 +6990,19 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_232 = 
+__DEBUGINFO_232 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_232 = 
+__DEBUGINFO_232 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_240 = D
@@ -4192,10 +7016,15 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_bmpcboxcmn.obj \
        $(OBJS)\advdll_calctrlcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \
+       $(OBJS)\advdll_gridcmn.obj \
        $(OBJS)\advdll_hyperlnkcmn.obj \
+       $(OBJS)\advdll_odcombocmn.obj \
+       $(OBJS)\advdll_richtooltipcmn.obj \
        $(OBJS)\advdll_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_editlbox.obj \
@@ -4205,26 +7034,19 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \
-       $(OBJS)\advdll_infobar.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
+       $(OBJS)\advdll_richtooltipg.obj \
        $(OBJS)\advdll_sashwin.obj \
        $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_timectrlg.obj \
        $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_treelist.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_animateg.obj \
-       $(OBJS)\advdll_bmpcbox.obj \
-       $(OBJS)\advdll_calctrl.obj \
-       $(OBJS)\advdll_datecontrols.obj \
-       $(OBJS)\advdll_datectrl.obj
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_1) \
+       $(____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_2_OBJECTS)
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4232,10 +7054,15 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_bmpcboxcmn.obj \
        $(OBJS)\advdll_calctrlcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \
+       $(OBJS)\advdll_gridcmn.obj \
        $(OBJS)\advdll_hyperlnkcmn.obj \
+       $(OBJS)\advdll_odcombocmn.obj \
+       $(OBJS)\advdll_richtooltipcmn.obj \
        $(OBJS)\advdll_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_editlbox.obj \
@@ -4245,21 +7072,72 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
        $(OBJS)\advdll_hyperlinkg.obj \
-       $(OBJS)\advdll_infobar.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_notifmsgg.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
+       $(OBJS)\advdll_richtooltipg.obj \
        $(OBJS)\advdll_sashwin.obj \
        $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_timectrlg.obj \
        $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_treelist.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 \
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_1) \
+       $(____ADVANCED_UNIV_SRC_FILENAMES_2_OBJECTS)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_gtk_aboutdlg.obj \
+       $(OBJS)\advdll_animate.obj \
+       $(OBJS)\advdll_gtk_bmpcbox.obj \
+       $(OBJS)\advdll_gtk_calctrl.obj \
+       $(OBJS)\advdll_gtk_dataview.obj \
+       $(OBJS)\advdll_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_gtk_aboutdlg.obj \
+       $(OBJS)\advdll_animate.obj \
+       $(OBJS)\advdll_gtk_bmpcbox.obj \
+       $(OBJS)\advdll_gtk_calctrl.obj \
+       $(OBJS)\advdll_gtk_dataview.obj \
+       $(OBJS)\advdll_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_msw_bmpcbox.obj \
+       $(OBJS)\advdll_msw_calctrl.obj \
+       $(OBJS)\advdll_commandlinkbutton.obj \
+       $(OBJS)\advdll_datecontrols.obj \
+       $(OBJS)\advdll_datectrl.obj \
+       $(OBJS)\advdll_msw_datetimectrl.obj \
+       $(OBJS)\advdll_msw_hyperlink.obj \
+       $(OBJS)\advdll_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_msw_bmpcbox.obj \
+       $(OBJS)\advdll_msw_calctrl.obj \
+       $(OBJS)\advdll_commandlinkbutton.obj \
+       $(OBJS)\advdll_datecontrols.obj \
+       $(OBJS)\advdll_datectrl.obj \
+       $(OBJS)\advdll_msw_datetimectrl.obj \
+       $(OBJS)\advdll_msw_hyperlink.obj \
+       $(OBJS)\advdll_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_UNIV_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_UNIV_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_UNIV_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animateg.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
@@ -4278,10 +7156,15 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_bmpcboxcmn.obj \
        $(OBJS)\advlib_calctrlcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \
+       $(OBJS)\advlib_gridcmn.obj \
        $(OBJS)\advlib_hyperlnkcmn.obj \
+       $(OBJS)\advlib_odcombocmn.obj \
+       $(OBJS)\advlib_richtooltipcmn.obj \
        $(OBJS)\advlib_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_editlbox.obj \
@@ -4291,26 +7174,19 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \
-       $(OBJS)\advlib_infobar.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
+       $(OBJS)\advlib_richtooltipg.obj \
        $(OBJS)\advlib_sashwin.obj \
        $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_timectrlg.obj \
        $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_treelist.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_animateg.obj \
-       $(OBJS)\advlib_bmpcbox.obj \
-       $(OBJS)\advlib_calctrl.obj \
-       $(OBJS)\advlib_datecontrols.obj \
-       $(OBJS)\advlib_datectrl.obj
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_2) \
+       $(____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_3_OBJECTS)
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4318,10 +7194,15 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_bmpcboxcmn.obj \
        $(OBJS)\advlib_calctrlcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \
+       $(OBJS)\advlib_gridcmn.obj \
        $(OBJS)\advlib_hyperlnkcmn.obj \
+       $(OBJS)\advlib_odcombocmn.obj \
+       $(OBJS)\advlib_richtooltipcmn.obj \
        $(OBJS)\advlib_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_editlbox.obj \
@@ -4331,21 +7212,72 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
        $(OBJS)\advlib_hyperlinkg.obj \
-       $(OBJS)\advlib_infobar.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_notifmsgg.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
+       $(OBJS)\advlib_richtooltipg.obj \
        $(OBJS)\advlib_sashwin.obj \
        $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_timectrlg.obj \
        $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_treelist.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 \
+       $(____ADVANCED_PLATFORM_SRC_FILENAMES_2) \
+       $(____ADVANCED_UNIV_SRC_FILENAMES_3_OBJECTS)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_gtk_aboutdlg.obj \
+       $(OBJS)\advlib_animate.obj \
+       $(OBJS)\advlib_gtk_bmpcbox.obj \
+       $(OBJS)\advlib_gtk_calctrl.obj \
+       $(OBJS)\advlib_gtk_dataview.obj \
+       $(OBJS)\advlib_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_gtk_aboutdlg.obj \
+       $(OBJS)\advlib_animate.obj \
+       $(OBJS)\advlib_gtk_bmpcbox.obj \
+       $(OBJS)\advlib_gtk_calctrl.obj \
+       $(OBJS)\advlib_gtk_dataview.obj \
+       $(OBJS)\advlib_gtk_hyperlink.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_msw_bmpcbox.obj \
+       $(OBJS)\advlib_msw_calctrl.obj \
+       $(OBJS)\advlib_commandlinkbutton.obj \
+       $(OBJS)\advlib_datecontrols.obj \
+       $(OBJS)\advlib_datectrl.obj \
+       $(OBJS)\advlib_msw_datetimectrl.obj \
+       $(OBJS)\advlib_msw_hyperlink.obj \
+       $(OBJS)\advlib_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_NATIVE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_msw_bmpcbox.obj \
+       $(OBJS)\advlib_msw_calctrl.obj \
+       $(OBJS)\advlib_commandlinkbutton.obj \
+       $(OBJS)\advlib_datecontrols.obj \
+       $(OBJS)\advlib_datectrl.obj \
+       $(OBJS)\advlib_msw_datetimectrl.obj \
+       $(OBJS)\advlib_msw_hyperlink.obj \
+       $(OBJS)\advlib_timectrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_UNIV_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_UNIV_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_UNIV_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animateg.obj
 !endif
 !if "$(SHARED)" == "1"
@@ -4356,19 +7288,19 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_263 = 
+__DEBUGINFO_263 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_263 = 
+__DEBUGINFO_263 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_271 = D
@@ -4376,6 +7308,48 @@ __RUNTIME_LIBS_271 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_271 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_src_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_mediactrl_am.obj \
+       $(OBJS)\mediadll_mediactrl_wmp10.obj \
+       $(OBJS)\mediadll_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_carbon_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_osx_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "PM"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_mediactrl_am.obj \
+       $(OBJS)\mediadll_mediactrl_wmp10.obj \
+       $(OBJS)\mediadll_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____MEDIA_PLATFORM_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\mediadll_unix_mediactrl.obj
+!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
@@ -4386,6 +7360,48 @@ __RUNTIME_LIBS_286 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_286 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_src_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "GTK"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_unix_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_mediactrl_am.obj \
+       $(OBJS)\medialib_mediactrl_wmp10.obj \
+       $(OBJS)\medialib_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_carbon_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_osx_cocoa_mediactrl.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "PM"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_mediactrl_am.obj \
+       $(OBJS)\medialib_mediactrl_wmp10.obj \
+       $(OBJS)\medialib_mediactrl_qt.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____MEDIA_PLATFORM_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\medialib_unix_mediactrl.obj
+!endif
 !if "$(SHARED)" == "1"
 ____wxmedia_namedll_DEP = $(__mediadll___depname)
 !endif
@@ -4394,19 +7410,19 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_294 = 
+__DEBUGINFO_294 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_294 = 
+__DEBUGINFO_294 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_302 = D
@@ -4414,6 +7430,10 @@ __RUNTIME_LIBS_302 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_302 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "MSW"
+____HTML_SRC_PLATFORM_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\htmldll_helpbest.obj
+!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
@@ -4424,27 +7444,31 @@ __RUNTIME_LIBS_317 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_317 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "MSW"
+____HTML_SRC_PLATFORM_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\htmllib_helpbest.obj
+!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
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"
+__webviewdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_325 = 
+__DEBUGINFO_325 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_325 = 
+__DEBUGINFO_325 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_333 = D
@@ -4452,9 +7476,17 @@ __RUNTIME_LIBS_333 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_333 = $(__THREADSFLAG)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
-__qalib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+!if "$(TOOLKIT)" == "GTK"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\webviewdll_webview_webkit.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\webviewdll_webview_ie.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"
+__webviewlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_348 = D
@@ -4462,27 +7494,35 @@ __RUNTIME_LIBS_348 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_348 = $(__THREADSFLAG)
 !endif
+!if "$(TOOLKIT)" == "GTK"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\webviewlib_webview_webkit.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____WEBVIEW_SRC_PLATFORM_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\webviewlib_webview_ie.obj
+!endif
 !if "$(SHARED)" == "1"
-____wxqa_namedll_DEP = $(__qadll___depname)
+____wxwebview_namedll_DEP = $(__webviewdll___depname)
 !endif
 !if "$(SHARED)" == "0"
-____wxqa_namelib_DEP = $(__qalib___depname)
+____wxwebview_namelib_DEP = $(__webviewlib___depname)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-__xmldll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
+!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$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_356 = 
+__DEBUGINFO_356 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_356 = 
+__DEBUGINFO_356 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_364 = D
@@ -4490,9 +7530,9 @@ __RUNTIME_LIBS_364 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_364 = $(__THREADSFLAG)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-__xmllib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!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_379 = D
@@ -4501,26 +7541,26 @@ __RUNTIME_LIBS_379 = D
 __RUNTIME_LIBS_379 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
-____wxxml_namedll_DEP = $(__xmldll___depname)
+____wxqa_namedll_DEP = $(__qadll___depname)
 !endif
 !if "$(SHARED)" == "0"
-____wxxml_namelib_DEP = $(__xmllib___depname)
+____wxqa_namelib_DEP = $(__qalib___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
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+__xmldll___depname = \
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_387 = 
+__DEBUGINFO_387 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_387 = 
+__DEBUGINFO_387 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_395 = D
@@ -4528,15 +7568,53 @@ __RUNTIME_LIBS_395 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_395 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
+__xmllib___depname = \
+       $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_410 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_410 = $(__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$(WXCOMPILER)$(VENDORTAG).dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_11)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_418 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_11)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_426 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_426 = $(__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"
-__RUNTIME_LIBS_410 = D
+__RUNTIME_LIBS_441 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+__RUNTIME_LIBS_441 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxrc_namedll_DEP = $(__xrcdll___depname)
@@ -4546,35 +7624,43 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_418 = 
+__DEBUGINFO_449 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_418 = 
+__DEBUGINFO_449 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_426 = D
+__RUNTIME_LIBS_457 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_426 = $(__THREADSFLAG)
+__RUNTIME_LIBS_457 = $(__THREADSFLAG)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____AUI_GTK_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\auidll_tabartgtk.obj
 !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_441 = D
+__RUNTIME_LIBS_472 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_441 = $(__THREADSFLAG)
+__RUNTIME_LIBS_472 = $(__THREADSFLAG)
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____AUI_GTK_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\auilib_tabartgtk.obj
 !endif
 !if "$(SHARED)" == "1"
 ____wxaui_namedll_DEP = $(__auidll___depname)
@@ -4584,35 +7670,35 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_449 = 
+__DEBUGINFO_480 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_449 = 
+__DEBUGINFO_480 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_457 = D
+__RUNTIME_LIBS_488 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_457 = $(__THREADSFLAG)
+__RUNTIME_LIBS_488 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
 __ribbonlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_472 = D
+__RUNTIME_LIBS_503 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_472 = $(__THREADSFLAG)
+__RUNTIME_LIBS_503 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxribbon_namedll_DEP = $(__ribbondll___depname)
@@ -4622,35 +7708,35 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_480 = 
+__DEBUGINFO_511 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_480 = 
+__DEBUGINFO_511 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_488 = D
+__RUNTIME_LIBS_519 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_488 = $(__THREADSFLAG)
+__RUNTIME_LIBS_519 = $(__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_503 = D
+__RUNTIME_LIBS_534 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_503 = $(__THREADSFLAG)
+__RUNTIME_LIBS_534 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
@@ -4660,35 +7746,35 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_511 = 
+__DEBUGINFO_542 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_511 = 
+__DEBUGINFO_542 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_519 = D
+__RUNTIME_LIBS_550 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_519 = $(__THREADSFLAG)
+__RUNTIME_LIBS_550 = $(__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"
-__RUNTIME_LIBS_534 = D
+__RUNTIME_LIBS_565 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_534 = $(__THREADSFLAG)
+__RUNTIME_LIBS_565 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
@@ -4698,35 +7784,35 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_542 = 
+__DEBUGINFO_573 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_542 = 
+__DEBUGINFO_573 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_550 = D
+__RUNTIME_LIBS_581 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_550 = $(__THREADSFLAG)
+__RUNTIME_LIBS_581 = $(__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_565 = D
+__RUNTIME_LIBS_596 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_565 = $(__THREADSFLAG)
+__RUNTIME_LIBS_596 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxstc_namedll_DEP = $(__stcdll___depname)
@@ -4736,25 +7822,76 @@ ____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
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_604 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_573 = 
+__DEBUGINFO_604 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_573 = 
+__DEBUGINFO_604 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
+__DEBUGINFO_604 = $(__DEBUGRUNTIME_11)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_581 = D
+__RUNTIME_LIBS_612 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_581 = $(__THREADSFLAG)
+__RUNTIME_LIBS_612 = $(__THREADSFLAG)
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_src_cocoa_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_gtk1_glcanvas.obj \
+       $(OBJS)\gldll_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_gtk_glcanvas.obj \
+       $(OBJS)\gldll_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_x11_glcanvas.obj \
+       $(OBJS)\gldll_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_msw_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_carbon_glcanvas.obj \
+       $(OBJS)\gldll_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_osx_cocoa_glcanvas.obj \
+       $(OBJS)\gldll_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_iphone_glcanvas.obj \
+       $(OBJS)\gldll_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_os2_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_msw_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____OPENGL_SRC_PLATFORM_FILENAMES_OBJECTS =  \
+       $(OBJS)\gldll_x11_glcanvas.obj \
+       $(OBJS)\gldll_glx11.obj
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
@@ -4762,7 +7899,7 @@ __WXLIBGLDEP_CORE_p = \
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
@@ -4773,10 +7910,61 @@ __gllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_596 = D
+__RUNTIME_LIBS_627 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_596 = $(__THREADSFLAG)
+__RUNTIME_LIBS_627 = $(__THREADSFLAG)
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_src_cocoa_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_gtk1_glcanvas.obj \
+       $(OBJS)\gllib_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_gtk_glcanvas.obj \
+       $(OBJS)\gllib_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_x11_glcanvas.obj \
+       $(OBJS)\gllib_glx11.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_msw_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_carbon_glcanvas.obj \
+       $(OBJS)\gllib_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_osx_cocoa_glcanvas.obj \
+       $(OBJS)\gllib_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_iphone_glcanvas.obj \
+       $(OBJS)\gllib_glcanvas_osx.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_os2_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_msw_glcanvas.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____OPENGL_SRC_PLATFORM_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\gllib_x11_glcanvas.obj \
+       $(OBJS)\gllib_glx11.obj
 !endif
 !if "$(SHARED)" == "1"
 ____wxgl_namedll_DEP = $(__gldll___depname)
@@ -4784,120 +7972,2015 @@ ____wxgl_namedll_DEP = $(__gldll___depname)
 !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)
+!if "$(WXUNIV)" == "0"
+__SETUP_H_SUBDIR_FILENAMES = $(WIN32_TOOLKIT_LOWERCASE)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
-__htmldll_library_link_LIBR = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!if "$(WXUNIV)" == "1"
+__SETUP_H_SUBDIR_FILENAMES = univ
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_5 = /DEBUG
+!if "$(WXUNIV)" == "0"
+__SETUP_H_SUBDIR_FILENAMES_1 = $(WIN32_TOOLKIT_LOWERCASE)
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_5 = 
+!if "$(WXUNIV)" == "1"
+__SETUP_H_SUBDIR_FILENAMES_1 = univ
 !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_5 = 
+!if "$(WXUNIV)" == "0"
+__SETUP_H_SUBDIR_FILENAMES_2 = $(WIN32_TOOLKIT_LOWERCASE)
 !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_5 = /DEBUG
+!if "$(WXUNIV)" == "1"
+__SETUP_H_SUBDIR_FILENAMES_2 = univ
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_5 = /d _DEBUG
+!if "$(USE_STC)" == "1"
+__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_5 = 
+!if "$(TOOLKIT)" == "COCOA"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_hid.obj \
+       $(OBJS)\monodll_utilsexc_cf.obj
+!endif
+!if "$(TOOLKIT)" == "DFB"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_fontmgrcmn.obj \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_colour.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_mask.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj \
+       $(OBJS)\monodll_dfb_app.obj \
+       $(OBJS)\monodll_dfb_bitmap.obj \
+       $(OBJS)\monodll_dfb_brush.obj \
+       $(OBJS)\monodll_dfb_cursor.obj \
+       $(OBJS)\monodll_dfb_dc.obj \
+       $(OBJS)\monodll_dfb_dcclient.obj \
+       $(OBJS)\monodll_dfb_dcmemory.obj \
+       $(OBJS)\monodll_dfb_dcscreen.obj \
+       $(OBJS)\monodll_dfb_evtloop.obj \
+       $(OBJS)\monodll_dfb_font.obj \
+       $(OBJS)\monodll_dfb_fontenum.obj \
+       $(OBJS)\monodll_fontmgr.obj \
+       $(OBJS)\monodll_dfb_nonownedwnd.obj \
+       $(OBJS)\monodll_overlay.obj \
+       $(OBJS)\monodll_dfb_pen.obj \
+       $(OBJS)\monodll_dfb_region.obj \
+       $(OBJS)\monodll_dfb_settings.obj \
+       $(OBJS)\monodll_dfb_toplevel.obj \
+       $(OBJS)\monodll_dfb_utils.obj \
+       $(OBJS)\monodll_dfb_window.obj \
+       $(OBJS)\monodll_wrapdfb.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_unix_dialup.obj \
+       $(OBJS)\monodll_displayx11.obj \
+       $(OBJS)\monodll_unix_fontenum.obj \
+       $(OBJS)\monodll_unix_fontutil.obj \
+       $(OBJS)\monodll_uiactionx11.obj \
+       $(OBJS)\monodll_utilsx11.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_paletteg.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj \
+       $(OBJS)\monodll_gtk1_app.obj \
+       $(OBJS)\monodll_gtk1_bitmap.obj \
+       $(OBJS)\monodll_gtk1_brush.obj \
+       $(OBJS)\monodll_gtk1_clipbrd.obj \
+       $(OBJS)\monodll_gtk1_colour.obj \
+       $(OBJS)\monodll_gtk1_cursor.obj \
+       $(OBJS)\monodll_gtk1_data.obj \
+       $(OBJS)\monodll_gtk1_dataobj.obj \
+       $(OBJS)\monodll_gtk1_dc.obj \
+       $(OBJS)\monodll_gtk1_dcclient.obj \
+       $(OBJS)\monodll_gtk1_dcmemory.obj \
+       $(OBJS)\monodll_gtk1_dcscreen.obj \
+       $(OBJS)\monodll_gtk1_dnd.obj \
+       $(OBJS)\monodll_gtk1_evtloop.obj \
+       $(OBJS)\monodll_gtk1_font.obj \
+       $(OBJS)\monodll_gtk1_sockgtk.obj \
+       $(OBJS)\monodll_gtk1_main.obj \
+       $(OBJS)\monodll_gtk1_minifram.obj \
+       $(OBJS)\monodll_gtk1_pen.obj \
+       $(OBJS)\monodll_gtk1_popupwin.obj \
+       $(OBJS)\monodll_gtk1_region.obj \
+       $(OBJS)\monodll_gtk1_renderer.obj \
+       $(OBJS)\monodll_gtk1_settings.obj \
+       $(OBJS)\monodll_gtk1_timer.obj \
+       $(OBJS)\monodll_gtk1_tooltip.obj \
+       $(OBJS)\monodll_gtk1_toplevel.obj \
+       $(OBJS)\monodll_gtk1_utilsgtk.obj \
+       $(OBJS)\monodll_gtk1_win_gtk.obj \
+       $(OBJS)\monodll_gtk1_window.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_safearray.obj \
+       $(OBJS)\monodll_uuid.obj \
+       $(OBJS)\monodll_msw_dialup.obj \
+       $(OBJS)\monodll_dib.obj \
+       $(OBJS)\monodll_msw_display.obj \
+       $(OBJS)\monodll_utilswin.obj \
+       $(OBJS)\monodll_unix_fontenum.obj \
+       $(OBJS)\monodll_unix_fontutil.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_paletteg.obj \
+       $(OBJS)\monodll_gtk_app.obj \
+       $(OBJS)\monodll_assertdlg_gtk.obj \
+       $(OBJS)\monodll_gtk_bitmap.obj \
+       $(OBJS)\monodll_gtk_brush.obj \
+       $(OBJS)\monodll_gtk_clipbrd.obj \
+       $(OBJS)\monodll_gtk_colour.obj \
+       $(OBJS)\monodll_gtk_cursor.obj \
+       $(OBJS)\monodll_gtk_dataobj.obj \
+       $(OBJS)\monodll_gtk_dc.obj \
+       $(OBJS)\monodll_gtk_dnd.obj \
+       $(OBJS)\monodll_gtk_evtloop.obj \
+       $(OBJS)\monodll_filectrl.obj \
+       $(OBJS)\monodll_filehistory.obj \
+       $(OBJS)\monodll_gtk_font.obj \
+       $(OBJS)\monodll_gtk_sockgtk.obj \
+       $(OBJS)\monodll_gtk_minifram.obj \
+       $(OBJS)\monodll_gtk_nonownedwnd.obj \
+       $(OBJS)\monodll_gtk_pen.obj \
+       $(OBJS)\monodll_gtk_popupwin.obj \
+       $(OBJS)\monodll_private.obj \
+       $(OBJS)\monodll_gtk_region.obj \
+       $(OBJS)\monodll_gtk_renderer.obj \
+       $(OBJS)\monodll_gtk_settings.obj \
+       $(OBJS)\monodll_gtk_textmeasure.obj \
+       $(OBJS)\monodll_gtk_timer.obj \
+       $(OBJS)\monodll_gtk_tooltip.obj \
+       $(OBJS)\monodll_gtk_toplevel.obj \
+       $(OBJS)\monodll_gtk_utilsgtk.obj \
+       $(OBJS)\monodll_gtk_win_gtk.obj \
+       $(OBJS)\monodll_gtk_window.obj \
+       $(OBJS)\monodll_gtk_dcclient.obj \
+       $(OBJS)\monodll_gtk_dcmemory.obj \
+       $(OBJS)\monodll_gtk_dcscreen.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_safearray.obj \
+       $(OBJS)\monodll_uuid.obj \
+       $(OBJS)\monodll_msw_dialup.obj \
+       $(OBJS)\monodll_dib.obj \
+       $(OBJS)\monodll_msw_display.obj \
+       $(OBJS)\monodll_utilswin.obj \
+       $(OBJS)\monodll_unix_fontenum.obj \
+       $(OBJS)\monodll_unix_fontutil.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_paletteg.obj \
+       $(OBJS)\monodll_gtk_app.obj \
+       $(OBJS)\monodll_assertdlg_gtk.obj \
+       $(OBJS)\monodll_gtk_bitmap.obj \
+       $(OBJS)\monodll_gtk_brush.obj \
+       $(OBJS)\monodll_gtk_clipbrd.obj \
+       $(OBJS)\monodll_gtk_colour.obj \
+       $(OBJS)\monodll_gtk_cursor.obj \
+       $(OBJS)\monodll_gtk_dataobj.obj \
+       $(OBJS)\monodll_gtk_dc.obj \
+       $(OBJS)\monodll_gtk_dnd.obj \
+       $(OBJS)\monodll_gtk_evtloop.obj \
+       $(OBJS)\monodll_filectrl.obj \
+       $(OBJS)\monodll_filehistory.obj \
+       $(OBJS)\monodll_gtk_font.obj \
+       $(OBJS)\monodll_gtk_sockgtk.obj \
+       $(OBJS)\monodll_gtk_minifram.obj \
+       $(OBJS)\monodll_gtk_nonownedwnd.obj \
+       $(OBJS)\monodll_gtk_pen.obj \
+       $(OBJS)\monodll_gtk_popupwin.obj \
+       $(OBJS)\monodll_private.obj \
+       $(OBJS)\monodll_gtk_region.obj \
+       $(OBJS)\monodll_gtk_renderer.obj \
+       $(OBJS)\monodll_gtk_settings.obj \
+       $(OBJS)\monodll_gtk_textmeasure.obj \
+       $(OBJS)\monodll_gtk_timer.obj \
+       $(OBJS)\monodll_gtk_tooltip.obj \
+       $(OBJS)\monodll_gtk_toplevel.obj \
+       $(OBJS)\monodll_gtk_utilsgtk.obj \
+       $(OBJS)\monodll_gtk_win_gtk.obj \
+       $(OBJS)\monodll_gtk_window.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_unix_dialup.obj \
+       $(OBJS)\monodll_displayx11.obj \
+       $(OBJS)\monodll_unix_fontenum.obj \
+       $(OBJS)\monodll_unix_fontutil.obj \
+       $(OBJS)\monodll_uiactionx11.obj \
+       $(OBJS)\monodll_utilsx11.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj \
+       $(OBJS)\monodll_x11_bitmap.obj \
+       $(OBJS)\monodll_x11_brush.obj \
+       $(OBJS)\monodll_x11_palette.obj \
+       $(OBJS)\monodll_x11_pen.obj \
+       $(OBJS)\monodll_x11_region.obj \
+       $(OBJS)\monodll_utilsx.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_activex.obj \
+       $(OBJS)\monodll_msw_app.obj \
+       $(OBJS)\monodll_msw_bitmap.obj \
+       $(OBJS)\monodll_msw_brush.obj \
+       $(OBJS)\monodll_msw_caret.obj \
+       $(OBJS)\monodll_msw_clipbrd.obj \
+       $(OBJS)\monodll_msw_colour.obj \
+       $(OBJS)\monodll_msw_cursor.obj \
+       $(OBJS)\monodll_msw_data.obj \
+       $(OBJS)\monodll_msw_dc.obj \
+       $(OBJS)\monodll_msw_dcclient.obj \
+       $(OBJS)\monodll_msw_dcmemory.obj \
+       $(OBJS)\monodll_msw_dcprint.obj \
+       $(OBJS)\monodll_msw_dcscreen.obj \
+       $(OBJS)\monodll_msw_dialup.obj \
+       $(OBJS)\monodll_dib.obj \
+       $(OBJS)\monodll_msw_display.obj \
+       $(OBJS)\monodll_enhmeta.obj \
+       $(OBJS)\monodll_msw_font.obj \
+       $(OBJS)\monodll_msw_fontenum.obj \
+       $(OBJS)\monodll_msw_fontutil.obj \
+       $(OBJS)\monodll_msw_gdiimage.obj \
+       $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gdiplus.obj \
+       $(OBJS)\monodll_graphics.obj \
+       $(OBJS)\monodll_msw_icon.obj \
+       $(OBJS)\monodll_msw_imaglist.obj \
+       $(OBJS)\monodll_msw_minifram.obj \
+       $(OBJS)\monodll_msw_nonownedwnd.obj \
+       $(OBJS)\monodll_ole_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_safearray.obj \
+       $(OBJS)\monodll_msw_palette.obj \
+       $(OBJS)\monodll_msw_pen.obj \
+       $(OBJS)\monodll_msw_popupwin.obj \
+       $(OBJS)\monodll_msw_printdlg.obj \
+       $(OBJS)\monodll_printwin.obj \
+       $(OBJS)\monodll_msw_region.obj \
+       $(OBJS)\monodll_msw_renderer.obj \
+       $(OBJS)\monodll_msw_settings.obj \
+       $(OBJS)\monodll_msw_textmeasure.obj \
+       $(OBJS)\monodll_msw_tooltip.obj \
+       $(OBJS)\monodll_msw_toplevel.obj \
+       $(OBJS)\monodll_uiaction.obj \
+       $(OBJS)\monodll_msw_utilsgui.obj \
+       $(OBJS)\monodll_utilswin.obj \
+       $(OBJS)\monodll_uxtheme.obj \
+       $(OBJS)\monodll_msw_window.obj \
+       $(OBJS)\monodll_helpchm.obj \
+       $(OBJS)\monodll_msw_helpwin.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_uuid.obj
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_5 = 
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____LOWLEVEL_SRC_FILENAMES =
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_5 = /d _DEBUG
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____LOWLEVEL_SRC_FILENAMES =
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_10 = 
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____LOWLEVEL_SRC_FILENAMES =
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_10 = /opt:ref /opt:icf
+!if "$(TOOLKIT)" == "PM"
+____LOWLEVEL_SRC_FILENAMES =
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_10 = /opt:ref /opt:icf
+!if "$(TOOLKIT)" == "WINCE"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_activex.obj \
+       $(OBJS)\monodll_msw_app.obj \
+       $(OBJS)\monodll_msw_bitmap.obj \
+       $(OBJS)\monodll_msw_brush.obj \
+       $(OBJS)\monodll_msw_caret.obj \
+       $(OBJS)\monodll_msw_clipbrd.obj \
+       $(OBJS)\monodll_msw_colour.obj \
+       $(OBJS)\monodll_msw_cursor.obj \
+       $(OBJS)\monodll_msw_data.obj \
+       $(OBJS)\monodll_msw_dc.obj \
+       $(OBJS)\monodll_msw_dcclient.obj \
+       $(OBJS)\monodll_msw_dcmemory.obj \
+       $(OBJS)\monodll_msw_dcprint.obj \
+       $(OBJS)\monodll_msw_dcscreen.obj \
+       $(OBJS)\monodll_msw_dialup.obj \
+       $(OBJS)\monodll_dib.obj \
+       $(OBJS)\monodll_msw_display.obj \
+       $(OBJS)\monodll_enhmeta.obj \
+       $(OBJS)\monodll_msw_font.obj \
+       $(OBJS)\monodll_msw_fontenum.obj \
+       $(OBJS)\monodll_msw_fontutil.obj \
+       $(OBJS)\monodll_msw_gdiimage.obj \
+       $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gdiplus.obj \
+       $(OBJS)\monodll_graphics.obj \
+       $(OBJS)\monodll_msw_icon.obj \
+       $(OBJS)\monodll_msw_imaglist.obj \
+       $(OBJS)\monodll_msw_minifram.obj \
+       $(OBJS)\monodll_msw_nonownedwnd.obj \
+       $(OBJS)\monodll_ole_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_safearray.obj \
+       $(OBJS)\monodll_msw_palette.obj \
+       $(OBJS)\monodll_msw_pen.obj \
+       $(OBJS)\monodll_msw_popupwin.obj \
+       $(OBJS)\monodll_msw_printdlg.obj \
+       $(OBJS)\monodll_printwin.obj \
+       $(OBJS)\monodll_msw_region.obj \
+       $(OBJS)\monodll_msw_renderer.obj \
+       $(OBJS)\monodll_msw_settings.obj \
+       $(OBJS)\monodll_msw_textmeasure.obj \
+       $(OBJS)\monodll_msw_tooltip.obj \
+       $(OBJS)\monodll_msw_toplevel.obj \
+       $(OBJS)\monodll_uiaction.obj \
+       $(OBJS)\monodll_msw_utilsgui.obj \
+       $(OBJS)\monodll_utilswin.obj \
+       $(OBJS)\monodll_uxtheme.obj \
+       $(OBJS)\monodll_msw_window.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____LOWLEVEL_SRC_FILENAMES =  \
+       $(OBJS)\monodll_generic_caret.obj \
+       $(OBJS)\monodll_generic_imaglist.obj \
+       $(OBJS)\monodll_unix_dialup.obj \
+       $(OBJS)\monodll_displayx11.obj \
+       $(OBJS)\monodll_unix_fontenum.obj \
+       $(OBJS)\monodll_unix_fontutil.obj \
+       $(OBJS)\monodll_uiactionx11.obj \
+       $(OBJS)\monodll_utilsx11.obj \
+       $(OBJS)\monodll_generic_icon.obj \
+       $(OBJS)\monodll_generic_textmeasure.obj \
+       $(OBJS)\monodll_generic_timer.obj \
+       $(OBJS)\monodll_x11_app.obj \
+       $(OBJS)\monodll_x11_bitmap.obj \
+       $(OBJS)\monodll_x11_brush.obj \
+       $(OBJS)\monodll_x11_clipbrd.obj \
+       $(OBJS)\monodll_x11_colour.obj \
+       $(OBJS)\monodll_x11_cursor.obj \
+       $(OBJS)\monodll_x11_data.obj \
+       $(OBJS)\monodll_x11_dataobj.obj \
+       $(OBJS)\monodll_x11_dc.obj \
+       $(OBJS)\monodll_x11_dcclient.obj \
+       $(OBJS)\monodll_x11_dcmemory.obj \
+       $(OBJS)\monodll_x11_dcscreen.obj \
+       $(OBJS)\monodll_x11_evtloop.obj \
+       $(OBJS)\monodll_x11_font.obj \
+       $(OBJS)\monodll_x11_minifram.obj \
+       $(OBJS)\monodll_nanox.obj \
+       $(OBJS)\monodll_x11_palette.obj \
+       $(OBJS)\monodll_x11_pen.obj \
+       $(OBJS)\monodll_x11_popupwin.obj \
+       $(OBJS)\monodll_x11_region.obj \
+       $(OBJS)\monodll_reparent.obj \
+       $(OBJS)\monodll_x11_settings.obj \
+       $(OBJS)\monodll_x11_toplevel.obj \
+       $(OBJS)\monodll_x11_utils.obj \
+       $(OBJS)\monodll_utilsx.obj \
+       $(OBJS)\monodll_x11_window.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_src_cocoa_taskbar.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_hidjoystick.obj
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_10 = 
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_unix_joystick.obj \
+       $(OBJS)\monodll_unix_sound.obj \
+       $(OBJS)\monodll_taskbarx11.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_gtk1_eggtrayicon.obj \
+       $(OBJS)\monodll_gtk1_taskbar.obj
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_msw_joystick.obj \
+       $(OBJS)\monodll_msw_sound.obj \
+       $(OBJS)\monodll_gtk_notifmsg.obj \
+       $(OBJS)\monodll_gtk_taskbar.obj \
+       $(OBJS)\monodll_gtk_eggtrayicon.obj \
+       $(OBJS)\monodll_hildon_notifmsg.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_msw_joystick.obj \
+       $(OBJS)\monodll_msw_sound.obj \
+       $(OBJS)\monodll_gtk_notifmsg.obj \
+       $(OBJS)\monodll_gtk_taskbar.obj
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
+!if "$(TOOLKIT)" == "MOTIF"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_unix_joystick.obj \
+       $(OBJS)\monodll_unix_sound.obj \
+       $(OBJS)\monodll_taskbarx11.obj \
+       $(OBJS)\monodll_animateg.obj
 !endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_msw_aboutdlg.obj \
+       $(OBJS)\monodll_msw_notifmsg.obj \
+       $(OBJS)\monodll_richtooltip.obj \
+       $(OBJS)\monodll_msw_sound.obj \
+       $(OBJS)\monodll_msw_taskbar.obj \
+       $(OBJS)\monodll_msw_joystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_carbon_aboutdlg.obj \
+       $(OBJS)\monodll_carbon_drawer.obj \
+       $(OBJS)\monodll_dataview_osx.obj \
+       $(OBJS)\monodll_carbon_dataview.obj \
+       $(OBJS)\monodll_sound_osx.obj \
+       $(OBJS)\monodll_carbon_sound.obj \
+       $(OBJS)\monodll_carbon_taskbar.obj \
+       $(OBJS)\monodll_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_datetimectrl_osx.obj \
+       $(OBJS)\monodll_datectrl_osx.obj \
+       $(OBJS)\monodll_sound_osx.obj \
+       $(OBJS)\monodll_timectrl_osx.obj \
+       $(OBJS)\monodll_carbon_sound.obj \
+       $(OBJS)\monodll_core_sound.obj \
+       $(OBJS)\monodll_cocoa_aboutdlg.obj \
+       $(OBJS)\monodll_dataview_osx.obj \
+       $(OBJS)\monodll_cocoa_dataview.obj \
+       $(OBJS)\monodll_cocoa_datetimectrl.obj \
+       $(OBJS)\monodll_osx_cocoa_taskbar.obj \
+       $(OBJS)\monodll_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_sound_osx.obj \
+       $(OBJS)\monodll_core_sound.obj
 !endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_61 = /d wxDEBUG_LEVEL=0
+!if "$(TOOLKIT)" == "PM"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_os2_joystick.obj \
+       $(OBJS)\monodll_os2_sound.obj
 !endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_msw_aboutdlg.obj \
+       $(OBJS)\monodll_msw_notifmsg.obj \
+       $(OBJS)\monodll_richtooltip.obj \
+       $(OBJS)\monodll_msw_sound.obj \
+       $(OBJS)\monodll_msw_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____ADVANCED_PLATFORM_SRC_FILENAMES =  \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_unix_joystick.obj \
+       $(OBJS)\monodll_unix_sound.obj \
+       $(OBJS)\monodll_taskbarx11.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_hid.obj \
+       $(OBJS)\monolib_utilsexc_cf.obj
+!endif
+!if "$(TOOLKIT)" == "DFB"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_fontmgrcmn.obj \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_colour.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_mask.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj \
+       $(OBJS)\monolib_dfb_app.obj \
+       $(OBJS)\monolib_dfb_bitmap.obj \
+       $(OBJS)\monolib_dfb_brush.obj \
+       $(OBJS)\monolib_dfb_cursor.obj \
+       $(OBJS)\monolib_dfb_dc.obj \
+       $(OBJS)\monolib_dfb_dcclient.obj \
+       $(OBJS)\monolib_dfb_dcmemory.obj \
+       $(OBJS)\monolib_dfb_dcscreen.obj \
+       $(OBJS)\monolib_dfb_evtloop.obj \
+       $(OBJS)\monolib_dfb_font.obj \
+       $(OBJS)\monolib_dfb_fontenum.obj \
+       $(OBJS)\monolib_fontmgr.obj \
+       $(OBJS)\monolib_dfb_nonownedwnd.obj \
+       $(OBJS)\monolib_overlay.obj \
+       $(OBJS)\monolib_dfb_pen.obj \
+       $(OBJS)\monolib_dfb_region.obj \
+       $(OBJS)\monolib_dfb_settings.obj \
+       $(OBJS)\monolib_dfb_toplevel.obj \
+       $(OBJS)\monolib_dfb_utils.obj \
+       $(OBJS)\monolib_dfb_window.obj \
+       $(OBJS)\monolib_wrapdfb.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_unix_dialup.obj \
+       $(OBJS)\monolib_displayx11.obj \
+       $(OBJS)\monolib_unix_fontenum.obj \
+       $(OBJS)\monolib_unix_fontutil.obj \
+       $(OBJS)\monolib_uiactionx11.obj \
+       $(OBJS)\monolib_utilsx11.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_paletteg.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj \
+       $(OBJS)\monolib_gtk1_app.obj \
+       $(OBJS)\monolib_gtk1_bitmap.obj \
+       $(OBJS)\monolib_gtk1_brush.obj \
+       $(OBJS)\monolib_gtk1_clipbrd.obj \
+       $(OBJS)\monolib_gtk1_colour.obj \
+       $(OBJS)\monolib_gtk1_cursor.obj \
+       $(OBJS)\monolib_gtk1_data.obj \
+       $(OBJS)\monolib_gtk1_dataobj.obj \
+       $(OBJS)\monolib_gtk1_dc.obj \
+       $(OBJS)\monolib_gtk1_dcclient.obj \
+       $(OBJS)\monolib_gtk1_dcmemory.obj \
+       $(OBJS)\monolib_gtk1_dcscreen.obj \
+       $(OBJS)\monolib_gtk1_dnd.obj \
+       $(OBJS)\monolib_gtk1_evtloop.obj \
+       $(OBJS)\monolib_gtk1_font.obj \
+       $(OBJS)\monolib_gtk1_sockgtk.obj \
+       $(OBJS)\monolib_gtk1_main.obj \
+       $(OBJS)\monolib_gtk1_minifram.obj \
+       $(OBJS)\monolib_gtk1_pen.obj \
+       $(OBJS)\monolib_gtk1_popupwin.obj \
+       $(OBJS)\monolib_gtk1_region.obj \
+       $(OBJS)\monolib_gtk1_renderer.obj \
+       $(OBJS)\monolib_gtk1_settings.obj \
+       $(OBJS)\monolib_gtk1_timer.obj \
+       $(OBJS)\monolib_gtk1_tooltip.obj \
+       $(OBJS)\monolib_gtk1_toplevel.obj \
+       $(OBJS)\monolib_gtk1_utilsgtk.obj \
+       $(OBJS)\monolib_gtk1_win_gtk.obj \
+       $(OBJS)\monolib_gtk1_window.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_safearray.obj \
+       $(OBJS)\monolib_uuid.obj \
+       $(OBJS)\monolib_msw_dialup.obj \
+       $(OBJS)\monolib_dib.obj \
+       $(OBJS)\monolib_msw_display.obj \
+       $(OBJS)\monolib_utilswin.obj \
+       $(OBJS)\monolib_unix_fontenum.obj \
+       $(OBJS)\monolib_unix_fontutil.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_paletteg.obj \
+       $(OBJS)\monolib_gtk_app.obj \
+       $(OBJS)\monolib_assertdlg_gtk.obj \
+       $(OBJS)\monolib_gtk_bitmap.obj \
+       $(OBJS)\monolib_gtk_brush.obj \
+       $(OBJS)\monolib_gtk_clipbrd.obj \
+       $(OBJS)\monolib_gtk_colour.obj \
+       $(OBJS)\monolib_gtk_cursor.obj \
+       $(OBJS)\monolib_gtk_dataobj.obj \
+       $(OBJS)\monolib_gtk_dc.obj \
+       $(OBJS)\monolib_gtk_dnd.obj \
+       $(OBJS)\monolib_gtk_evtloop.obj \
+       $(OBJS)\monolib_filectrl.obj \
+       $(OBJS)\monolib_filehistory.obj \
+       $(OBJS)\monolib_gtk_font.obj \
+       $(OBJS)\monolib_gtk_sockgtk.obj \
+       $(OBJS)\monolib_gtk_minifram.obj \
+       $(OBJS)\monolib_gtk_nonownedwnd.obj \
+       $(OBJS)\monolib_gtk_pen.obj \
+       $(OBJS)\monolib_gtk_popupwin.obj \
+       $(OBJS)\monolib_private.obj \
+       $(OBJS)\monolib_gtk_region.obj \
+       $(OBJS)\monolib_gtk_renderer.obj \
+       $(OBJS)\monolib_gtk_settings.obj \
+       $(OBJS)\monolib_gtk_textmeasure.obj \
+       $(OBJS)\monolib_gtk_timer.obj \
+       $(OBJS)\monolib_gtk_tooltip.obj \
+       $(OBJS)\monolib_gtk_toplevel.obj \
+       $(OBJS)\monolib_gtk_utilsgtk.obj \
+       $(OBJS)\monolib_gtk_win_gtk.obj \
+       $(OBJS)\monolib_gtk_window.obj \
+       $(OBJS)\monolib_gtk_dcclient.obj \
+       $(OBJS)\monolib_gtk_dcmemory.obj \
+       $(OBJS)\monolib_gtk_dcscreen.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_safearray.obj \
+       $(OBJS)\monolib_uuid.obj \
+       $(OBJS)\monolib_msw_dialup.obj \
+       $(OBJS)\monolib_dib.obj \
+       $(OBJS)\monolib_msw_display.obj \
+       $(OBJS)\monolib_utilswin.obj \
+       $(OBJS)\monolib_unix_fontenum.obj \
+       $(OBJS)\monolib_unix_fontutil.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_paletteg.obj \
+       $(OBJS)\monolib_gtk_app.obj \
+       $(OBJS)\monolib_assertdlg_gtk.obj \
+       $(OBJS)\monolib_gtk_bitmap.obj \
+       $(OBJS)\monolib_gtk_brush.obj \
+       $(OBJS)\monolib_gtk_clipbrd.obj \
+       $(OBJS)\monolib_gtk_colour.obj \
+       $(OBJS)\monolib_gtk_cursor.obj \
+       $(OBJS)\monolib_gtk_dataobj.obj \
+       $(OBJS)\monolib_gtk_dc.obj \
+       $(OBJS)\monolib_gtk_dnd.obj \
+       $(OBJS)\monolib_gtk_evtloop.obj \
+       $(OBJS)\monolib_filectrl.obj \
+       $(OBJS)\monolib_filehistory.obj \
+       $(OBJS)\monolib_gtk_font.obj \
+       $(OBJS)\monolib_gtk_sockgtk.obj \
+       $(OBJS)\monolib_gtk_minifram.obj \
+       $(OBJS)\monolib_gtk_nonownedwnd.obj \
+       $(OBJS)\monolib_gtk_pen.obj \
+       $(OBJS)\monolib_gtk_popupwin.obj \
+       $(OBJS)\monolib_private.obj \
+       $(OBJS)\monolib_gtk_region.obj \
+       $(OBJS)\monolib_gtk_renderer.obj \
+       $(OBJS)\monolib_gtk_settings.obj \
+       $(OBJS)\monolib_gtk_textmeasure.obj \
+       $(OBJS)\monolib_gtk_timer.obj \
+       $(OBJS)\monolib_gtk_tooltip.obj \
+       $(OBJS)\monolib_gtk_toplevel.obj \
+       $(OBJS)\monolib_gtk_utilsgtk.obj \
+       $(OBJS)\monolib_gtk_win_gtk.obj \
+       $(OBJS)\monolib_gtk_window.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_unix_dialup.obj \
+       $(OBJS)\monolib_displayx11.obj \
+       $(OBJS)\monolib_unix_fontenum.obj \
+       $(OBJS)\monolib_unix_fontutil.obj \
+       $(OBJS)\monolib_uiactionx11.obj \
+       $(OBJS)\monolib_utilsx11.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj \
+       $(OBJS)\monolib_x11_bitmap.obj \
+       $(OBJS)\monolib_x11_brush.obj \
+       $(OBJS)\monolib_x11_palette.obj \
+       $(OBJS)\monolib_x11_pen.obj \
+       $(OBJS)\monolib_x11_region.obj \
+       $(OBJS)\monolib_utilsx.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_activex.obj \
+       $(OBJS)\monolib_msw_app.obj \
+       $(OBJS)\monolib_msw_bitmap.obj \
+       $(OBJS)\monolib_msw_brush.obj \
+       $(OBJS)\monolib_msw_caret.obj \
+       $(OBJS)\monolib_msw_clipbrd.obj \
+       $(OBJS)\monolib_msw_colour.obj \
+       $(OBJS)\monolib_msw_cursor.obj \
+       $(OBJS)\monolib_msw_data.obj \
+       $(OBJS)\monolib_msw_dc.obj \
+       $(OBJS)\monolib_msw_dcclient.obj \
+       $(OBJS)\monolib_msw_dcmemory.obj \
+       $(OBJS)\monolib_msw_dcprint.obj \
+       $(OBJS)\monolib_msw_dcscreen.obj \
+       $(OBJS)\monolib_msw_dialup.obj \
+       $(OBJS)\monolib_dib.obj \
+       $(OBJS)\monolib_msw_display.obj \
+       $(OBJS)\monolib_enhmeta.obj \
+       $(OBJS)\monolib_msw_font.obj \
+       $(OBJS)\monolib_msw_fontenum.obj \
+       $(OBJS)\monolib_msw_fontutil.obj \
+       $(OBJS)\monolib_msw_gdiimage.obj \
+       $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gdiplus.obj \
+       $(OBJS)\monolib_graphics.obj \
+       $(OBJS)\monolib_msw_icon.obj \
+       $(OBJS)\monolib_msw_imaglist.obj \
+       $(OBJS)\monolib_msw_minifram.obj \
+       $(OBJS)\monolib_msw_nonownedwnd.obj \
+       $(OBJS)\monolib_ole_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_safearray.obj \
+       $(OBJS)\monolib_msw_palette.obj \
+       $(OBJS)\monolib_msw_pen.obj \
+       $(OBJS)\monolib_msw_popupwin.obj \
+       $(OBJS)\monolib_msw_printdlg.obj \
+       $(OBJS)\monolib_printwin.obj \
+       $(OBJS)\monolib_msw_region.obj \
+       $(OBJS)\monolib_msw_renderer.obj \
+       $(OBJS)\monolib_msw_settings.obj \
+       $(OBJS)\monolib_msw_textmeasure.obj \
+       $(OBJS)\monolib_msw_tooltip.obj \
+       $(OBJS)\monolib_msw_toplevel.obj \
+       $(OBJS)\monolib_uiaction.obj \
+       $(OBJS)\monolib_msw_utilsgui.obj \
+       $(OBJS)\monolib_utilswin.obj \
+       $(OBJS)\monolib_uxtheme.obj \
+       $(OBJS)\monolib_msw_window.obj \
+       $(OBJS)\monolib_helpchm.obj \
+       $(OBJS)\monolib_msw_helpwin.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_uuid.obj
 !endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_61 = /d wxNO_RTTI
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____LOWLEVEL_SRC_FILENAMES_0 =
 !endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_61 = /d wxNO_THREADS
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____LOWLEVEL_SRC_FILENAMES_0 =
 !endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_62 = /d wxUSE_UNICODE=0
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____LOWLEVEL_SRC_FILENAMES_0 =
 !endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_62 = /d _UNICODE
+!if "$(TOOLKIT)" == "PM"
+____LOWLEVEL_SRC_FILENAMES_0 =
 !endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_61 = /d wxUSE_UNICODE_MSLU=1
+!if "$(TOOLKIT)" == "WINCE"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_activex.obj \
+       $(OBJS)\monolib_msw_app.obj \
+       $(OBJS)\monolib_msw_bitmap.obj \
+       $(OBJS)\monolib_msw_brush.obj \
+       $(OBJS)\monolib_msw_caret.obj \
+       $(OBJS)\monolib_msw_clipbrd.obj \
+       $(OBJS)\monolib_msw_colour.obj \
+       $(OBJS)\monolib_msw_cursor.obj \
+       $(OBJS)\monolib_msw_data.obj \
+       $(OBJS)\monolib_msw_dc.obj \
+       $(OBJS)\monolib_msw_dcclient.obj \
+       $(OBJS)\monolib_msw_dcmemory.obj \
+       $(OBJS)\monolib_msw_dcprint.obj \
+       $(OBJS)\monolib_msw_dcscreen.obj \
+       $(OBJS)\monolib_msw_dialup.obj \
+       $(OBJS)\monolib_dib.obj \
+       $(OBJS)\monolib_msw_display.obj \
+       $(OBJS)\monolib_enhmeta.obj \
+       $(OBJS)\monolib_msw_font.obj \
+       $(OBJS)\monolib_msw_fontenum.obj \
+       $(OBJS)\monolib_msw_fontutil.obj \
+       $(OBJS)\monolib_msw_gdiimage.obj \
+       $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gdiplus.obj \
+       $(OBJS)\monolib_graphics.obj \
+       $(OBJS)\monolib_msw_icon.obj \
+       $(OBJS)\monolib_msw_imaglist.obj \
+       $(OBJS)\monolib_msw_minifram.obj \
+       $(OBJS)\monolib_msw_nonownedwnd.obj \
+       $(OBJS)\monolib_ole_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_safearray.obj \
+       $(OBJS)\monolib_msw_palette.obj \
+       $(OBJS)\monolib_msw_pen.obj \
+       $(OBJS)\monolib_msw_popupwin.obj \
+       $(OBJS)\monolib_msw_printdlg.obj \
+       $(OBJS)\monolib_printwin.obj \
+       $(OBJS)\monolib_msw_region.obj \
+       $(OBJS)\monolib_msw_renderer.obj \
+       $(OBJS)\monolib_msw_settings.obj \
+       $(OBJS)\monolib_msw_textmeasure.obj \
+       $(OBJS)\monolib_msw_tooltip.obj \
+       $(OBJS)\monolib_msw_toplevel.obj \
+       $(OBJS)\monolib_uiaction.obj \
+       $(OBJS)\monolib_msw_utilsgui.obj \
+       $(OBJS)\monolib_utilswin.obj \
+       $(OBJS)\monolib_uxtheme.obj \
+       $(OBJS)\monolib_msw_window.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____LOWLEVEL_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_generic_caret.obj \
+       $(OBJS)\monolib_generic_imaglist.obj \
+       $(OBJS)\monolib_unix_dialup.obj \
+       $(OBJS)\monolib_displayx11.obj \
+       $(OBJS)\monolib_unix_fontenum.obj \
+       $(OBJS)\monolib_unix_fontutil.obj \
+       $(OBJS)\monolib_uiactionx11.obj \
+       $(OBJS)\monolib_utilsx11.obj \
+       $(OBJS)\monolib_generic_icon.obj \
+       $(OBJS)\monolib_generic_textmeasure.obj \
+       $(OBJS)\monolib_generic_timer.obj \
+       $(OBJS)\monolib_x11_app.obj \
+       $(OBJS)\monolib_x11_bitmap.obj \
+       $(OBJS)\monolib_x11_brush.obj \
+       $(OBJS)\monolib_x11_clipbrd.obj \
+       $(OBJS)\monolib_x11_colour.obj \
+       $(OBJS)\monolib_x11_cursor.obj \
+       $(OBJS)\monolib_x11_data.obj \
+       $(OBJS)\monolib_x11_dataobj.obj \
+       $(OBJS)\monolib_x11_dc.obj \
+       $(OBJS)\monolib_x11_dcclient.obj \
+       $(OBJS)\monolib_x11_dcmemory.obj \
+       $(OBJS)\monolib_x11_dcscreen.obj \
+       $(OBJS)\monolib_x11_evtloop.obj \
+       $(OBJS)\monolib_x11_font.obj \
+       $(OBJS)\monolib_x11_minifram.obj \
+       $(OBJS)\monolib_nanox.obj \
+       $(OBJS)\monolib_x11_palette.obj \
+       $(OBJS)\monolib_x11_pen.obj \
+       $(OBJS)\monolib_x11_popupwin.obj \
+       $(OBJS)\monolib_x11_region.obj \
+       $(OBJS)\monolib_reparent.obj \
+       $(OBJS)\monolib_x11_settings.obj \
+       $(OBJS)\monolib_x11_toplevel.obj \
+       $(OBJS)\monolib_x11_utils.obj \
+       $(OBJS)\monolib_utilsx.obj \
+       $(OBJS)\monolib_x11_window.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_src_cocoa_taskbar.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_hidjoystick.obj
 !endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_61 = /d wxUSE_GRAPHICS_CONTEXT=1
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_unix_joystick.obj \
+       $(OBJS)\monolib_unix_sound.obj \
+       $(OBJS)\monolib_taskbarx11.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_gtk1_eggtrayicon.obj \
+       $(OBJS)\monolib_gtk1_taskbar.obj
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_msw_joystick.obj \
+       $(OBJS)\monolib_msw_sound.obj \
+       $(OBJS)\monolib_gtk_notifmsg.obj \
+       $(OBJS)\monolib_gtk_taskbar.obj \
+       $(OBJS)\monolib_gtk_eggtrayicon.obj \
+       $(OBJS)\monolib_hildon_notifmsg.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_msw_joystick.obj \
+       $(OBJS)\monolib_msw_sound.obj \
+       $(OBJS)\monolib_gtk_notifmsg.obj \
+       $(OBJS)\monolib_gtk_taskbar.obj
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!if "$(TOOLKIT)" == "MOTIF"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_unix_joystick.obj \
+       $(OBJS)\monolib_unix_sound.obj \
+       $(OBJS)\monolib_taskbarx11.obj \
+       $(OBJS)\monolib_animateg.obj
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_msw_aboutdlg.obj \
+       $(OBJS)\monolib_msw_notifmsg.obj \
+       $(OBJS)\monolib_richtooltip.obj \
+       $(OBJS)\monolib_msw_sound.obj \
+       $(OBJS)\monolib_msw_taskbar.obj \
+       $(OBJS)\monolib_msw_joystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_carbon_aboutdlg.obj \
+       $(OBJS)\monolib_carbon_drawer.obj \
+       $(OBJS)\monolib_dataview_osx.obj \
+       $(OBJS)\monolib_carbon_dataview.obj \
+       $(OBJS)\monolib_sound_osx.obj \
+       $(OBJS)\monolib_carbon_sound.obj \
+       $(OBJS)\monolib_carbon_taskbar.obj \
+       $(OBJS)\monolib_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_datetimectrl_osx.obj \
+       $(OBJS)\monolib_datectrl_osx.obj \
+       $(OBJS)\monolib_sound_osx.obj \
+       $(OBJS)\monolib_timectrl_osx.obj \
+       $(OBJS)\monolib_carbon_sound.obj \
+       $(OBJS)\monolib_core_sound.obj \
+       $(OBJS)\monolib_cocoa_aboutdlg.obj \
+       $(OBJS)\monolib_dataview_osx.obj \
+       $(OBJS)\monolib_cocoa_dataview.obj \
+       $(OBJS)\monolib_cocoa_datetimectrl.obj \
+       $(OBJS)\monolib_osx_cocoa_taskbar.obj \
+       $(OBJS)\monolib_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_sound_osx.obj \
+       $(OBJS)\monolib_core_sound.obj
 !endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
+!if "$(TOOLKIT)" == "PM"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_os2_joystick.obj \
+       $(OBJS)\monolib_os2_sound.obj
 !endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_msw_aboutdlg.obj \
+       $(OBJS)\monolib_msw_notifmsg.obj \
+       $(OBJS)\monolib_richtooltip.obj \
+       $(OBJS)\monolib_msw_sound.obj \
+       $(OBJS)\monolib_msw_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____ADVANCED_PLATFORM_SRC_FILENAMES_0 =  \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_unix_joystick.obj \
+       $(OBJS)\monolib_unix_sound.obj \
+       $(OBJS)\monolib_taskbarx11.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_hid.obj \
+       $(OBJS)\coredll_utilsexc_cf.obj
+!endif
+!if "$(TOOLKIT)" == "DFB"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_fontmgrcmn.obj \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_colour.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_mask.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj \
+       $(OBJS)\coredll_dfb_app.obj \
+       $(OBJS)\coredll_dfb_bitmap.obj \
+       $(OBJS)\coredll_dfb_brush.obj \
+       $(OBJS)\coredll_dfb_cursor.obj \
+       $(OBJS)\coredll_dfb_dc.obj \
+       $(OBJS)\coredll_dfb_dcclient.obj \
+       $(OBJS)\coredll_dfb_dcmemory.obj \
+       $(OBJS)\coredll_dfb_dcscreen.obj \
+       $(OBJS)\coredll_dfb_evtloop.obj \
+       $(OBJS)\coredll_dfb_font.obj \
+       $(OBJS)\coredll_dfb_fontenum.obj \
+       $(OBJS)\coredll_fontmgr.obj \
+       $(OBJS)\coredll_dfb_nonownedwnd.obj \
+       $(OBJS)\coredll_overlay.obj \
+       $(OBJS)\coredll_dfb_pen.obj \
+       $(OBJS)\coredll_dfb_region.obj \
+       $(OBJS)\coredll_dfb_settings.obj \
+       $(OBJS)\coredll_dfb_toplevel.obj \
+       $(OBJS)\coredll_dfb_utils.obj \
+       $(OBJS)\coredll_dfb_window.obj \
+       $(OBJS)\coredll_wrapdfb.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_unix_dialup.obj \
+       $(OBJS)\coredll_displayx11.obj \
+       $(OBJS)\coredll_unix_fontenum.obj \
+       $(OBJS)\coredll_unix_fontutil.obj \
+       $(OBJS)\coredll_uiactionx11.obj \
+       $(OBJS)\coredll_utilsx11.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_paletteg.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj \
+       $(OBJS)\coredll_gtk1_app.obj \
+       $(OBJS)\coredll_gtk1_bitmap.obj \
+       $(OBJS)\coredll_gtk1_brush.obj \
+       $(OBJS)\coredll_gtk1_clipbrd.obj \
+       $(OBJS)\coredll_gtk1_colour.obj \
+       $(OBJS)\coredll_gtk1_cursor.obj \
+       $(OBJS)\coredll_gtk1_data.obj \
+       $(OBJS)\coredll_gtk1_dataobj.obj \
+       $(OBJS)\coredll_gtk1_dc.obj \
+       $(OBJS)\coredll_gtk1_dcclient.obj \
+       $(OBJS)\coredll_gtk1_dcmemory.obj \
+       $(OBJS)\coredll_gtk1_dcscreen.obj \
+       $(OBJS)\coredll_gtk1_dnd.obj \
+       $(OBJS)\coredll_gtk1_evtloop.obj \
+       $(OBJS)\coredll_gtk1_font.obj \
+       $(OBJS)\coredll_gtk1_sockgtk.obj \
+       $(OBJS)\coredll_gtk1_main.obj \
+       $(OBJS)\coredll_gtk1_minifram.obj \
+       $(OBJS)\coredll_gtk1_pen.obj \
+       $(OBJS)\coredll_gtk1_popupwin.obj \
+       $(OBJS)\coredll_gtk1_region.obj \
+       $(OBJS)\coredll_gtk1_renderer.obj \
+       $(OBJS)\coredll_gtk1_settings.obj \
+       $(OBJS)\coredll_gtk1_timer.obj \
+       $(OBJS)\coredll_gtk1_tooltip.obj \
+       $(OBJS)\coredll_gtk1_toplevel.obj \
+       $(OBJS)\coredll_gtk1_utilsgtk.obj \
+       $(OBJS)\coredll_gtk1_win_gtk.obj \
+       $(OBJS)\coredll_gtk1_window.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_safearray.obj \
+       $(OBJS)\coredll_uuid.obj \
+       $(OBJS)\coredll_msw_dialup.obj \
+       $(OBJS)\coredll_dib.obj \
+       $(OBJS)\coredll_msw_display.obj \
+       $(OBJS)\coredll_utilswin.obj \
+       $(OBJS)\coredll_unix_fontenum.obj \
+       $(OBJS)\coredll_unix_fontutil.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_paletteg.obj \
+       $(OBJS)\coredll_gtk_app.obj \
+       $(OBJS)\coredll_assertdlg_gtk.obj \
+       $(OBJS)\coredll_gtk_bitmap.obj \
+       $(OBJS)\coredll_gtk_brush.obj \
+       $(OBJS)\coredll_gtk_clipbrd.obj \
+       $(OBJS)\coredll_gtk_colour.obj \
+       $(OBJS)\coredll_gtk_cursor.obj \
+       $(OBJS)\coredll_gtk_dataobj.obj \
+       $(OBJS)\coredll_gtk_dc.obj \
+       $(OBJS)\coredll_gtk_dnd.obj \
+       $(OBJS)\coredll_gtk_evtloop.obj \
+       $(OBJS)\coredll_filectrl.obj \
+       $(OBJS)\coredll_filehistory.obj \
+       $(OBJS)\coredll_gtk_font.obj \
+       $(OBJS)\coredll_gtk_sockgtk.obj \
+       $(OBJS)\coredll_gtk_minifram.obj \
+       $(OBJS)\coredll_gtk_nonownedwnd.obj \
+       $(OBJS)\coredll_gtk_pen.obj \
+       $(OBJS)\coredll_gtk_popupwin.obj \
+       $(OBJS)\coredll_private.obj \
+       $(OBJS)\coredll_gtk_region.obj \
+       $(OBJS)\coredll_gtk_renderer.obj \
+       $(OBJS)\coredll_gtk_settings.obj \
+       $(OBJS)\coredll_gtk_textmeasure.obj \
+       $(OBJS)\coredll_gtk_timer.obj \
+       $(OBJS)\coredll_gtk_tooltip.obj \
+       $(OBJS)\coredll_gtk_toplevel.obj \
+       $(OBJS)\coredll_gtk_utilsgtk.obj \
+       $(OBJS)\coredll_gtk_win_gtk.obj \
+       $(OBJS)\coredll_gtk_window.obj \
+       $(OBJS)\coredll_gtk_dcclient.obj \
+       $(OBJS)\coredll_gtk_dcmemory.obj \
+       $(OBJS)\coredll_gtk_dcscreen.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_safearray.obj \
+       $(OBJS)\coredll_uuid.obj \
+       $(OBJS)\coredll_msw_dialup.obj \
+       $(OBJS)\coredll_dib.obj \
+       $(OBJS)\coredll_msw_display.obj \
+       $(OBJS)\coredll_utilswin.obj \
+       $(OBJS)\coredll_unix_fontenum.obj \
+       $(OBJS)\coredll_unix_fontutil.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_paletteg.obj \
+       $(OBJS)\coredll_gtk_app.obj \
+       $(OBJS)\coredll_assertdlg_gtk.obj \
+       $(OBJS)\coredll_gtk_bitmap.obj \
+       $(OBJS)\coredll_gtk_brush.obj \
+       $(OBJS)\coredll_gtk_clipbrd.obj \
+       $(OBJS)\coredll_gtk_colour.obj \
+       $(OBJS)\coredll_gtk_cursor.obj \
+       $(OBJS)\coredll_gtk_dataobj.obj \
+       $(OBJS)\coredll_gtk_dc.obj \
+       $(OBJS)\coredll_gtk_dnd.obj \
+       $(OBJS)\coredll_gtk_evtloop.obj \
+       $(OBJS)\coredll_filectrl.obj \
+       $(OBJS)\coredll_filehistory.obj \
+       $(OBJS)\coredll_gtk_font.obj \
+       $(OBJS)\coredll_gtk_sockgtk.obj \
+       $(OBJS)\coredll_gtk_minifram.obj \
+       $(OBJS)\coredll_gtk_nonownedwnd.obj \
+       $(OBJS)\coredll_gtk_pen.obj \
+       $(OBJS)\coredll_gtk_popupwin.obj \
+       $(OBJS)\coredll_private.obj \
+       $(OBJS)\coredll_gtk_region.obj \
+       $(OBJS)\coredll_gtk_renderer.obj \
+       $(OBJS)\coredll_gtk_settings.obj \
+       $(OBJS)\coredll_gtk_textmeasure.obj \
+       $(OBJS)\coredll_gtk_timer.obj \
+       $(OBJS)\coredll_gtk_tooltip.obj \
+       $(OBJS)\coredll_gtk_toplevel.obj \
+       $(OBJS)\coredll_gtk_utilsgtk.obj \
+       $(OBJS)\coredll_gtk_win_gtk.obj \
+       $(OBJS)\coredll_gtk_window.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_unix_dialup.obj \
+       $(OBJS)\coredll_displayx11.obj \
+       $(OBJS)\coredll_unix_fontenum.obj \
+       $(OBJS)\coredll_unix_fontutil.obj \
+       $(OBJS)\coredll_uiactionx11.obj \
+       $(OBJS)\coredll_utilsx11.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj \
+       $(OBJS)\coredll_x11_bitmap.obj \
+       $(OBJS)\coredll_x11_brush.obj \
+       $(OBJS)\coredll_x11_palette.obj \
+       $(OBJS)\coredll_x11_pen.obj \
+       $(OBJS)\coredll_x11_region.obj \
+       $(OBJS)\coredll_utilsx.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_activex.obj \
+       $(OBJS)\coredll_msw_app.obj \
+       $(OBJS)\coredll_msw_bitmap.obj \
+       $(OBJS)\coredll_msw_brush.obj \
+       $(OBJS)\coredll_msw_caret.obj \
+       $(OBJS)\coredll_msw_clipbrd.obj \
+       $(OBJS)\coredll_msw_colour.obj \
+       $(OBJS)\coredll_msw_cursor.obj \
+       $(OBJS)\coredll_msw_data.obj \
+       $(OBJS)\coredll_msw_dc.obj \
+       $(OBJS)\coredll_msw_dcclient.obj \
+       $(OBJS)\coredll_msw_dcmemory.obj \
+       $(OBJS)\coredll_msw_dcprint.obj \
+       $(OBJS)\coredll_msw_dcscreen.obj \
+       $(OBJS)\coredll_msw_dialup.obj \
+       $(OBJS)\coredll_dib.obj \
+       $(OBJS)\coredll_msw_display.obj \
+       $(OBJS)\coredll_enhmeta.obj \
+       $(OBJS)\coredll_msw_font.obj \
+       $(OBJS)\coredll_msw_fontenum.obj \
+       $(OBJS)\coredll_msw_fontutil.obj \
+       $(OBJS)\coredll_msw_gdiimage.obj \
+       $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gdiplus.obj \
+       $(OBJS)\coredll_graphics.obj \
+       $(OBJS)\coredll_msw_icon.obj \
+       $(OBJS)\coredll_msw_imaglist.obj \
+       $(OBJS)\coredll_msw_minifram.obj \
+       $(OBJS)\coredll_msw_nonownedwnd.obj \
+       $(OBJS)\coredll_ole_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_safearray.obj \
+       $(OBJS)\coredll_msw_palette.obj \
+       $(OBJS)\coredll_msw_pen.obj \
+       $(OBJS)\coredll_msw_popupwin.obj \
+       $(OBJS)\coredll_msw_printdlg.obj \
+       $(OBJS)\coredll_printwin.obj \
+       $(OBJS)\coredll_msw_region.obj \
+       $(OBJS)\coredll_msw_renderer.obj \
+       $(OBJS)\coredll_msw_settings.obj \
+       $(OBJS)\coredll_msw_textmeasure.obj \
+       $(OBJS)\coredll_msw_tooltip.obj \
+       $(OBJS)\coredll_msw_toplevel.obj \
+       $(OBJS)\coredll_uiaction.obj \
+       $(OBJS)\coredll_msw_utilsgui.obj \
+       $(OBJS)\coredll_utilswin.obj \
+       $(OBJS)\coredll_uxtheme.obj \
+       $(OBJS)\coredll_msw_window.obj \
+       $(OBJS)\coredll_helpchm.obj \
+       $(OBJS)\coredll_msw_helpwin.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_uuid.obj
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____LOWLEVEL_SRC_FILENAMES_1 =
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____LOWLEVEL_SRC_FILENAMES_1 =
 !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____LOWLEVEL_SRC_FILENAMES_1 =
 !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
+!if "$(TOOLKIT)" == "PM"
+____LOWLEVEL_SRC_FILENAMES_1 =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_activex.obj \
+       $(OBJS)\coredll_msw_app.obj \
+       $(OBJS)\coredll_msw_bitmap.obj \
+       $(OBJS)\coredll_msw_brush.obj \
+       $(OBJS)\coredll_msw_caret.obj \
+       $(OBJS)\coredll_msw_clipbrd.obj \
+       $(OBJS)\coredll_msw_colour.obj \
+       $(OBJS)\coredll_msw_cursor.obj \
+       $(OBJS)\coredll_msw_data.obj \
+       $(OBJS)\coredll_msw_dc.obj \
+       $(OBJS)\coredll_msw_dcclient.obj \
+       $(OBJS)\coredll_msw_dcmemory.obj \
+       $(OBJS)\coredll_msw_dcprint.obj \
+       $(OBJS)\coredll_msw_dcscreen.obj \
+       $(OBJS)\coredll_msw_dialup.obj \
+       $(OBJS)\coredll_dib.obj \
+       $(OBJS)\coredll_msw_display.obj \
+       $(OBJS)\coredll_enhmeta.obj \
+       $(OBJS)\coredll_msw_font.obj \
+       $(OBJS)\coredll_msw_fontenum.obj \
+       $(OBJS)\coredll_msw_fontutil.obj \
+       $(OBJS)\coredll_msw_gdiimage.obj \
+       $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gdiplus.obj \
+       $(OBJS)\coredll_graphics.obj \
+       $(OBJS)\coredll_msw_icon.obj \
+       $(OBJS)\coredll_msw_imaglist.obj \
+       $(OBJS)\coredll_msw_minifram.obj \
+       $(OBJS)\coredll_msw_nonownedwnd.obj \
+       $(OBJS)\coredll_ole_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_safearray.obj \
+       $(OBJS)\coredll_msw_palette.obj \
+       $(OBJS)\coredll_msw_pen.obj \
+       $(OBJS)\coredll_msw_popupwin.obj \
+       $(OBJS)\coredll_msw_printdlg.obj \
+       $(OBJS)\coredll_printwin.obj \
+       $(OBJS)\coredll_msw_region.obj \
+       $(OBJS)\coredll_msw_renderer.obj \
+       $(OBJS)\coredll_msw_settings.obj \
+       $(OBJS)\coredll_msw_textmeasure.obj \
+       $(OBJS)\coredll_msw_tooltip.obj \
+       $(OBJS)\coredll_msw_toplevel.obj \
+       $(OBJS)\coredll_uiaction.obj \
+       $(OBJS)\coredll_msw_utilsgui.obj \
+       $(OBJS)\coredll_utilswin.obj \
+       $(OBJS)\coredll_uxtheme.obj \
+       $(OBJS)\coredll_msw_window.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____LOWLEVEL_SRC_FILENAMES_1 =  \
+       $(OBJS)\coredll_generic_caret.obj \
+       $(OBJS)\coredll_generic_imaglist.obj \
+       $(OBJS)\coredll_unix_dialup.obj \
+       $(OBJS)\coredll_displayx11.obj \
+       $(OBJS)\coredll_unix_fontenum.obj \
+       $(OBJS)\coredll_unix_fontutil.obj \
+       $(OBJS)\coredll_uiactionx11.obj \
+       $(OBJS)\coredll_utilsx11.obj \
+       $(OBJS)\coredll_generic_icon.obj \
+       $(OBJS)\coredll_generic_textmeasure.obj \
+       $(OBJS)\coredll_generic_timer.obj \
+       $(OBJS)\coredll_x11_app.obj \
+       $(OBJS)\coredll_x11_bitmap.obj \
+       $(OBJS)\coredll_x11_brush.obj \
+       $(OBJS)\coredll_x11_clipbrd.obj \
+       $(OBJS)\coredll_x11_colour.obj \
+       $(OBJS)\coredll_x11_cursor.obj \
+       $(OBJS)\coredll_x11_data.obj \
+       $(OBJS)\coredll_x11_dataobj.obj \
+       $(OBJS)\coredll_x11_dc.obj \
+       $(OBJS)\coredll_x11_dcclient.obj \
+       $(OBJS)\coredll_x11_dcmemory.obj \
+       $(OBJS)\coredll_x11_dcscreen.obj \
+       $(OBJS)\coredll_x11_evtloop.obj \
+       $(OBJS)\coredll_x11_font.obj \
+       $(OBJS)\coredll_x11_minifram.obj \
+       $(OBJS)\coredll_nanox.obj \
+       $(OBJS)\coredll_x11_palette.obj \
+       $(OBJS)\coredll_x11_pen.obj \
+       $(OBJS)\coredll_x11_popupwin.obj \
+       $(OBJS)\coredll_x11_region.obj \
+       $(OBJS)\coredll_reparent.obj \
+       $(OBJS)\coredll_x11_settings.obj \
+       $(OBJS)\coredll_x11_toplevel.obj \
+       $(OBJS)\coredll_x11_utils.obj \
+       $(OBJS)\coredll_utilsx.obj \
+       $(OBJS)\coredll_x11_window.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_hid.obj \
+       $(OBJS)\corelib_utilsexc_cf.obj
+!endif
+!if "$(TOOLKIT)" == "DFB"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_fontmgrcmn.obj \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_colour.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_mask.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj \
+       $(OBJS)\corelib_dfb_app.obj \
+       $(OBJS)\corelib_dfb_bitmap.obj \
+       $(OBJS)\corelib_dfb_brush.obj \
+       $(OBJS)\corelib_dfb_cursor.obj \
+       $(OBJS)\corelib_dfb_dc.obj \
+       $(OBJS)\corelib_dfb_dcclient.obj \
+       $(OBJS)\corelib_dfb_dcmemory.obj \
+       $(OBJS)\corelib_dfb_dcscreen.obj \
+       $(OBJS)\corelib_dfb_evtloop.obj \
+       $(OBJS)\corelib_dfb_font.obj \
+       $(OBJS)\corelib_dfb_fontenum.obj \
+       $(OBJS)\corelib_fontmgr.obj \
+       $(OBJS)\corelib_dfb_nonownedwnd.obj \
+       $(OBJS)\corelib_overlay.obj \
+       $(OBJS)\corelib_dfb_pen.obj \
+       $(OBJS)\corelib_dfb_region.obj \
+       $(OBJS)\corelib_dfb_settings.obj \
+       $(OBJS)\corelib_dfb_toplevel.obj \
+       $(OBJS)\corelib_dfb_utils.obj \
+       $(OBJS)\corelib_dfb_window.obj \
+       $(OBJS)\corelib_wrapdfb.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_unix_dialup.obj \
+       $(OBJS)\corelib_displayx11.obj \
+       $(OBJS)\corelib_unix_fontenum.obj \
+       $(OBJS)\corelib_unix_fontutil.obj \
+       $(OBJS)\corelib_uiactionx11.obj \
+       $(OBJS)\corelib_utilsx11.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_paletteg.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj \
+       $(OBJS)\corelib_gtk1_app.obj \
+       $(OBJS)\corelib_gtk1_bitmap.obj \
+       $(OBJS)\corelib_gtk1_brush.obj \
+       $(OBJS)\corelib_gtk1_clipbrd.obj \
+       $(OBJS)\corelib_gtk1_colour.obj \
+       $(OBJS)\corelib_gtk1_cursor.obj \
+       $(OBJS)\corelib_gtk1_data.obj \
+       $(OBJS)\corelib_gtk1_dataobj.obj \
+       $(OBJS)\corelib_gtk1_dc.obj \
+       $(OBJS)\corelib_gtk1_dcclient.obj \
+       $(OBJS)\corelib_gtk1_dcmemory.obj \
+       $(OBJS)\corelib_gtk1_dcscreen.obj \
+       $(OBJS)\corelib_gtk1_dnd.obj \
+       $(OBJS)\corelib_gtk1_evtloop.obj \
+       $(OBJS)\corelib_gtk1_font.obj \
+       $(OBJS)\corelib_gtk1_sockgtk.obj \
+       $(OBJS)\corelib_gtk1_main.obj \
+       $(OBJS)\corelib_gtk1_minifram.obj \
+       $(OBJS)\corelib_gtk1_pen.obj \
+       $(OBJS)\corelib_gtk1_popupwin.obj \
+       $(OBJS)\corelib_gtk1_region.obj \
+       $(OBJS)\corelib_gtk1_renderer.obj \
+       $(OBJS)\corelib_gtk1_settings.obj \
+       $(OBJS)\corelib_gtk1_timer.obj \
+       $(OBJS)\corelib_gtk1_tooltip.obj \
+       $(OBJS)\corelib_gtk1_toplevel.obj \
+       $(OBJS)\corelib_gtk1_utilsgtk.obj \
+       $(OBJS)\corelib_gtk1_win_gtk.obj \
+       $(OBJS)\corelib_gtk1_window.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_safearray.obj \
+       $(OBJS)\corelib_uuid.obj \
+       $(OBJS)\corelib_msw_dialup.obj \
+       $(OBJS)\corelib_dib.obj \
+       $(OBJS)\corelib_msw_display.obj \
+       $(OBJS)\corelib_utilswin.obj \
+       $(OBJS)\corelib_unix_fontenum.obj \
+       $(OBJS)\corelib_unix_fontutil.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_paletteg.obj \
+       $(OBJS)\corelib_gtk_app.obj \
+       $(OBJS)\corelib_assertdlg_gtk.obj \
+       $(OBJS)\corelib_gtk_bitmap.obj \
+       $(OBJS)\corelib_gtk_brush.obj \
+       $(OBJS)\corelib_gtk_clipbrd.obj \
+       $(OBJS)\corelib_gtk_colour.obj \
+       $(OBJS)\corelib_gtk_cursor.obj \
+       $(OBJS)\corelib_gtk_dataobj.obj \
+       $(OBJS)\corelib_gtk_dc.obj \
+       $(OBJS)\corelib_gtk_dnd.obj \
+       $(OBJS)\corelib_gtk_evtloop.obj \
+       $(OBJS)\corelib_filectrl.obj \
+       $(OBJS)\corelib_filehistory.obj \
+       $(OBJS)\corelib_gtk_font.obj \
+       $(OBJS)\corelib_gtk_sockgtk.obj \
+       $(OBJS)\corelib_gtk_minifram.obj \
+       $(OBJS)\corelib_gtk_nonownedwnd.obj \
+       $(OBJS)\corelib_gtk_pen.obj \
+       $(OBJS)\corelib_gtk_popupwin.obj \
+       $(OBJS)\corelib_private.obj \
+       $(OBJS)\corelib_gtk_region.obj \
+       $(OBJS)\corelib_gtk_renderer.obj \
+       $(OBJS)\corelib_gtk_settings.obj \
+       $(OBJS)\corelib_gtk_textmeasure.obj \
+       $(OBJS)\corelib_gtk_timer.obj \
+       $(OBJS)\corelib_gtk_tooltip.obj \
+       $(OBJS)\corelib_gtk_toplevel.obj \
+       $(OBJS)\corelib_gtk_utilsgtk.obj \
+       $(OBJS)\corelib_gtk_win_gtk.obj \
+       $(OBJS)\corelib_gtk_window.obj \
+       $(OBJS)\corelib_gtk_dcclient.obj \
+       $(OBJS)\corelib_gtk_dcmemory.obj \
+       $(OBJS)\corelib_gtk_dcscreen.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_safearray.obj \
+       $(OBJS)\corelib_uuid.obj \
+       $(OBJS)\corelib_msw_dialup.obj \
+       $(OBJS)\corelib_dib.obj \
+       $(OBJS)\corelib_msw_display.obj \
+       $(OBJS)\corelib_utilswin.obj \
+       $(OBJS)\corelib_unix_fontenum.obj \
+       $(OBJS)\corelib_unix_fontutil.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_paletteg.obj \
+       $(OBJS)\corelib_gtk_app.obj \
+       $(OBJS)\corelib_assertdlg_gtk.obj \
+       $(OBJS)\corelib_gtk_bitmap.obj \
+       $(OBJS)\corelib_gtk_brush.obj \
+       $(OBJS)\corelib_gtk_clipbrd.obj \
+       $(OBJS)\corelib_gtk_colour.obj \
+       $(OBJS)\corelib_gtk_cursor.obj \
+       $(OBJS)\corelib_gtk_dataobj.obj \
+       $(OBJS)\corelib_gtk_dc.obj \
+       $(OBJS)\corelib_gtk_dnd.obj \
+       $(OBJS)\corelib_gtk_evtloop.obj \
+       $(OBJS)\corelib_filectrl.obj \
+       $(OBJS)\corelib_filehistory.obj \
+       $(OBJS)\corelib_gtk_font.obj \
+       $(OBJS)\corelib_gtk_sockgtk.obj \
+       $(OBJS)\corelib_gtk_minifram.obj \
+       $(OBJS)\corelib_gtk_nonownedwnd.obj \
+       $(OBJS)\corelib_gtk_pen.obj \
+       $(OBJS)\corelib_gtk_popupwin.obj \
+       $(OBJS)\corelib_private.obj \
+       $(OBJS)\corelib_gtk_region.obj \
+       $(OBJS)\corelib_gtk_renderer.obj \
+       $(OBJS)\corelib_gtk_settings.obj \
+       $(OBJS)\corelib_gtk_textmeasure.obj \
+       $(OBJS)\corelib_gtk_timer.obj \
+       $(OBJS)\corelib_gtk_tooltip.obj \
+       $(OBJS)\corelib_gtk_toplevel.obj \
+       $(OBJS)\corelib_gtk_utilsgtk.obj \
+       $(OBJS)\corelib_gtk_win_gtk.obj \
+       $(OBJS)\corelib_gtk_window.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_unix_dialup.obj \
+       $(OBJS)\corelib_displayx11.obj \
+       $(OBJS)\corelib_unix_fontenum.obj \
+       $(OBJS)\corelib_unix_fontutil.obj \
+       $(OBJS)\corelib_uiactionx11.obj \
+       $(OBJS)\corelib_utilsx11.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj \
+       $(OBJS)\corelib_x11_bitmap.obj \
+       $(OBJS)\corelib_x11_brush.obj \
+       $(OBJS)\corelib_x11_palette.obj \
+       $(OBJS)\corelib_x11_pen.obj \
+       $(OBJS)\corelib_x11_region.obj \
+       $(OBJS)\corelib_utilsx.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_activex.obj \
+       $(OBJS)\corelib_msw_app.obj \
+       $(OBJS)\corelib_msw_bitmap.obj \
+       $(OBJS)\corelib_msw_brush.obj \
+       $(OBJS)\corelib_msw_caret.obj \
+       $(OBJS)\corelib_msw_clipbrd.obj \
+       $(OBJS)\corelib_msw_colour.obj \
+       $(OBJS)\corelib_msw_cursor.obj \
+       $(OBJS)\corelib_msw_data.obj \
+       $(OBJS)\corelib_msw_dc.obj \
+       $(OBJS)\corelib_msw_dcclient.obj \
+       $(OBJS)\corelib_msw_dcmemory.obj \
+       $(OBJS)\corelib_msw_dcprint.obj \
+       $(OBJS)\corelib_msw_dcscreen.obj \
+       $(OBJS)\corelib_msw_dialup.obj \
+       $(OBJS)\corelib_dib.obj \
+       $(OBJS)\corelib_msw_display.obj \
+       $(OBJS)\corelib_enhmeta.obj \
+       $(OBJS)\corelib_msw_font.obj \
+       $(OBJS)\corelib_msw_fontenum.obj \
+       $(OBJS)\corelib_msw_fontutil.obj \
+       $(OBJS)\corelib_msw_gdiimage.obj \
+       $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gdiplus.obj \
+       $(OBJS)\corelib_graphics.obj \
+       $(OBJS)\corelib_msw_icon.obj \
+       $(OBJS)\corelib_msw_imaglist.obj \
+       $(OBJS)\corelib_msw_minifram.obj \
+       $(OBJS)\corelib_msw_nonownedwnd.obj \
+       $(OBJS)\corelib_ole_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_safearray.obj \
+       $(OBJS)\corelib_msw_palette.obj \
+       $(OBJS)\corelib_msw_pen.obj \
+       $(OBJS)\corelib_msw_popupwin.obj \
+       $(OBJS)\corelib_msw_printdlg.obj \
+       $(OBJS)\corelib_printwin.obj \
+       $(OBJS)\corelib_msw_region.obj \
+       $(OBJS)\corelib_msw_renderer.obj \
+       $(OBJS)\corelib_msw_settings.obj \
+       $(OBJS)\corelib_msw_textmeasure.obj \
+       $(OBJS)\corelib_msw_tooltip.obj \
+       $(OBJS)\corelib_msw_toplevel.obj \
+       $(OBJS)\corelib_uiaction.obj \
+       $(OBJS)\corelib_msw_utilsgui.obj \
+       $(OBJS)\corelib_utilswin.obj \
+       $(OBJS)\corelib_uxtheme.obj \
+       $(OBJS)\corelib_msw_window.obj \
+       $(OBJS)\corelib_helpchm.obj \
+       $(OBJS)\corelib_msw_helpwin.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_uuid.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____LOWLEVEL_SRC_FILENAMES_2 =
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____LOWLEVEL_SRC_FILENAMES_2 =
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____LOWLEVEL_SRC_FILENAMES_2 =
+!endif
+!if "$(TOOLKIT)" == "PM"
+____LOWLEVEL_SRC_FILENAMES_2 =
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_activex.obj \
+       $(OBJS)\corelib_msw_app.obj \
+       $(OBJS)\corelib_msw_bitmap.obj \
+       $(OBJS)\corelib_msw_brush.obj \
+       $(OBJS)\corelib_msw_caret.obj \
+       $(OBJS)\corelib_msw_clipbrd.obj \
+       $(OBJS)\corelib_msw_colour.obj \
+       $(OBJS)\corelib_msw_cursor.obj \
+       $(OBJS)\corelib_msw_data.obj \
+       $(OBJS)\corelib_msw_dc.obj \
+       $(OBJS)\corelib_msw_dcclient.obj \
+       $(OBJS)\corelib_msw_dcmemory.obj \
+       $(OBJS)\corelib_msw_dcprint.obj \
+       $(OBJS)\corelib_msw_dcscreen.obj \
+       $(OBJS)\corelib_msw_dialup.obj \
+       $(OBJS)\corelib_dib.obj \
+       $(OBJS)\corelib_msw_display.obj \
+       $(OBJS)\corelib_enhmeta.obj \
+       $(OBJS)\corelib_msw_font.obj \
+       $(OBJS)\corelib_msw_fontenum.obj \
+       $(OBJS)\corelib_msw_fontutil.obj \
+       $(OBJS)\corelib_msw_gdiimage.obj \
+       $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gdiplus.obj \
+       $(OBJS)\corelib_graphics.obj \
+       $(OBJS)\corelib_msw_icon.obj \
+       $(OBJS)\corelib_msw_imaglist.obj \
+       $(OBJS)\corelib_msw_minifram.obj \
+       $(OBJS)\corelib_msw_nonownedwnd.obj \
+       $(OBJS)\corelib_ole_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_safearray.obj \
+       $(OBJS)\corelib_msw_palette.obj \
+       $(OBJS)\corelib_msw_pen.obj \
+       $(OBJS)\corelib_msw_popupwin.obj \
+       $(OBJS)\corelib_msw_printdlg.obj \
+       $(OBJS)\corelib_printwin.obj \
+       $(OBJS)\corelib_msw_region.obj \
+       $(OBJS)\corelib_msw_renderer.obj \
+       $(OBJS)\corelib_msw_settings.obj \
+       $(OBJS)\corelib_msw_textmeasure.obj \
+       $(OBJS)\corelib_msw_tooltip.obj \
+       $(OBJS)\corelib_msw_toplevel.obj \
+       $(OBJS)\corelib_uiaction.obj \
+       $(OBJS)\corelib_msw_utilsgui.obj \
+       $(OBJS)\corelib_utilswin.obj \
+       $(OBJS)\corelib_uxtheme.obj \
+       $(OBJS)\corelib_msw_window.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____LOWLEVEL_SRC_FILENAMES_2 =  \
+       $(OBJS)\corelib_generic_caret.obj \
+       $(OBJS)\corelib_generic_imaglist.obj \
+       $(OBJS)\corelib_unix_dialup.obj \
+       $(OBJS)\corelib_displayx11.obj \
+       $(OBJS)\corelib_unix_fontenum.obj \
+       $(OBJS)\corelib_unix_fontutil.obj \
+       $(OBJS)\corelib_uiactionx11.obj \
+       $(OBJS)\corelib_utilsx11.obj \
+       $(OBJS)\corelib_generic_icon.obj \
+       $(OBJS)\corelib_generic_textmeasure.obj \
+       $(OBJS)\corelib_generic_timer.obj \
+       $(OBJS)\corelib_x11_app.obj \
+       $(OBJS)\corelib_x11_bitmap.obj \
+       $(OBJS)\corelib_x11_brush.obj \
+       $(OBJS)\corelib_x11_clipbrd.obj \
+       $(OBJS)\corelib_x11_colour.obj \
+       $(OBJS)\corelib_x11_cursor.obj \
+       $(OBJS)\corelib_x11_data.obj \
+       $(OBJS)\corelib_x11_dataobj.obj \
+       $(OBJS)\corelib_x11_dc.obj \
+       $(OBJS)\corelib_x11_dcclient.obj \
+       $(OBJS)\corelib_x11_dcmemory.obj \
+       $(OBJS)\corelib_x11_dcscreen.obj \
+       $(OBJS)\corelib_x11_evtloop.obj \
+       $(OBJS)\corelib_x11_font.obj \
+       $(OBJS)\corelib_x11_minifram.obj \
+       $(OBJS)\corelib_nanox.obj \
+       $(OBJS)\corelib_x11_palette.obj \
+       $(OBJS)\corelib_x11_pen.obj \
+       $(OBJS)\corelib_x11_popupwin.obj \
+       $(OBJS)\corelib_x11_region.obj \
+       $(OBJS)\corelib_reparent.obj \
+       $(OBJS)\corelib_x11_settings.obj \
+       $(OBJS)\corelib_x11_toplevel.obj \
+       $(OBJS)\corelib_x11_utils.obj \
+       $(OBJS)\corelib_utilsx.obj \
+       $(OBJS)\corelib_x11_window.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_src_cocoa_taskbar.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_unix_joystick.obj \
+       $(OBJS)\advdll_unix_sound.obj \
+       $(OBJS)\advdll_taskbarx11.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_gtk1_eggtrayicon.obj \
+       $(OBJS)\advdll_gtk1_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_msw_joystick.obj \
+       $(OBJS)\advdll_msw_sound.obj \
+       $(OBJS)\advdll_gtk_notifmsg.obj \
+       $(OBJS)\advdll_gtk_taskbar.obj \
+       $(OBJS)\advdll_gtk_eggtrayicon.obj \
+       $(OBJS)\advdll_hildon_notifmsg.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_msw_joystick.obj \
+       $(OBJS)\advdll_msw_sound.obj \
+       $(OBJS)\advdll_gtk_notifmsg.obj \
+       $(OBJS)\advdll_gtk_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_unix_joystick.obj \
+       $(OBJS)\advdll_unix_sound.obj \
+       $(OBJS)\advdll_taskbarx11.obj \
+       $(OBJS)\advdll_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_msw_aboutdlg.obj \
+       $(OBJS)\advdll_msw_notifmsg.obj \
+       $(OBJS)\advdll_richtooltip.obj \
+       $(OBJS)\advdll_msw_sound.obj \
+       $(OBJS)\advdll_msw_taskbar.obj \
+       $(OBJS)\advdll_msw_joystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_carbon_aboutdlg.obj \
+       $(OBJS)\advdll_drawer.obj \
+       $(OBJS)\advdll_dataview_osx.obj \
+       $(OBJS)\advdll_carbon_dataview.obj \
+       $(OBJS)\advdll_sound_osx.obj \
+       $(OBJS)\advdll_carbon_sound.obj \
+       $(OBJS)\advdll_carbon_taskbar.obj \
+       $(OBJS)\advdll_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_datetimectrl_osx.obj \
+       $(OBJS)\advdll_datectrl_osx.obj \
+       $(OBJS)\advdll_sound_osx.obj \
+       $(OBJS)\advdll_timectrl_osx.obj \
+       $(OBJS)\advdll_carbon_sound.obj \
+       $(OBJS)\advdll_core_sound.obj \
+       $(OBJS)\advdll_cocoa_aboutdlg.obj \
+       $(OBJS)\advdll_dataview_osx.obj \
+       $(OBJS)\advdll_cocoa_dataview.obj \
+       $(OBJS)\advdll_cocoa_datetimectrl.obj \
+       $(OBJS)\advdll_osx_cocoa_taskbar.obj \
+       $(OBJS)\advdll_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_sound_osx.obj \
+       $(OBJS)\advdll_core_sound.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_os2_joystick.obj \
+       $(OBJS)\advdll_os2_sound.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_msw_aboutdlg.obj \
+       $(OBJS)\advdll_msw_notifmsg.obj \
+       $(OBJS)\advdll_richtooltip.obj \
+       $(OBJS)\advdll_msw_sound.obj \
+       $(OBJS)\advdll_msw_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____ADVANCED_PLATFORM_SRC_FILENAMES_1 =  \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_unix_joystick.obj \
+       $(OBJS)\advdll_unix_sound.obj \
+       $(OBJS)\advdll_taskbarx11.obj
+!endif
+!if "$(TOOLKIT)" == "COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_src_cocoa_taskbar.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_unix_joystick.obj \
+       $(OBJS)\advlib_unix_sound.obj \
+       $(OBJS)\advlib_taskbarx11.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_gtk1_eggtrayicon.obj \
+       $(OBJS)\advlib_gtk1_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_msw_joystick.obj \
+       $(OBJS)\advlib_msw_sound.obj \
+       $(OBJS)\advlib_gtk_notifmsg.obj \
+       $(OBJS)\advlib_gtk_taskbar.obj \
+       $(OBJS)\advlib_gtk_eggtrayicon.obj \
+       $(OBJS)\advlib_hildon_notifmsg.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "3"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_msw_joystick.obj \
+       $(OBJS)\advlib_msw_sound.obj \
+       $(OBJS)\advlib_gtk_notifmsg.obj \
+       $(OBJS)\advlib_gtk_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "MOTIF"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_unix_joystick.obj \
+       $(OBJS)\advlib_unix_sound.obj \
+       $(OBJS)\advlib_taskbarx11.obj \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(TOOLKIT)" == "MSW"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_msw_aboutdlg.obj \
+       $(OBJS)\advlib_msw_notifmsg.obj \
+       $(OBJS)\advlib_richtooltip.obj \
+       $(OBJS)\advlib_msw_sound.obj \
+       $(OBJS)\advlib_msw_taskbar.obj \
+       $(OBJS)\advlib_msw_joystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_CARBON"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_carbon_aboutdlg.obj \
+       $(OBJS)\advlib_drawer.obj \
+       $(OBJS)\advlib_dataview_osx.obj \
+       $(OBJS)\advlib_carbon_dataview.obj \
+       $(OBJS)\advlib_sound_osx.obj \
+       $(OBJS)\advlib_carbon_sound.obj \
+       $(OBJS)\advlib_carbon_taskbar.obj \
+       $(OBJS)\advlib_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_COCOA"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_datetimectrl_osx.obj \
+       $(OBJS)\advlib_datectrl_osx.obj \
+       $(OBJS)\advlib_sound_osx.obj \
+       $(OBJS)\advlib_timectrl_osx.obj \
+       $(OBJS)\advlib_carbon_sound.obj \
+       $(OBJS)\advlib_core_sound.obj \
+       $(OBJS)\advlib_cocoa_aboutdlg.obj \
+       $(OBJS)\advlib_dataview_osx.obj \
+       $(OBJS)\advlib_cocoa_dataview.obj \
+       $(OBJS)\advlib_cocoa_datetimectrl.obj \
+       $(OBJS)\advlib_osx_cocoa_taskbar.obj \
+       $(OBJS)\advlib_hidjoystick.obj
+!endif
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_sound_osx.obj \
+       $(OBJS)\advlib_core_sound.obj
+!endif
+!if "$(TOOLKIT)" == "PM"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_os2_joystick.obj \
+       $(OBJS)\advlib_os2_sound.obj
+!endif
+!if "$(TOOLKIT)" == "WINCE"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_msw_aboutdlg.obj \
+       $(OBJS)\advlib_msw_notifmsg.obj \
+       $(OBJS)\advlib_richtooltip.obj \
+       $(OBJS)\advlib_msw_sound.obj \
+       $(OBJS)\advlib_msw_taskbar.obj
+!endif
+!if "$(TOOLKIT)" == "X11"
+____ADVANCED_PLATFORM_SRC_FILENAMES_2 =  \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_unix_joystick.obj \
+       $(OBJS)\advlib_unix_sound.obj \
+       $(OBJS)\advlib_taskbarx11.obj
+!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_LIBR = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_6 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_6 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_6 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_6 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_6 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_6 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_6 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_6 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_11 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_11 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_11 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_11 =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_67 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_66 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_65 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_65 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_65 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_65 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_65 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_67 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_67 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_65 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_4 = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 ____DEBUGRUNTIME = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
+____DEBUGRUNTIME =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
+____DEBUGRUNTIME =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME = /D_DEBUG
@@ -4906,10 +9989,10 @@ ____DEBUGRUNTIME = /D_DEBUG
 __DEBUGRUNTIME = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
+__DEBUGRUNTIME =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
+__DEBUGRUNTIME =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME = d
@@ -4927,13 +10010,13 @@ __THREADSFLAG = L
 __THREADSFLAG = T
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
+__RTTIFLAG =
 !endif
 !if "$(USE_RTTI)" == "1"
 __RTTIFLAG = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
+__EXCEPTIONSFLAG =
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG = /EHsc
@@ -4950,6 +10033,12 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !if "$(DEBUG_FLAG)" == "0"
 __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
 !endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
 !endif
@@ -4968,14 +10057,14 @@ __UNICODE_DEFINE_p = /D_UNICODE
 !if "$(MSLU)" == "1"
 __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
 !endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
 !endif
-!if "$(WXUNIV)" == "0"
-__SETUP_H_SUBDIR_FILENAMES = msw
+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
 !endif
-!if "$(WXUNIV)" == "1"
-__SETUP_H_SUBDIR_FILENAMES = univ
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
 !endif
 
 
@@ -4985,9 +10074,9 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
-clean: 
+clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -4998,91 +10087,96 @@ clean:
        -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)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk
-       -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb
        -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)_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$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk
-       -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb
        -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb
        -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb
        -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb
        -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$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb
        -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
        -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)"
 
-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_1)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 
 $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
        if exist $@ del $@
@@ -5135,9 +10229,9 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !endif
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
 
@@ -5150,14 +10244,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !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) $(__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_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_139)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_139)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
        if exist $@ del $@
        link /LIB /NOLOGO /OUT:$@ @<<
        $(BASELIB_OBJECTS)
@@ -5169,14 +10263,14 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(__DEBUGINFO_170)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_170)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
        if exist $@ del $@
        link /LIB /NOLOGO /OUT:$@ @<<
        $(NETLIB_OBJECTS)
@@ -5188,9 +10282,9 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5207,9 +10301,9 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5226,9 +10320,9 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5245,9 +10339,9 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !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) $(__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_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5263,10 +10357,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !endif
 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj  $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib: $(OBJS)\webviewlib_dummy.obj  $(WEBVIEWLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(WEBVIEWLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)
+!endif
+
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5283,14 +10396,14 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_387)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
        if exist $@ del $@
        link /LIB /NOLOGO /OUT:$@ @<<
        $(XMLLIB_OBJECTS)
@@ -5302,9 +10415,9 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_387)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5321,9 +10434,9 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5340,9 +10453,9 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5359,9 +10472,9 @@ 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_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5378,9 +10491,9 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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$(WXBASEPORT)$(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
 
@@ -5397,9 +10510,9 @@ 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_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WXBASEPORT)$(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
 
@@ -5416,9 +10529,9 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !endif
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
-       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_604)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 <<
 !endif
 
@@ -5434,12 +10547,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 !endif
 
-sub_samples: 
+sub_samples:
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd "$(MAKEDIR)"
 
-$(LIBDIRNAME): 
+$(LIBDIRNAME):
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(SETUPHDIR): $(LIBDIRNAME)
@@ -5448,11 +10561,11 @@ $(SETUPHDIR): $(LIBDIRNAME)
 $(SETUPHDIR)\wx: $(SETUPHDIR)
        if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
 
-..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: 
-       if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES_1)\setup.h:
+       if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES_1)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES_1)\setup.h
 
-$(SETUPHDIR)\wx\setup.h: 
-       if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
+$(SETUPHDIR)\wx\setup.h:
+       if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES_2)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
        if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
@@ -5463,11 +10576,13 @@ $(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)
-       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
        @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
+       @echo TOOLKIT=$(TOOLKIT) >>$(BUILD_CFG_FILE)
+       @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)
        @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
        @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
        @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
@@ -5477,14 +10592,22 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(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_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-       @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
        @echo COMPILER=vc >>$(BUILD_CFG_FILE)
+       @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
        @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@@ -5546,9 +10669,6 @@ $(OBJS)\wxpng_png.obj: ..\..\src\png\png.c
 $(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c
        $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngerror.c
 
-$(OBJS)\wxpng_pnggccrd.obj: ..\..\src\png\pnggccrd.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pnggccrd.c
-
 $(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c
        $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngget.c
 
@@ -5576,9 +10696,6 @@ $(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c
 $(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c
        $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngtrans.c
 
-$(OBJS)\wxpng_pngvcrd.obj: ..\..\src\png\pngvcrd.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngvcrd.c
-
 $(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c
        $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwio.c
 
@@ -5780,12 +10897,21 @@ $(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
 $(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_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c
+
 $(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_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c
+
 $(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_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c
+
 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c
 
@@ -5846,302 +10972,383 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
 $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
        $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c
 
-$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx
-       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx
+$(OBJS)\wxscintilla_LexA68k.obj: ..\..\src\stc\scintilla\lexers\LexA68k.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexA68k.cxx
 
-$(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_LexAbaqus.obj: ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAbaqus.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_LexAda.obj: ..\..\src\stc\scintilla\lexers\LexAda.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAda.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_LexAPDL.obj: ..\..\src\stc\scintilla\lexers\LexAPDL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAPDL.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_LexAsm.obj: ..\..\src\stc\scintilla\lexers\LexAsm.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsm.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_LexAsn1.obj: ..\..\src\stc\scintilla\lexers\LexAsn1.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsn1.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_LexASY.obj: ..\..\src\stc\scintilla\lexers\LexASY.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexASY.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_LexAU3.obj: ..\..\src\stc\scintilla\lexers\LexAU3.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAU3.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_LexAVE.obj: ..\..\src\stc\scintilla\lexers\LexAVE.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVE.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_LexAVS.obj: ..\..\src\stc\scintilla\lexers\LexAVS.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVS.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_LexBaan.obj: ..\..\src\stc\scintilla\lexers\LexBaan.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBaan.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_LexBash.obj: ..\..\src\stc\scintilla\lexers\LexBash.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBash.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_LexBasic.obj: ..\..\src\stc\scintilla\lexers\LexBasic.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBasic.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_LexBullant.obj: ..\..\src\stc\scintilla\lexers\LexBullant.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBullant.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_LexCaml.obj: ..\..\src\stc\scintilla\lexers\LexCaml.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCaml.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_LexCLW.obj: ..\..\src\stc\scintilla\lexers\LexCLW.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCLW.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_LexCmake.obj: ..\..\src\stc\scintilla\lexers\LexCmake.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCmake.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_LexCOBOL.obj: ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCOBOL.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_LexCoffeeScript.obj: ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCoffeeScript.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_LexConf.obj: ..\..\src\stc\scintilla\lexers\LexConf.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexConf.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_LexCPP.obj: ..\..\src\stc\scintilla\lexers\LexCPP.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCPP.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_LexCrontab.obj: ..\..\src\stc\scintilla\lexers\LexCrontab.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCrontab.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_LexCsound.obj: ..\..\src\stc\scintilla\lexers\LexCsound.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCsound.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_LexCSS.obj: ..\..\src\stc\scintilla\lexers\LexCSS.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCSS.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_LexD.obj: ..\..\src\stc\scintilla\lexers\LexD.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexD.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_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.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_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.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_LexErlang.obj: ..\..\src\stc\scintilla\lexers\LexErlang.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexErlang.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_LexEScript.obj: ..\..\src\stc\scintilla\lexers\LexEScript.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEScript.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_LexFlagship.obj: ..\..\src\stc\scintilla\lexers\LexFlagship.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFlagship.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_LexForth.obj: ..\..\src\stc\scintilla\lexers\LexForth.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexForth.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_LexFortran.obj: ..\..\src\stc\scintilla\lexers\LexFortran.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFortran.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_LexGAP.obj: ..\..\src\stc\scintilla\lexers\LexGAP.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGAP.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_LexGui4Cli.obj: ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGui4Cli.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_LexHaskell.obj: ..\..\src\stc\scintilla\lexers\LexHaskell.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHaskell.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_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHTML.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_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.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_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.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_LexLisp.obj: ..\..\src\stc\scintilla\lexers\LexLisp.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLisp.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_LexLout.obj: ..\..\src\stc\scintilla\lexers\LexLout.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLout.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_LexLua.obj: ..\..\src\stc\scintilla\lexers\LexLua.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLua.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_LexMagik.obj: ..\..\src\stc\scintilla\lexers\LexMagik.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMagik.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_LexMarkdown.obj: ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMarkdown.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_LexMatlab.obj: ..\..\src\stc\scintilla\lexers\LexMatlab.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMatlab.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_LexMetapost.obj: ..\..\src\stc\scintilla\lexers\LexMetapost.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMetapost.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_LexMMIXAL.obj: ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMMIXAL.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_LexModula.obj: ..\..\src\stc\scintilla\lexers\LexModula.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexModula.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_LexMPT.obj: ..\..\src\stc\scintilla\lexers\LexMPT.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMPT.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_LexMSSQL.obj: ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMSSQL.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_LexMySQL.obj: ..\..\src\stc\scintilla\lexers\LexMySQL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMySQL.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_LexNimrod.obj: ..\..\src\stc\scintilla\lexers\LexNimrod.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNimrod.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_LexNsis.obj: ..\..\src\stc\scintilla\lexers\LexNsis.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNsis.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_LexOpal.obj: ..\..\src\stc\scintilla\lexers\LexOpal.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOpal.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_LexOScript.obj: ..\..\src\stc\scintilla\lexers\LexOScript.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOScript.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_LexOthers.obj: ..\..\src\stc\scintilla\lexers\LexOthers.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOthers.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_LexPascal.obj: ..\..\src\stc\scintilla\lexers\LexPascal.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPascal.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\lexers\LexPB.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPB.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_LexPerl.obj: ..\..\src\stc\scintilla\lexers\LexPerl.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPerl.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_LexPLM.obj: ..\..\src\stc\scintilla\lexers\LexPLM.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexPOV.obj: ..\..\src\stc\scintilla\lexers\LexPOV.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexPowerPro.obj: ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerPro.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_LexPowerShell.obj: ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerShell.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_LexProgress.obj: ..\..\src\stc\scintilla\lexers\LexProgress.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexProgress.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_LexPS.obj: ..\..\src\stc\scintilla\lexers\LexPS.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPS.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_LexPython.obj: ..\..\src\stc\scintilla\lexers\LexPython.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexR.obj: ..\..\src\stc\scintilla\lexers\LexR.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexRebol.obj: ..\..\src\stc\scintilla\lexers\LexRebol.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexRuby.obj: ..\..\src\stc\scintilla\lexers\LexRuby.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexScriptol.obj: ..\..\src\stc\scintilla\lexers\LexScriptol.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexScriptol.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_LexSmalltalk.obj: ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexSML.obj: ..\..\src\stc\scintilla\lexers\LexSML.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSML.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_LexSorcus.obj: ..\..\src\stc\scintilla\lexers\LexSorcus.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSorcus.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_LexSpecman.obj: ..\..\src\stc\scintilla\lexers\LexSpecman.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexSpice.obj: ..\..\src\stc\scintilla\lexers\LexSpice.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\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_LexSQL.obj: ..\..\src\stc\scintilla\lexers\LexSQL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSQL.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_LexTACL.obj: ..\..\src\stc\scintilla\lexers\LexTACL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTACL.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_LexTADS3.obj: ..\..\src\stc\scintilla\lexers\LexTADS3.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTADS3.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_LexTAL.obj: ..\..\src\stc\scintilla\lexers\LexTAL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTAL.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_LexTCL.obj: ..\..\src\stc\scintilla\lexers\LexTCL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCL.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_LexTCMD.obj: ..\..\src\stc\scintilla\lexers\LexTCMD.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCMD.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_LexTeX.obj: ..\..\src\stc\scintilla\lexers\LexTeX.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTeX.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_LexTxt2tags.obj: ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTxt2tags.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_LexVB.obj: ..\..\src\stc\scintilla\lexers\LexVB.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVB.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_LexVerilog.obj: ..\..\src\stc\scintilla\lexers\LexVerilog.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVerilog.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_LexVHDL.obj: ..\..\src\stc\scintilla\lexers\LexVHDL.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVHDL.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_LexVisualProlog.obj: ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVisualProlog.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_LexYAML.obj: ..\..\src\stc\scintilla\lexers\LexYAML.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexYAML.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_Accessor.obj: ..\..\src\stc\scintilla\lexlib\Accessor.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\Accessor.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_CharacterSet.obj: ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\CharacterSet.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_LexerBase.obj: ..\..\src\stc\scintilla\lexlib\LexerBase.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerBase.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_LexerModule.obj: ..\..\src\stc\scintilla\lexlib\LexerModule.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerModule.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)\wxscintilla_LexerNoExceptions.obj: ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx
 
-$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\wxscintilla_LexerSimple.obj: ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx
 
-$(OBJS)\monodll_any.obj: ..\..\src\common\any.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp
+$(OBJS)\wxscintilla_PropSetSimple.obj: ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx
 
-$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
+$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\lexlib\StyleContext.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\StyleContext.cxx
 
-$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcall.cpp
+$(OBJS)\wxscintilla_WordList.obj: ..\..\src\stc\scintilla\lexlib\WordList.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\WordList.cxx
 
-$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcfind.cpp
+$(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_archive.obj: ..\..\src\common\archive.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\archive.cpp
+$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx
 
-$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arrstr.cpp
+$(OBJS)\wxscintilla_Catalogue.obj: ..\..\src\stc\scintilla\src\Catalogue.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Catalogue.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_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_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx
+
+$(OBJS)\wxscintilla_PerLine.obj: ..\..\src\stc\scintilla\src\PerLine.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PerLine.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_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_Selection.obj: ..\..\src\stc\scintilla\src\Selection.cxx
+       $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Selection.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_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_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_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp
+
+$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
+
+$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcall.cpp
+
+$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcfind.cpp
+
+$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
+       $(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
@@ -6239,6 +11446,9 @@ $(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 
+$(OBJS)\monodll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
+
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp
 
@@ -6260,6 +11470,9 @@ $(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp
 
+$(OBJS)\monodll_numformatter.obj: ..\..\src\common\numformatter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\numformatter.cpp
+
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp
 
@@ -6317,6 +11530,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
 
+$(OBJS)\monodll_common_time.obj: ..\..\src\common\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -6326,6 +11542,9 @@ $(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 
+$(OBJS)\monodll_translation.obj: ..\..\src\common\translation.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\translation.cpp
+
 $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
 
@@ -6389,6 +11608,9 @@ $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
 
+$(OBJS)\monodll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+
 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp
 
@@ -6413,18 +11635,21 @@ $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
 $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\thread.cpp
 
-$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
+$(OBJS)\monodll_msw_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_msw_utils.obj: ..\..\src\msw\utils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utils.cpp
 
-$(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
+$(OBJS)\monodll_msw_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
 $(OBJS)\monodll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
 
+$(OBJS)\monodll_wince_time.obj: ..\..\src\msw\wince\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\time.cpp
+
 $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp
 
@@ -6437,10 +11662,7 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
        $(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_msw_main.obj: ..\..\src\msw\main.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp
 
 $(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp
@@ -6449,6 +11671,14 @@ $(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp
 $(OBJS)\monodll_volume.obj: ..\..\src\msw\volume.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\volume.cpp
 
+$(OBJS)\monodll_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
+
+$(OBJS)\monodll_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
+
+$(OBJS)\monodll_osx_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
+
 $(OBJS)\monodll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
 
@@ -6485,8376 +11715,21781 @@ $(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 
-$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-
-$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+$(OBJS)\monodll_net.obj: ..\..\src\msw\wince\net.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\net.cpp
 
-$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+$(OBJS)\monodll_gprint.obj: ..\..\src\gtk\gnome\gprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\gnome\gprint.cpp
 
-$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+$(OBJS)\monodll_gtk1_bmpbuttn.obj: ..\..\src\gtk1\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\bmpbuttn.cpp
 
-$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
+$(OBJS)\monodll_gtk1_button.obj: ..\..\src\gtk1\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\button.cpp
 
-$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+$(OBJS)\monodll_gtk1_checkbox.obj: ..\..\src\gtk1\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\checkbox.cpp
 
-$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+$(OBJS)\monodll_gtk1_checklst.obj: ..\..\src\gtk1\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\checklst.cpp
 
-$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+$(OBJS)\monodll_gtk1_choice.obj: ..\..\src\gtk1\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\choice.cpp
 
-$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
+$(OBJS)\monodll_gtk1_combobox.obj: ..\..\src\gtk1\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\combobox.cpp
 
-$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+$(OBJS)\monodll_gtk1_control.obj: ..\..\src\gtk1\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\control.cpp
 
-$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
+$(OBJS)\monodll_gtk1_dialog.obj: ..\..\src\gtk1\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dialog.cpp
 
-$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+$(OBJS)\monodll_gtk1_filedlg.obj: ..\..\src\gtk1\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\filedlg.cpp
 
-$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+$(OBJS)\monodll_gtk1_fontdlg.obj: ..\..\src\gtk1\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\fontdlg.cpp
 
-$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+$(OBJS)\monodll_gtk1_frame.obj: ..\..\src\gtk1\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\frame.cpp
 
-$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+$(OBJS)\monodll_gtk1_gauge.obj: ..\..\src\gtk1\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\gauge.cpp
 
-$(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
+$(OBJS)\monodll_gtk1_listbox.obj: ..\..\src\gtk1\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\listbox.cpp
 
-$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+$(OBJS)\monodll_gtk1_mdi.obj: ..\..\src\gtk1\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\mdi.cpp
 
-$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+$(OBJS)\monodll_gtk1_menu.obj: ..\..\src\gtk1\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\menu.cpp
 
-$(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+$(OBJS)\monodll_gtk1_mnemonics.obj: ..\..\src\gtk1\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\mnemonics.cpp
 
-$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+$(OBJS)\monodll_gtk1_notebook.obj: ..\..\src\gtk1\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\notebook.cpp
 
-$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+$(OBJS)\monodll_gtk1_radiobox.obj: ..\..\src\gtk1\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\radiobox.cpp
 
-$(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
+$(OBJS)\monodll_gtk1_radiobut.obj: ..\..\src\gtk1\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\radiobut.cpp
 
-$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+$(OBJS)\monodll_gtk1_scrolbar.obj: ..\..\src\gtk1\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\scrolbar.cpp
 
-$(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+$(OBJS)\monodll_gtk1_scrolwin.obj: ..\..\src\gtk1\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\scrolwin.cpp
 
-$(OBJS)\monodll_metafile.obj: ..\..\src\msw\metafile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\metafile.cpp
+$(OBJS)\monodll_gtk1_slider.obj: ..\..\src\gtk1\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\slider.cpp
 
-$(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+$(OBJS)\monodll_gtk1_spinbutt.obj: ..\..\src\gtk1\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\spinbutt.cpp
 
-$(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+$(OBJS)\monodll_gtk1_spinctrl.obj: ..\..\src\gtk1\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\spinctrl.cpp
 
-$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+$(OBJS)\monodll_gtk1_statbmp.obj: ..\..\src\gtk1\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\statbmp.cpp
 
-$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+$(OBJS)\monodll_gtk1_statbox.obj: ..\..\src\gtk1\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\statbox.cpp
 
-$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+$(OBJS)\monodll_gtk1_statline.obj: ..\..\src\gtk1\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\statline.cpp
 
-$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+$(OBJS)\monodll_gtk1_stattext.obj: ..\..\src\gtk1\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\stattext.cpp
 
-$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+$(OBJS)\monodll_gtk1_toolbar.obj: ..\..\src\gtk1\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\toolbar.cpp
 
-$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+$(OBJS)\monodll_gtk1_textctrl.obj: ..\..\src\gtk1\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\textctrl.cpp
 
-$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+$(OBJS)\monodll_gtk1_tglbtn.obj: ..\..\src\gtk1\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\tglbtn.cpp
 
-$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+$(OBJS)\monodll_motif_accel.obj: ..\..\src\motif\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\accel.cpp
 
-$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+$(OBJS)\monodll_motif_app.obj: ..\..\src\motif\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\app.cpp
 
-$(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+$(OBJS)\monodll_motif_bmpbuttn.obj: ..\..\src\motif\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\bmpbuttn.cpp
 
-$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+$(OBJS)\monodll_bmpmotif.obj: ..\..\src\motif\bmpmotif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\bmpmotif.cpp
 
-$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+$(OBJS)\monodll_motif_button.obj: ..\..\src\motif\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\button.cpp
 
-$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+$(OBJS)\monodll_motif_checkbox.obj: ..\..\src\motif\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\checkbox.cpp
 
-$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+$(OBJS)\monodll_motif_checklst.obj: ..\..\src\motif\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\checklst.cpp
 
-$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+$(OBJS)\monodll_motif_choice.obj: ..\..\src\motif\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\choice.cpp
 
-$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+$(OBJS)\monodll_motif_clipbrd.obj: ..\..\src\motif\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\clipbrd.cpp
 
-$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+$(OBJS)\monodll_motif_colour.obj: ..\..\src\motif\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\colour.cpp
 
-$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
+$(OBJS)\monodll_motif_combobox.obj: ..\..\src\motif\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\combobox.cpp
 
-$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+$(OBJS)\monodll_combobox_native.obj: ..\..\src\motif\combobox_native.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\combobox_native.cpp
 
-$(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+$(OBJS)\monodll_motif_control.obj: ..\..\src\motif\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\control.cpp
 
-$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+$(OBJS)\monodll_motif_cursor.obj: ..\..\src\motif\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\cursor.cpp
 
-$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+$(OBJS)\monodll_motif_data.obj: ..\..\src\motif\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\data.cpp
 
-$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+$(OBJS)\monodll_motif_dataobj.obj: ..\..\src\motif\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dataobj.cpp
 
-$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+$(OBJS)\monodll_motif_dc.obj: ..\..\src\motif\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dc.cpp
 
-$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\monodll_motif_dcclient.obj: ..\..\src\motif\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dcclient.cpp
 
-$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\monodll_motif_dcmemory.obj: ..\..\src\motif\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dcmemory.cpp
 
-$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\monodll_motif_dcscreen.obj: ..\..\src\motif\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dcscreen.cpp
 
-$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+$(OBJS)\monodll_motif_dialog.obj: ..\..\src\motif\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\dialog.cpp
 
-$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+$(OBJS)\monodll_motif_evtloop.obj: ..\..\src\motif\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\evtloop.cpp
 
-$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+$(OBJS)\monodll_motif_filedlg.obj: ..\..\src\motif\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\filedlg.cpp
 
-$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
+$(OBJS)\monodll_motif_font.obj: ..\..\src\motif\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\font.cpp
 
-$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\monodll_motif_frame.obj: ..\..\src\motif\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\frame.cpp
 
-$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+$(OBJS)\monodll_motif_gauge.obj: ..\..\src\motif\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\gauge.cpp
 
-$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
+$(OBJS)\monodll_sockmot.obj: ..\..\src\motif\sockmot.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\sockmot.cpp
 
-$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+$(OBJS)\monodll_motif_icon.obj: ..\..\src\motif\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\icon.cpp
 
-$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+$(OBJS)\monodll_motif_listbox.obj: ..\..\src\motif\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\listbox.cpp
 
-$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+$(OBJS)\monodll_motif_main.obj: ..\..\src\motif\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\main.cpp
 
-$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+$(OBJS)\monodll_motif_menu.obj: ..\..\src\motif\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\menu.cpp
 
-$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
+$(OBJS)\monodll_motif_menuitem.obj: ..\..\src\motif\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\menuitem.cpp
 
-$(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+$(OBJS)\monodll_motif_minifram.obj: ..\..\src\motif\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\minifram.cpp
 
-$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+$(OBJS)\monodll_motif_msgdlg.obj: ..\..\src\motif\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\msgdlg.cpp
 
-$(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+$(OBJS)\monodll_motif_popupwin.obj: ..\..\src\motif\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\popupwin.cpp
 
-$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+$(OBJS)\monodll_motif_radiobox.obj: ..\..\src\motif\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\radiobox.cpp
 
-$(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+$(OBJS)\monodll_motif_radiobut.obj: ..\..\src\motif\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\radiobut.cpp
 
-$(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
+$(OBJS)\monodll_motif_scrolbar.obj: ..\..\src\motif\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\scrolbar.cpp
 
-$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+$(OBJS)\monodll_motif_settings.obj: ..\..\src\motif\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\settings.cpp
 
-$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+$(OBJS)\monodll_motif_slider.obj: ..\..\src\motif\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\slider.cpp
 
-$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+$(OBJS)\monodll_motif_spinbutt.obj: ..\..\src\motif\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\spinbutt.cpp
 
-$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+$(OBJS)\monodll_motif_statbmp.obj: ..\..\src\motif\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\statbmp.cpp
 
-$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+$(OBJS)\monodll_motif_statbox.obj: ..\..\src\motif\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\statbox.cpp
 
-$(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+$(OBJS)\monodll_motif_stattext.obj: ..\..\src\motif\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\stattext.cpp
 
-$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+$(OBJS)\monodll_motif_textctrl.obj: ..\..\src\motif\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\textctrl.cpp
 
-$(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+$(OBJS)\monodll_motif_textentry.obj: ..\..\src\motif\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\textentry.cpp
 
-$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+$(OBJS)\monodll_motif_timer.obj: ..\..\src\motif\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\timer.cpp
 
-$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\monodll_motif_toolbar.obj: ..\..\src\motif\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\toolbar.cpp
 
-$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+$(OBJS)\monodll_motif_toplevel.obj: ..\..\src\motif\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\toplevel.cpp
 
-$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+$(OBJS)\monodll_motif_utils.obj: ..\..\src\motif\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\utils.cpp
 
-$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+$(OBJS)\monodll_motif_window.obj: ..\..\src\motif\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\motif\window.cpp
 
-$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+$(OBJS)\monodll_xmcombo.obj: ..\..\src\motif\xmcombo\xmcombo.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\motif\xmcombo\xmcombo.c
 
-$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+$(OBJS)\monodll_generic_notebook.obj: ..\..\src\generic\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notebook.cpp
 
-$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+$(OBJS)\monodll_generic_statline.obj: ..\..\src\generic\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statline.cpp
 
-$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+$(OBJS)\monodll_tabg.obj: ..\..\src\generic\tabg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
-$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
 
-$(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
+$(OBJS)\monodll_msw_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
-$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+$(OBJS)\monodll_wince_checklst.obj: ..\..\src\msw\wince\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\checklst.cpp
 
-$(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+$(OBJS)\monodll_choicece.obj: ..\..\src\msw\wince\choicece.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\choicece.cpp
 
-$(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+$(OBJS)\monodll_crt.obj: ..\..\src\msw\wince\crt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\crt.cpp
 
-$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+$(OBJS)\monodll_filedlgwce.obj: ..\..\src\msw\wince\filedlgwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\filedlgwce.cpp
 
-$(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+$(OBJS)\monodll_filefnwce.obj: ..\..\src\msw\wince\filefnwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\filefnwce.cpp
 
-$(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+$(OBJS)\monodll_helpwce.obj: ..\..\src\msw\wince\helpwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\helpwce.cpp
 
-$(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+$(OBJS)\monodll_menuce.obj: ..\..\src\msw\wince\menuce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\menuce.cpp
 
-$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+$(OBJS)\monodll_tbarwce.obj: ..\..\src\msw\wince\tbarwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\tbarwce.cpp
 
-$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monodll_textctrlce.obj: ..\..\src\msw\wince\textctrlce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\wince\textctrlce.cpp
 
-$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+$(OBJS)\monodll_carbon_anybutton.obj: ..\..\src\osx\carbon\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\anybutton.cpp
 
-$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+$(OBJS)\monodll_carbon_bmpbuttn.obj: ..\..\src\osx\carbon\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\bmpbuttn.cpp
 
-$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+$(OBJS)\monodll_carbon_button.obj: ..\..\src\osx\carbon\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\button.cpp
 
-$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+$(OBJS)\monodll_carbon_checkbox.obj: ..\..\src\osx\carbon\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\checkbox.cpp
 
-$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+$(OBJS)\monodll_carbon_choice.obj: ..\..\src\osx\carbon\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\choice.cpp
 
-$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+$(OBJS)\monodll_carbon_colordlg.obj: ..\..\src\osx\carbon\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\colordlg.cpp
 
-$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
+$(OBJS)\monodll_carbon_dialog.obj: ..\..\src\osx\carbon\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\dialog.cpp
 
-$(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp
+$(OBJS)\monodll_carbon_dirdlg.obj: ..\..\src\osx\carbon\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\dirdlg.cpp
 
-$(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdata.cpp
+$(OBJS)\monodll_carbon_dnd.obj: ..\..\src\osx\carbon\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\dnd.cpp
 
-$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp
+$(OBJS)\monodll_carbon_evtloop.obj: ..\..\src\osx\carbon\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\evtloop.cpp
 
-$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp
+$(OBJS)\monodll_carbon_filedlg.obj: ..\..\src\osx\carbon\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\filedlg.cpp
 
-$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp
+$(OBJS)\monodll_carbon_gauge.obj: ..\..\src\osx\carbon\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\gauge.cpp
 
-$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp
+$(OBJS)\monodll_carbon_listbox.obj: ..\..\src\osx\carbon\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\listbox.cpp
 
-$(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
+$(OBJS)\monodll_listctrl_mac.obj: ..\..\src\osx\carbon\listctrl_mac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\listctrl_mac.cpp
 
-$(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp
+$(OBJS)\monodll_carbon_menu.obj: ..\..\src\osx\carbon\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\menu.cpp
 
-$(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmltag.cpp
+$(OBJS)\monodll_carbon_menuitem.obj: ..\..\src\osx\carbon\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\menuitem.cpp
 
-$(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp
+$(OBJS)\monodll_carbon_msgdlg.obj: ..\..\src\osx\carbon\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\msgdlg.cpp
 
-$(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmprint.cpp
+$(OBJS)\monodll_carbon_nonownedwnd.obj: ..\..\src\osx\carbon\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\nonownedwnd.cpp
 
-$(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp
+$(OBJS)\monodll_notebmac.obj: ..\..\src\osx\carbon\notebmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\notebmac.cpp
 
-$(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp
+$(OBJS)\monodll_carbon_printdlg.obj: ..\..\src\osx\carbon\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\printdlg.cpp
 
-$(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_hline.cpp
+$(OBJS)\monodll_carbon_radiobut.obj: ..\..\src\osx\carbon\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\radiobut.cpp
 
-$(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_image.cpp
+$(OBJS)\monodll_carbon_scrolbar.obj: ..\..\src\osx\carbon\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\scrolbar.cpp
 
-$(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_layout.cpp
+$(OBJS)\monodll_carbon_slider.obj: ..\..\src\osx\carbon\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\slider.cpp
 
-$(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_links.cpp
+$(OBJS)\monodll_carbon_spinbutt.obj: ..\..\src\osx\carbon\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\spinbutt.cpp
 
-$(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_list.cpp
+$(OBJS)\monodll_carbon_srchctrl.obj: ..\..\src\osx\carbon\srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\srchctrl.cpp
 
-$(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp
+$(OBJS)\monodll_carbon_statbmp.obj: ..\..\src\osx\carbon\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\statbmp.cpp
 
-$(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp
+$(OBJS)\monodll_carbon_statbox.obj: ..\..\src\osx\carbon\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\statbox.cpp
 
-$(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp
+$(OBJS)\monodll_statlmac.obj: ..\..\src\osx\carbon\statlmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\statlmac.cpp
 
-$(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp
+$(OBJS)\monodll_carbon_stattext.obj: ..\..\src\osx\carbon\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\stattext.cpp
 
-$(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
+$(OBJS)\monodll_carbon_textctrl.obj: ..\..\src\osx\carbon\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\textctrl.cpp
 
-$(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
+$(OBJS)\monodll_carbon_tglbtn.obj: ..\..\src\osx\carbon\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\tglbtn.cpp
 
-$(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
+$(OBJS)\monodll_carbon_toolbar.obj: ..\..\src\osx\carbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\toolbar.cpp
 
-$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
+$(OBJS)\monodll_carbon_tooltip.obj: ..\..\src\osx\carbon\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\tooltip.cpp
 
-$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
+$(OBJS)\monodll_carbon_window.obj: ..\..\src\osx\carbon\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\window.cpp
 
-$(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
+$(OBJS)\monodll_cocoa_anybutton.obj: ..\..\src\osx\cocoa\anybutton.mm
 
-$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\monodll_osx_cocoa_button.obj: ..\..\src\osx\cocoa\button.mm
 
-$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
+$(OBJS)\monodll_osx_cocoa_checkbox.obj: ..\..\src\osx\cocoa\checkbox.mm
 
-$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
+$(OBJS)\monodll_osx_cocoa_choice.obj: ..\..\src\osx\cocoa\choice.mm
 
-$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
+$(OBJS)\monodll_osx_cocoa_colour.obj: ..\..\src\osx\cocoa\colour.mm
 
-$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
+$(OBJS)\monodll_osx_cocoa_combobox.obj: ..\..\src\osx\cocoa\combobox.mm
 
-$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
+$(OBJS)\monodll_osx_cocoa_dialog.obj: ..\..\src\osx\cocoa\dialog.mm
 
-$(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
+$(OBJS)\monodll_osx_cocoa_dirdlg.obj: ..\..\src\osx\cocoa\dirdlg.mm
 
-$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
+$(OBJS)\monodll_cocoa_dnd.obj: ..\..\src\osx\cocoa\dnd.mm
 
-$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
+$(OBJS)\monodll_osx_cocoa_evtloop.obj: ..\..\src\osx\cocoa\evtloop.mm
 
-$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+$(OBJS)\monodll_osx_cocoa_filedlg.obj: ..\..\src\osx\cocoa\filedlg.mm
 
-$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+$(OBJS)\monodll_osx_cocoa_gauge.obj: ..\..\src\osx\cocoa\gauge.mm
 
-$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
+$(OBJS)\monodll_osx_cocoa_listbox.obj: ..\..\src\osx\cocoa\listbox.mm
 
-$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
+$(OBJS)\monodll_osx_cocoa_menu.obj: ..\..\src\osx\cocoa\menu.mm
 
-$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
+$(OBJS)\monodll_osx_cocoa_menuitem.obj: ..\..\src\osx\cocoa\menuitem.mm
 
-$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
+$(OBJS)\monodll_osx_cocoa_msgdlg.obj: ..\..\src\osx\cocoa\msgdlg.mm
 
-$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+$(OBJS)\monodll_cocoa_nonownedwnd.obj: ..\..\src\osx\cocoa\nonownedwnd.mm
 
-$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
+$(OBJS)\monodll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 
-$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+$(OBJS)\monodll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 
-$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\monodll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 
-$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
+$(OBJS)\monodll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
 
-$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
+$(OBJS)\monodll_osx_cocoa_slider.obj: ..\..\src\osx\cocoa\slider.mm
 
-$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
+$(OBJS)\monodll_osx_cocoa_spinbutt.obj: ..\..\src\osx\cocoa\spinbutt.mm
 
-$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
+$(OBJS)\monodll_cocoa_srchctrl.obj: ..\..\src\osx\cocoa\srchctrl.mm
 
-$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
+$(OBJS)\monodll_osx_cocoa_statbox.obj: ..\..\src\osx\cocoa\statbox.mm
 
-$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
+$(OBJS)\monodll_cocoa_statline.obj: ..\..\src\osx\cocoa\statline.mm
 
-$(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
+$(OBJS)\monodll_osx_cocoa_stattext.obj: ..\..\src\osx\cocoa\stattext.mm
 
-$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+$(OBJS)\monodll_osx_cocoa_textctrl.obj: ..\..\src\osx\cocoa\textctrl.mm
 
-$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\monodll_cocoa_tglbtn.obj: ..\..\src\osx\cocoa\tglbtn.mm
 
-$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
+$(OBJS)\monodll_osx_cocoa_toolbar.obj: ..\..\src\osx\cocoa\toolbar.mm
 
-$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
+$(OBJS)\monodll_osx_cocoa_tooltip.obj: ..\..\src\osx\cocoa\tooltip.mm
 
-$(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
+$(OBJS)\monodll_osx_cocoa_window.obj: ..\..\src\osx\cocoa\window.mm
 
-$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+$(OBJS)\monodll_iphone_anybutton.obj: ..\..\src\osx\iphone\anybutton.mm
 
-$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
+$(OBJS)\monodll_iphone_button.obj: ..\..\src\osx\iphone\button.mm
 
-$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
+$(OBJS)\monodll_iphone_checkbox.obj: ..\..\src\osx\iphone\checkbox.mm
 
-$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
+$(OBJS)\monodll_iphone_dialog.obj: ..\..\src\osx\iphone\dialog.mm
 
-$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
+$(OBJS)\monodll_iphone_evtloop.obj: ..\..\src\osx\iphone\evtloop.mm
 
-$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
+$(OBJS)\monodll_iphone_gauge.obj: ..\..\src\osx\iphone\gauge.mm
 
-$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
+$(OBJS)\monodll_iphone_msgdlg.obj: ..\..\src\osx\iphone\msgdlg.mm
 
-$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
+$(OBJS)\monodll_iphone_nonownedwnd.obj: ..\..\src\osx\iphone\nonownedwnd.mm
 
-$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
+$(OBJS)\monodll_iphone_scrolbar.obj: ..\..\src\osx\iphone\scrolbar.mm
 
-$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
+$(OBJS)\monodll_iphone_slider.obj: ..\..\src\osx\iphone\slider.mm
 
-$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+$(OBJS)\monodll_iphone_stattext.obj: ..\..\src\osx\iphone\stattext.mm
 
-$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
+$(OBJS)\monodll_iphone_textctrl.obj: ..\..\src\osx\iphone\textctrl.mm
 
-$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
+$(OBJS)\monodll_iphone_toolbar.obj: ..\..\src\osx\iphone\toolbar.mm
 
-$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
+$(OBJS)\monodll_iphone_utils.obj: ..\..\src\osx\iphone\utils.mm
 
-$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
+$(OBJS)\monodll_iphone_window.obj: ..\..\src\osx\iphone\window.mm
 
-$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
+$(OBJS)\monodll_NSBox.obj: ..\..\src\cocoa\NSBox.mm
 
-$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
+$(OBJS)\monodll_NSButton.obj: ..\..\src\cocoa\NSButton.mm
 
-$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+$(OBJS)\monodll_NSControl.obj: ..\..\src\cocoa\NSControl.mm
 
-$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+$(OBJS)\monodll_NSMenu.obj: ..\..\src\cocoa\NSMenu.mm
 
-$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+$(OBJS)\monodll_NSPanel.obj: ..\..\src\cocoa\NSPanel.mm
 
-$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
+$(OBJS)\monodll_NSScroller.obj: ..\..\src\cocoa\NSScroller.mm
 
-$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
+$(OBJS)\monodll_NSSlider.obj: ..\..\src\cocoa\NSSlider.mm
 
-$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
+$(OBJS)\monodll_NSTabView.obj: ..\..\src\cocoa\NSTabView.mm
 
-$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
+$(OBJS)\monodll_NSTableView.obj: ..\..\src\cocoa\NSTableView.mm
 
-$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+$(OBJS)\monodll_NSTextField.obj: ..\..\src\cocoa\NSTextField.mm
 
-$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+$(OBJS)\monodll_NSView.obj: ..\..\src\cocoa\NSView.mm
 
-$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
+$(OBJS)\monodll_NSWindow.obj: ..\..\src\cocoa\NSWindow.mm
 
-$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
+$(OBJS)\monodll_ObjcRef.obj: ..\..\src\cocoa\ObjcRef.mm
 
-$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\dockart.cpp
+$(OBJS)\monodll_cocoa_app.obj: ..\..\src\cocoa\app.mm
 
-$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp
+$(OBJS)\monodll_cocoa_bitmap.obj: ..\..\src\cocoa\bitmap.mm
 
-$(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
+$(OBJS)\monodll_cocoa_bmpbuttn.obj: ..\..\src\cocoa\bmpbuttn.mm
 
-$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+$(OBJS)\monodll_cocoa_brush.obj: ..\..\src\cocoa\brush.mm
 
-$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+$(OBJS)\monodll_src_cocoa_button.obj: ..\..\src\cocoa\button.mm
 
-$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+$(OBJS)\monodll_src_cocoa_checkbox.obj: ..\..\src\cocoa\checkbox.mm
 
-$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+$(OBJS)\monodll_cocoa_checklst.obj: ..\..\src\cocoa\checklst.mm
 
-$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+$(OBJS)\monodll_src_cocoa_choice.obj: ..\..\src\cocoa\choice.mm
 
-$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+$(OBJS)\monodll_cocoa_clipbrd.obj: ..\..\src\cocoa\clipbrd.mm
 
-$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+$(OBJS)\monodll_cocoa_colordlg.obj: ..\..\src\cocoa\colordlg.mm
 
-$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+$(OBJS)\monodll_src_cocoa_colour.obj: ..\..\src\cocoa\colour.mm
 
-$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+$(OBJS)\monodll_src_cocoa_combobox.obj: ..\..\src\cocoa\combobox.mm
 
-$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
+$(OBJS)\monodll_cocoa_control.obj: ..\..\src\cocoa\control.mm
 
-$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+$(OBJS)\monodll_cocoa_cursor.obj: ..\..\src\cocoa\cursor.mm
 
-$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+$(OBJS)\monodll_cocoa_data.obj: ..\..\src\cocoa\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\cocoa\data.cpp
 
-$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+$(OBJS)\monodll_cocoa_dataobj.obj: ..\..\src\cocoa\dataobj.mm
 
-$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+$(OBJS)\monodll_cocoa_dc.obj: ..\..\src\cocoa\dc.mm
 
-$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+$(OBJS)\monodll_cocoa_dcclient.obj: ..\..\src\cocoa\dcclient.mm
 
-$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+$(OBJS)\monodll_cocoa_dcmemory.obj: ..\..\src\cocoa\dcmemory.mm
 
-$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+$(OBJS)\monodll_cocoa_dcscreen.obj: ..\..\src\cocoa\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\cocoa\dcscreen.cpp
 
-$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+$(OBJS)\monodll_src_cocoa_dialog.obj: ..\..\src\cocoa\dialog.mm
 
-$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+$(OBJS)\monodll_src_cocoa_dirdlg.obj: ..\..\src\cocoa\dirdlg.mm
 
-$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+$(OBJS)\monodll_cocoa_display.obj: ..\..\src\cocoa\display.mm
 
-$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
+$(OBJS)\monodll_cocoa_drawer.obj: ..\..\src\cocoa\drawer.mm
 
-$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
+$(OBJS)\monodll_src_cocoa_evtloop.obj: ..\..\src\cocoa\evtloop.mm
 
-$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+$(OBJS)\monodll_src_cocoa_filedlg.obj: ..\..\src\cocoa\filedlg.mm
 
-$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+$(OBJS)\monodll_cocoa_font.obj: ..\..\src\cocoa\font.mm
 
-$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
+$(OBJS)\monodll_cocoa_fontdlg.obj: ..\..\src\cocoa\fontdlg.mm
 
-$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+$(OBJS)\monodll_cocoa_fontenum.obj: ..\..\src\cocoa\fontenum.mm
 
-$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+$(OBJS)\monodll_cocoa_fontutil.obj: ..\..\src\cocoa\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\cocoa\fontutil.cpp
 
-$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
+$(OBJS)\monodll_cocoa_frame.obj: ..\..\src\cocoa\frame.mm
 
-$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+$(OBJS)\monodll_src_cocoa_gauge.obj: ..\..\src\cocoa\gauge.mm
 
-$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
+$(OBJS)\monodll_cocoa_icon.obj: ..\..\src\cocoa\icon.mm
 
-$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+$(OBJS)\monodll_src_cocoa_listbox.obj: ..\..\src\cocoa\listbox.mm
 
-$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
+$(OBJS)\monodll_cocoa_main.obj: ..\..\src\cocoa\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\cocoa\main.cpp
 
-$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp
+$(OBJS)\monodll_mbarman.obj: ..\..\src\cocoa\mbarman.mm
 
-$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
+$(OBJS)\monodll_cocoa_mdi.obj: ..\..\src\cocoa\mdi.mm
 
-!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
+$(OBJS)\monodll_src_cocoa_menu.obj: ..\..\src\cocoa\menu.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_menuitem.obj: ..\..\src\cocoa\menuitem.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_msgdlg.obj: ..\..\src\cocoa\msgdlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_notebook.obj: ..\..\src\cocoa\notebook.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp
-!endif
+$(OBJS)\monodll_cocoa_pen.obj: ..\..\src\cocoa\pen.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
-!endif
+$(OBJS)\monodll_cocoa_radiobox.obj: ..\..\src\cocoa\radiobox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_radiobut.obj: ..\..\src\cocoa\radiobut.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
-!endif
+$(OBJS)\monodll_cocoa_region.obj: ..\..\src\cocoa\region.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_scrolbar.obj: ..\..\src\cocoa\scrolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp
-!endif
+$(OBJS)\monodll_cocoa_settings.obj: ..\..\src\cocoa\settings.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_slider.obj: ..\..\src\cocoa\slider.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
-!endif
+$(OBJS)\monodll_cocoa_sound.obj: ..\..\src\cocoa\sound.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_spinbutt.obj: ..\..\src\cocoa\spinbutt.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
-!endif
+$(OBJS)\monodll_cocoa_statbmp.obj: ..\..\src\cocoa\statbmp.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_statbox.obj: ..\..\src\cocoa\statbox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp
-!endif
+$(OBJS)\monodll_statline2.obj: ..\..\src\cocoa\statline2.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_stattext.obj: ..\..\src\cocoa\stattext.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_textctrl.obj: ..\..\src\cocoa\textctrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp
-!endif
+$(OBJS)\monodll_cocoa_timer.obj: ..\..\src\cocoa\timer.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_toolbar.obj: ..\..\src\cocoa\toolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_tooltip.obj: ..\..\src\cocoa\tooltip.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
-!endif
+$(OBJS)\monodll_cocoa_toplevel.obj: ..\..\src\cocoa\toplevel.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_utils.obj: ..\..\src\cocoa\utils.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
-!endif
+$(OBJS)\monodll_cocoa_utilsexc.obj: ..\..\src\cocoa\utilsexc.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_window.obj: ..\..\src\cocoa\window.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp
-!endif
+$(OBJS)\monodll_os2_accel.obj: ..\..\src\os2\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\accel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
-!endif
+$(OBJS)\monodll_os2_app.obj: ..\..\src\os2\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\app.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
+$(OBJS)\monodll_os2_bitmap.obj: ..\..\src\os2\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\bitmap.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
+$(OBJS)\monodll_os2_bmpbuttn.obj: ..\..\src\os2\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
-!endif
+$(OBJS)\monodll_os2_brush.obj: ..\..\src\os2\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\brush.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
-!endif
+$(OBJS)\monodll_os2_button.obj: ..\..\src\os2\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
-!endif
+$(OBJS)\monodll_os2_checkbox.obj: ..\..\src\os2\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp
-!endif
+$(OBJS)\monodll_os2_checklst.obj: ..\..\src\os2\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp
-!endif
+$(OBJS)\monodll_os2_choice.obj: ..\..\src\os2\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
-!endif
+$(OBJS)\monodll_os2_clipbrd.obj: ..\..\src\os2\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\clipbrd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
-!endif
+$(OBJS)\monodll_os2_colour.obj: ..\..\src\os2\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\colour.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
-!endif
+$(OBJS)\monodll_os2_combobox.obj: ..\..\src\os2\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\combobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp
-!endif
+$(OBJS)\monodll_os2_control.obj: ..\..\src\os2\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\control.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
-!endif
+$(OBJS)\monodll_os2_cursor.obj: ..\..\src\os2\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\cursor.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp
-!endif
+$(OBJS)\monodll_os2_data.obj: ..\..\src\os2\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\data.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
-!endif
+$(OBJS)\monodll_os2_dataobj.obj: ..\..\src\os2\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dataobj.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
-!endif
+$(OBJS)\monodll_os2_dc.obj: ..\..\src\os2\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dc.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
-!endif
+$(OBJS)\monodll_os2_dcclient.obj: ..\..\src\os2\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dcclient.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
-!endif
+$(OBJS)\monodll_os2_dcmemory.obj: ..\..\src\os2\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dcmemory.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp
-!endif
+$(OBJS)\monodll_os2_dcprint.obj: ..\..\src\os2\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dcprint.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
-!endif
+$(OBJS)\monodll_os2_dcscreen.obj: ..\..\src\os2\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dcscreen.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp
-!endif
+$(OBJS)\monodll_os2_dialog.obj: ..\..\src\os2\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
-!endif
+$(OBJS)\monodll_os2_dnd.obj: ..\..\src\os2\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\dnd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
+$(OBJS)\monodll_os2_evtloop.obj: ..\..\src\os2\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\evtloop.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
-!endif
+$(OBJS)\monodll_os2_filedlg.obj: ..\..\src\os2\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\filedlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
-!endif
+$(OBJS)\monodll_os2_font.obj: ..\..\src\os2\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\font.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
-!endif
+$(OBJS)\monodll_os2_fontdlg.obj: ..\..\src\os2\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\fontdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
-!endif
+$(OBJS)\monodll_os2_fontenum.obj: ..\..\src\os2\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\fontenum.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
-!endif
+$(OBJS)\monodll_os2_fontutil.obj: ..\..\src\os2\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\fontutil.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
+$(OBJS)\monodll_os2_frame.obj: ..\..\src\os2\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\frame.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
+$(OBJS)\monodll_os2_gauge.obj: ..\..\src\os2\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
+$(OBJS)\monodll_os2_gdiimage.obj: ..\..\src\os2\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\gdiimage.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
+$(OBJS)\monodll_sockpm.obj: ..\..\src\os2\sockpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\sockpm.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
+$(OBJS)\monodll_os2_helpwin.obj: ..\..\src\os2\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\helpwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
+$(OBJS)\monodll_os2_icon.obj: ..\..\src\os2\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\icon.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
+$(OBJS)\monodll_os2_iniconf.obj: ..\..\src\os2\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\iniconf.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
+$(OBJS)\monodll_os2_listbox.obj: ..\..\src\os2\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
+$(OBJS)\monodll_os2_main.obj: ..\..\src\os2\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\main.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
+$(OBJS)\monodll_os2_menu.obj: ..\..\src\os2\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
+$(OBJS)\monodll_os2_menuitem.obj: ..\..\src\os2\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\menuitem.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
+$(OBJS)\monodll_os2_metafile.obj: ..\..\src\os2\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\metafile.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
+$(OBJS)\monodll_os2_minifram.obj: ..\..\src\os2\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\minifram.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
+$(OBJS)\monodll_os2_msgdlg.obj: ..\..\src\os2\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\msgdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
+$(OBJS)\monodll_os2_nativdlg.obj: ..\..\src\os2\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\nativdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
+$(OBJS)\monodll_os2_notebook.obj: ..\..\src\os2\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
+$(OBJS)\monodll_os2_ownerdrw.obj: ..\..\src\os2\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\ownerdrw.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
+$(OBJS)\monodll_os2_palette.obj: ..\..\src\os2\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\palette.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
+$(OBJS)\monodll_os2_pen.obj: ..\..\src\os2\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\pen.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
+$(OBJS)\monodll_os2_popupwin.obj: ..\..\src\os2\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\popupwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
+$(OBJS)\monodll_os2_print.obj: ..\..\src\os2\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\print.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
-!endif
+$(OBJS)\monodll_os2_radiobox.obj: ..\..\src\os2\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
-!endif
+$(OBJS)\monodll_os2_radiobut.obj: ..\..\src\os2\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
-!endif
+$(OBJS)\monodll_os2_region.obj: ..\..\src\os2\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\region.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
-!endif
+$(OBJS)\monodll_os2_scrolbar.obj: ..\..\src\os2\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
-!endif
+$(OBJS)\monodll_os2_settings.obj: ..\..\src\os2\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\settings.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp
-!endif
+$(OBJS)\monodll_os2_slider.obj: ..\..\src\os2\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
-!endif
+$(OBJS)\monodll_os2_spinbutt.obj: ..\..\src\os2\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp
-!endif
+$(OBJS)\monodll_os2_spinctrl.obj: ..\..\src\os2\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\spinctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp
-!endif
+$(OBJS)\monodll_os2_statbmp.obj: ..\..\src\os2\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp
-!endif
+$(OBJS)\monodll_os2_statbox.obj: ..\..\src\os2\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
-!endif
+$(OBJS)\monodll_os2_statline.obj: ..\..\src\os2\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
+$(OBJS)\monodll_os2_stattext.obj: ..\..\src\os2\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
-!endif
+$(OBJS)\monodll_os2_textctrl.obj: ..\..\src\os2\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
-!endif
+$(OBJS)\monodll_os2_textentry.obj: ..\..\src\os2\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\textentry.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
-!endif
+$(OBJS)\monodll_os2_tglbtn.obj: ..\..\src\os2\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
-!endif
+$(OBJS)\monodll_os2_timer.obj: ..\..\src\os2\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\timer.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
-!endif
+$(OBJS)\monodll_os2_toolbar.obj: ..\..\src\os2\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
-!endif
+$(OBJS)\monodll_os2_tooltip.obj: ..\..\src\os2\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\tooltip.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
-!endif
+$(OBJS)\monodll_os2_toplevel.obj: ..\..\src\os2\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\toplevel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmap.cpp
-!endif
+$(OBJS)\monodll_os2_utilsgui.obj: ..\..\src\os2\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\utilsgui.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
-!endif
+$(OBJS)\monodll_os2_window.obj: ..\..\src\os2\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\window.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\framecmn.cpp
-!endif
+$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
-!endif
+$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp
-!endif
+$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp
-!endif
+$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\geometry.cpp
-!endif
+$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp
-!endif
+$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
-!endif
+$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
-!endif
+$(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
-!endif
+$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
-!endif
+$(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp
-!endif
+$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagall.cpp
-!endif
+$(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp
-!endif
+$(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\image.cpp
-!endif
+$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagfill.cpp
-!endif
+$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imaggif.cpp
-!endif
+$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagiff.cpp
-!endif
+$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
-!endif
+$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp
-!endif
+$(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpng.cpp
-!endif
+$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp
-!endif
+$(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtga.cpp
-!endif
+$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp
-!endif
+$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp
-!endif
+$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\layout.cpp
-!endif
+$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
-!endif
+$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
-!endif
+$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp
-!endif
+$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
-!endif
+$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
-!endif
+$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
-!endif
+$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
-!endif
+$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
-!endif
+$(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
-!endif
+$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
-!endif
+$(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
-!endif
+$(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
-!endif
+$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp
-!endif
+$(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
-!endif
+$(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
-!endif
+$(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
-!endif
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
-!endif
+$(OBJS)\monodll_carbon_mediactrl.obj: ..\..\src\osx\carbon\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\mediactrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
-!endif
+$(OBJS)\monodll_osx_cocoa_mediactrl.obj: ..\..\src\osx\cocoa\mediactrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
-!endif
+$(OBJS)\monodll_src_cocoa_mediactrl.obj: ..\..\src\cocoa\mediactrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
-!endif
+$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
-!endif
+$(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp
-!endif
+$(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdata.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
-!endif
+$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stockitem.cpp
-!endif
+$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp
-!endif
+$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
-!endif
+$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
-!endif
+$(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
-!endif
+$(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\treebase.cpp
-!endif
+$(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmltag.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valgen.cpp
-!endif
+$(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\validate.cpp
-!endif
+$(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmprint.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp
-!endif
+$(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
-!endif
+$(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
-!endif
+$(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_hline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
-!endif
+$(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_image.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
-!endif
+$(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_layout.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
-!endif
+$(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_links.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
-!endif
+$(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_list.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
-!endif
+$(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
-!endif
+$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp
-!endif
+$(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
-!endif
+$(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
-!endif
+$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
-!endif
+$(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
-!endif
+$(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
-!endif
+$(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp
-!endif
+$(OBJS)\monodll_webview_webkit.obj: ..\..\src\gtk\webview_webkit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\webview_webkit.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
-!endif
+$(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
-!endif
+$(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
-!endif
+$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp
-!endif
+$(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\renderg.cpp
-!endif
+$(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
-!endif
+$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\selstore.cpp
-!endif
+$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
-!endif
+$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splitter.cpp
-!endif
+$(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
-!endif
+$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
-!endif
+$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
-!endif
+$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
+$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
-!endif
+$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
-!endif
+$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
+$(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
-!endif
+$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp
-!endif
+$(OBJS)\monodll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
-!endif
+$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
-!endif
+$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
-!endif
+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
-!endif
+$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
-!endif
+$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
-!endif
+$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-!endif
+$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
-!endif
+$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
-!endif
+$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
-!endif
+$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp
-!endif
+$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp
-!endif
+$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grid.cpp
-!endif
+$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
-!endif
+$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp
-!endif
+$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
-!endif
+$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\helpext.cpp
-!endif
+$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
-!endif
+$(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
-!endif
+$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
-!endif
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
-!endif
+$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
-!endif
+$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-!endif
+$(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-!endif
+$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
-!endif
+$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-!endif
+$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
-!endif
+$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
-!endif
+$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-!endif
+$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-!endif
+$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
-!endif
+$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
-!endif
+$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
-!endif
+$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
+$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
 
-$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
 
-$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
 
-$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp
+$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
 
-$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
+$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
 
-$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcall.cpp
+$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
 
-$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcfind.cpp
+$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\archive.cpp
+$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
 
-$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
 
-$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\base64.cpp
+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
 
-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clntdata.cpp
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
-$(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdline.cpp
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
 
-$(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\config.cpp
+$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
-$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\convauto.cpp
+$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
 
-$(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
+$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
 
-$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
 
-$(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
+$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
 
-$(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
+$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
 
-$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
+$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
 
-$(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
+$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
 
-$(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynload.cpp
+$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\dockart.cpp
 
-$(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\encconv.cpp
+$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp
 
-$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
+$(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
-$(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\common\extended.c
+$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
 
-$(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ffile.cpp
+$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
-$(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\file.cpp
+$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
 
-$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileback.cpp
+$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
 
-$(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileconf.cpp
+$(OBJS)\monodll_tabartgtk.obj: ..\..\src\aui\tabartgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabartgtk.cpp
 
-$(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filefn.cpp
+$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
 
-$(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filename.cpp
+$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
 
-$(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filesys.cpp
+$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
 
-$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtall.cpp
+$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
 
-$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtfind.cpp
+$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
 
-$(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp
+$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
 
-$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp
+$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
 
-$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp
+$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
-$(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hash.cpp
+$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
 
-$(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hashmap.cpp
+$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
 
-$(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\init.cpp
+$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
 
-$(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\intl.cpp
+$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
 
-$(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
+$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
 
-$(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp
+$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
 
-$(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\log.cpp
+$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
 
-$(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\longlong.cpp
+$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
 
-$(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\memory.cpp
+$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
 
-$(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp
+$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
 
-$(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\module.cpp
+$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp
 
-$(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp
+$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp
+$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\platinfo.cpp
+$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
-$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\powercmn.cpp
+$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\process.cpp
+$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\regex.cpp
+$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
-$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp
+$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
+$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
 
-$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
 
-$(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
+$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
-$(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strconv.cpp
+$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
 
-$(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stream.cpp
+$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
 
-$(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\string.cpp
+$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
 
-$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
 
-$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringops.cpp
+$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp
 
-$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strvararg.cpp
+$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
 
-$(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sysopt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textbuf.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\unichar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
 
-$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
 
-$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
 
-$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
 
-$(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dde.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dir.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\power.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\regconf.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\registry.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\thread.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timer.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utils.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\msgout.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
 
-$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
 
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
 
-$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
 
-$(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
 
-$(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
 
-$(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
 
-$(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ftp.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
 
-$(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\http.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
 
-$(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\protocol.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
 
-$(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
 
-$(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
 
-$(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\socket.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
 
-$(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
 
-$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
 
-$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
 
-$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
 
-$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
 
-$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
 
-$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
 
-$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
 
-$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
 
-$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
 
-$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
 
-$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
 
-$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
 
-$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
 
-$(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
 
-$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
 
-$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
 
-$(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
 
-$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
 
-$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
 
-$(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
 
-$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
 
-$(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
 
-$(OBJS)\monolib_metafile.obj: ..\..\src\msw\metafile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\metafile.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
 
-$(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
 
-$(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
 
-$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
 
-$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
 
-$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
 
-$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
 
-$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
 
-$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
 
-$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
 
-$(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
 
-$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
 
-$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
 
-$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
 
-$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
 
-$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
 
-$(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
 
-$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
 
-$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
 
-$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
 
-$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk_dcclient.obj: ..\..\src\gtk\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dcclient.cpp
+!endif
 
-$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk_dcmemory.obj: ..\..\src\gtk\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dcmemory.cpp
+!endif
 
-$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk_dcscreen.obj: ..\..\src\gtk\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dcscreen.cpp
+!endif
 
-$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
 
-$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
 
-$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
 
-$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
 
-$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
 
-$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_app.obj: ..\..\src\gtk1\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\app.cpp
+!endif
 
-$(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_bitmap.obj: ..\..\src\gtk1\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_brush.obj: ..\..\src\gtk1\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\brush.cpp
+!endif
 
-$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_clipbrd.obj: ..\..\src\gtk1\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_colour.obj: ..\..\src\gtk1\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\colour.cpp
+!endif
 
-$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_cursor.obj: ..\..\src\gtk1\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\cursor.cpp
+!endif
 
-$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_data.obj: ..\..\src\gtk1\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\data.cpp
+!endif
 
-$(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dataobj.obj: ..\..\src\gtk1\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dc.obj: ..\..\src\gtk1\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dc.cpp
+!endif
 
-$(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dcclient.obj: ..\..\src\gtk1\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dcclient.cpp
+!endif
 
-$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dcmemory.obj: ..\..\src\gtk1\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dcmemory.cpp
+!endif
 
-$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dcscreen.obj: ..\..\src\gtk1\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dcscreen.cpp
+!endif
 
-$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_dnd.obj: ..\..\src\gtk1\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\dnd.cpp
+!endif
 
-$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_evtloop.obj: ..\..\src\gtk1\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\evtloop.cpp
+!endif
 
-$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_font.obj: ..\..\src\gtk1\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\font.cpp
+!endif
 
-$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_sockgtk.obj: ..\..\src\gtk1\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\sockgtk.cpp
+!endif
 
-$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_main.obj: ..\..\src\gtk1\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\main.cpp
+!endif
 
-$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_minifram.obj: ..\..\src\gtk1\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\minifram.cpp
+!endif
 
-$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_pen.obj: ..\..\src\gtk1\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\pen.cpp
+!endif
 
-$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_popupwin.obj: ..\..\src\gtk1\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_region.obj: ..\..\src\gtk1\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\region.cpp
+!endif
 
-$(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_renderer.obj: ..\..\src\gtk1\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\renderer.cpp
+!endif
 
-$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_settings.obj: ..\..\src\gtk1\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\settings.cpp
+!endif
 
-$(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_timer.obj: ..\..\src\gtk1\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\timer.cpp
+!endif
 
-$(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_tooltip.obj: ..\..\src\gtk1\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\tooltip.cpp
+!endif
 
-$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_toplevel.obj: ..\..\src\gtk1\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_utilsgtk.obj: ..\..\src\gtk1\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\utilsgtk.cpp
+!endif
 
-$(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_win_gtk.obj: ..\..\src\gtk1\win_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\gtk1\win_gtk.c
+!endif
 
-$(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_window.obj: ..\..\src\gtk1\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\window.cpp
+!endif
 
-$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
 
-$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
 
-$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
 
-$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
 
-$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
 
-$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
 
-$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
 
-$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
 
-$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
 
-$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
 
-$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
 
-$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
 
-$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
 
-$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
 
-$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
 
-$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
 
-$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
 
-$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
 
-$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_image.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
 
-$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_links.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
 
-$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_list.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
 
-$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
 
-$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
 
-$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
 
-$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
 
-$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
 
-$(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
 
-$(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
 
-$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
 
-$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
 
-$(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
 
-$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
 
-$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
 
-$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
 
-$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
 
-$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
 
-$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
 
-$(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
 
-$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
 
-$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
 
-$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
 
-$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
 
-$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
 
-$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
 
-$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif
 
-$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif
 
-$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif
 
-$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif
 
-$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif
 
-$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif
 
-$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif
 
-$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
 
-$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
 
-$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
 
-$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
 
-$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif
 
-$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif
 
-$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif
 
-$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif
 
-$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif
 
-$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif
 
-$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif
 
-$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif
 
-$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
 
-$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
 
-$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
 
-$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
 
-$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif
 
-$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif
 
-$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif
 
-$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif
 
-$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif
 
-$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif
 
-$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif
 
-$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
-
-$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
-
-$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif
 
-$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif
 
-$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
 
-$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
 
-$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\dockart.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif
 
-$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif
 
-$(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif
 
-$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif
 
-$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif
 
-$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif
 
-$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
+!endif
 
-$(OBJS)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msw_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp
+!endif
 
-$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hid.obj: ..\..\src\osx\core\hid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\hid.cpp
+!endif
 
-$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_utilsexc_cf.obj: ..\..\src\osx\core\utilsexc_cf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\utilsexc_cf.cpp
+!endif
 
-$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_timer.obj: ..\..\src\generic\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timer.cpp
+!endif
 
-$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_app.obj: ..\..\src\x11\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\app.cpp
+!endif
 
-$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_clipbrd.obj: ..\..\src\x11\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\clipbrd.cpp
+!endif
 
-$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_colour.obj: ..\..\src\x11\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\colour.cpp
+!endif
 
-$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_cursor.obj: ..\..\src\x11\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\cursor.cpp
+!endif
 
-$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_data.obj: ..\..\src\x11\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\data.cpp
+!endif
 
-$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_dataobj.obj: ..\..\src\x11\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\dataobj.cpp
+!endif
 
-$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_dc.obj: ..\..\src\x11\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\dc.cpp
+!endif
 
-$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_dcclient.obj: ..\..\src\x11\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\dcclient.cpp
+!endif
 
-$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_dcmemory.obj: ..\..\src\x11\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\dcmemory.cpp
+!endif
 
-$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_dcscreen.obj: ..\..\src\x11\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\dcscreen.cpp
+!endif
 
-$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_evtloop.obj: ..\..\src\x11\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\evtloop.cpp
+!endif
 
-$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_font.obj: ..\..\src\x11\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\font.cpp
+!endif
 
-$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_minifram.obj: ..\..\src\x11\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\minifram.cpp
+!endif
 
-$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_nanox.obj: ..\..\src\x11\nanox.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\x11\nanox.c
+!endif
 
-$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_popupwin.obj: ..\..\src\x11\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\popupwin.cpp
+!endif
 
-$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_reparent.obj: ..\..\src\x11\reparent.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\reparent.cpp
+!endif
 
-$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_settings.obj: ..\..\src\x11\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\settings.cpp
+!endif
 
-$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_toplevel.obj: ..\..\src\x11\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\toplevel.cpp
+!endif
 
-$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_utils.obj: ..\..\src\x11\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\utils.cpp
+!endif
 
-$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_x11_window.obj: ..\..\src\x11\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\x11\window.cpp
+!endif
 
-$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontmgrcmn.obj: ..\..\src\common\fontmgrcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmgrcmn.cpp
+!endif
 
-$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_colour.obj: ..\..\src\generic\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colour.cpp
+!endif
 
-$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mask.obj: ..\..\src\generic\mask.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mask.cpp
+!endif
 
-$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_app.obj: ..\..\src\dfb\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\app.cpp
+!endif
 
-$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_bitmap.obj: ..\..\src\dfb\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\bitmap.cpp
+!endif
 
-$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_brush.obj: ..\..\src\dfb\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\brush.cpp
+!endif
 
-!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
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_cursor.obj: ..\..\src\dfb\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\cursor.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_dc.obj: ..\..\src\dfb\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\dc.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bitmap.obj: ..\..\src\msw\bitmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_dcclient.obj: ..\..\src\dfb\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\dcclient.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_dcmemory.obj: ..\..\src\dfb\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\dcmemory.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_caret.obj: ..\..\src\msw\caret.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_dcscreen.obj: ..\..\src\dfb\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\dcscreen.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_evtloop.obj: ..\..\src\dfb\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\evtloop.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_colour.obj: ..\..\src\msw\colour.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_font.obj: ..\..\src\dfb\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\font.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cursor.obj: ..\..\src\msw\cursor.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_fontenum.obj: ..\..\src\dfb\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\fontenum.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_data.obj: ..\..\src\msw\data.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontmgr.obj: ..\..\src\dfb\fontmgr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\fontmgr.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dc.obj: ..\..\src\msw\dc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_nonownedwnd.obj: ..\..\src\dfb\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\nonownedwnd.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcclient.obj: ..\..\src\msw\dcclient.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_overlay.obj: ..\..\src\dfb\overlay.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\overlay.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_pen.obj: ..\..\src\dfb\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\pen.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcprint.obj: ..\..\src\msw\dcprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_region.obj: ..\..\src\dfb\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\region.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_settings.obj: ..\..\src\dfb\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\settings.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dialup.obj: ..\..\src\msw\dialup.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_toplevel.obj: ..\..\src\dfb\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\toplevel.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_utils.obj: ..\..\src\dfb\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\utils.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dfb_window.obj: ..\..\src\dfb\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\window.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapdfb.obj: ..\..\src\dfb\wrapdfb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\dfb\wrapdfb.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_fontenum.obj: ..\..\src\msw\fontenum.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_fontutil.obj: ..\..\src\msw\fontutil.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_icon.obj: ..\..\src\msw\icon.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+$(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)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_anybutton.obj: ..\..\src\gtk\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\anybutton.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_artgtk.obj: ..\..\src\gtk\artgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\artgtk.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_bmpbuttn.obj: ..\..\src\gtk\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\bmpbuttn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_button.obj: ..\..\src\gtk\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\button.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_checkbox.obj: ..\..\src\gtk\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\checkbox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_checklst.obj: ..\..\src\gtk\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\checklst.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_choice.obj: ..\..\src\gtk\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\choice.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_collpane.obj: ..\..\src\gtk\collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\collpane.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_colordlg.obj: ..\..\src\gtk\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\colordlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_combobox.obj: ..\..\src\gtk\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\combobox.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_control.obj: ..\..\src\gtk\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\control.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_clrpicker.obj: ..\..\src\gtk\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\clrpicker.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dialog.obj: ..\..\src\gtk\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dialog.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_fontpicker.obj: ..\..\src\gtk\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\fontpicker.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_filepicker.obj: ..\..\src\gtk\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filepicker.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dirdlg.obj: ..\..\src\gtk\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dirdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_filedlg.obj: ..\..\src\gtk\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\filedlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_fontdlg.obj: ..\..\src\gtk\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\fontdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_frame.obj: ..\..\src\gtk\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\frame.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_gauge.obj: ..\..\src\gtk\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\gauge.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gvfs.obj: ..\..\src\gtk\gnome\gvfs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\gnome\gvfs.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_infobar.obj: ..\..\src\gtk\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\infobar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_listbox.obj: ..\..\src\gtk\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\listbox.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_mdi.obj: ..\..\src\gtk\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\mdi.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_menu.obj: ..\..\src\gtk\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\menu.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_mnemonics.obj: ..\..\src\gtk\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\mnemonics.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_msgdlg.obj: ..\..\src\gtk\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\msgdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_nativewin.obj: ..\..\src\gtk\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\nativewin.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_notebook.obj: ..\..\src\gtk\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\notebook.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_print.obj: ..\..\src\gtk\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\print.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_radiobox.obj: ..\..\src\gtk\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\radiobox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_radiobut.obj: ..\..\src\gtk\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\radiobut.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_scrolbar.obj: ..\..\src\gtk\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\scrolbar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_scrolwin.obj: ..\..\src\gtk\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\scrolwin.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_slider.obj: ..\..\src\gtk\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\slider.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_spinbutt.obj: ..\..\src\gtk\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\spinbutt.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_spinctrl.obj: ..\..\src\gtk\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\spinctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_statbmp.obj: ..\..\src\gtk\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\statbmp.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_statbox.obj: ..\..\src\gtk\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\statbox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_statline.obj: ..\..\src\gtk\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\statline.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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_stattext.obj: ..\..\src\gtk\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\stattext.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_toolbar.obj: ..\..\src\gtk\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\toolbar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_textctrl.obj: ..\..\src\gtk\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\textctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_textentry.obj: ..\..\src\gtk\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\textentry.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docmdi.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_tglbtn.obj: ..\..\src\gtk\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\tglbtn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docview.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_treeentry_gtk.obj: ..\..\src\gtk\treeentry_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\gtk\treeentry_gtk.c
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
+$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
+$(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)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(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)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
+$(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)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmap.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\framecmn.cpp
+$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp
+$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\geometry.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.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
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagall.cpp
+$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\image.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagfill.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imaggif.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagiff.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpng.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_colordlg.obj: ..\..\src\msw\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtga.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\layout.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_filedlg.obj: ..\..\src\msw\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_frame.obj: ..\..\src\msw\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_iniconf.obj: ..\..\src\msw\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_mdi.obj: ..\..\src\msw\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_menuitem.obj: ..\..\src\msw\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_metafile.obj: ..\..\src\msw\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\metafile.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stockitem.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\treebase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valgen.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\validate.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_regiong.obj: ..\..\src\generic\regiong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\regiong.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp
+$(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)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
+$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
+$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
+$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
+$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
+$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp
+$(OBJS)\monodll_arttango.obj: ..\..\src\common\arttango.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arttango.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
+$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
+$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp
+$(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)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\renderg.cpp
+$(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)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
+$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\selstore.cpp
+$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
+$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splitter.cpp
+$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
+$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
+$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
+$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp
+$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
+$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+$(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)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp
+$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grid.cpp
+$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+$(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)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp
+$(OBJS)\monodll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
+$(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fldlgcmn.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
+$(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmap.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
+$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\framecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+$(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gbsizer.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
+$(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+$(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\geometry.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+$(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.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
+$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
 !endif
 
-$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
 
-$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=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
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
+!endif
 
-$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp
+!endif
 
-$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagall.cpp
+!endif
 
-$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcall.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp
+!endif
 
-$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcfind.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\image.cpp
+!endif
 
-$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\archive.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagfill.cpp
+!endif
 
-$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arrstr.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imaggif.cpp
+!endif
 
-$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\base64.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagiff.cpp
+!endif
 
-$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\clntdata.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
+!endif
 
-$(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\cmdline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp
+!endif
 
-$(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\config.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpng.cpp
+!endif
 
-$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\convauto.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp
+!endif
 
-$(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtga.cpp
+!endif
 
-$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp
+!endif
 
-$(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp
+!endif
 
-$(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\layout.cpp
+!endif
 
-$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
+!endif
 
-$(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
+!endif
 
-$(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynload.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
 
-$(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\encconv.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp
+!endif
 
-$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
 
-$(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c
-       $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) ..\..\src\common\extended.c
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
 
-$(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ffile.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
+!endif
 
-$(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\file.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
+!endif
 
-$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileback.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
+!endif
 
-$(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileconf.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
 
-$(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filefn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
 
-$(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filename.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
 
-$(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filesys.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
+!endif
 
-$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtall.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
+!endif
 
-$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtfind.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
+!endif
 
-$(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp
+!endif
 
-$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
 
-$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
 
-$(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hash.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
 
-$(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hashmap.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
+!endif
 
-$(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\init.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
+!endif
 
-$(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\intl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
 
-$(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
+!endif
 
-$(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
 
-$(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\log.cpp
-
-$(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\longlong.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
 
-$(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\memory.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
 
-$(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
 
-$(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\module.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!endif
 
-$(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif
 
-$(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
 
-$(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\platinfo.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
 
-$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\powercmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
 
-$(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\process.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
+!endif
 
-$(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\regex.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stockitem.cpp
+!endif
 
-$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp
+!endif
 
-$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
+!endif
 
-$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
+!endif
 
-$(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
+!endif
 
-$(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strconv.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
+!endif
 
-$(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\treebase.cpp
+!endif
 
-$(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\string.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp
+!endif
 
-$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valgen.cpp
+!endif
 
-$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringops.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\validate.cpp
+!endif
 
-$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strvararg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp
+!endif
 
-$(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sysopt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valnum.obj: ..\..\src\common\valnum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
 
-$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
+!endif
 
-$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textbuf.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
+!endif
 
-$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
 
-$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
+!endif
 
-$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
+!endif
 
-$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
+!endif
 
-$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
+!endif
 
-$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\unichar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
+!endif
 
-$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp
+!endif
 
-$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
+!endif
 
-$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
+!endif
 
-$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wfstream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
+!endif
 
-$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
+!endif
 
-$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
 
-$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
 
-$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
+!endif
 
-$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp
+!endif
 
-$(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
 
-$(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+!endif
 
-$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
+!endif
 
-$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
+!endif
 
-$(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp
+!endif
 
-$(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\renderg.cpp
+!endif
 
-$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp
+!endif
 
-$(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dde.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
+!endif
 
-$(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dir.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\selstore.cpp
+!endif
 
-$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
+!endif
 
-$(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splitter.cpp
+!endif
 
-$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\power.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
 
-$(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\regconf.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
 
-$(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\registry.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
 
-$(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
 
-$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
+!endif
 
-$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
+!endif
 
-$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\thread.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
 
-$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\timer.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
+!endif
 
-$(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utils.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp
+!endif
 
-$(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
+!endif
 
-$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
+!endif
 
-$(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+!endif
 
-$(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
 
-$(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\msgout.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
 
-$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+!endif
 
-$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+!endif
 
-$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+!endif
 
-$(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
 
-$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
 
-$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
 
-$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+!endif
 
-$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+!endif
 
-$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcall.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+!endif
 
-$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcfind.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp
+!endif
 
-$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\archive.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+!endif
 
-$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+!endif
 
-$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\base64.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp
+!endif
 
-$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\clntdata.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grid.cpp
+!endif
 
-$(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\cmdline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+!endif
 
-$(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\config.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+!endif
 
-$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\convauto.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+!endif
 
-$(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\helpext.cpp
+!endif
 
-$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+!endif
 
-$(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
+!endif
 
-$(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
+!endif
 
-$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+!endif
 
-$(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
 
-$(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynload.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
 
-$(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\encconv.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
 
-$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
 
-$(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c
-       $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) ..\..\src\common\extended.c
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
+!endif
 
-$(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ffile.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
 
-$(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\file.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+!endif
 
-$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileback.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
+!endif
 
-$(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileconf.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filefn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filename.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filesys.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtall.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtfind.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
 
-$(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hash.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
 
-$(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hashmap.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
 
-$(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\init.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
 
-$(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\intl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
 
-$(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
 
-$(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
 
-$(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\log.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
 
-$(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\longlong.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
 
-$(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\memory.cpp
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
 
-$(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
 
-$(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\module.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
 
-$(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\platinfo.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
 
-$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\powercmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
 
-$(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\process.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\regex.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strconv.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stream.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\string.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
 
-$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringops.cpp
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_carbon_aboutdlg.obj: ..\..\src\osx\carbon\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\aboutdlg.cpp
+!endif
 
-$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strvararg.cpp
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_carbon_drawer.obj: ..\..\src\osx\carbon\drawer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\drawer.cpp
+!endif
 
-$(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sysopt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
 
-$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
 
-$(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textbuf.cpp
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_carbon_dataview.obj: ..\..\src\osx\carbon\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\dataview.cpp
+!endif
 
-$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
 
-$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
 
-$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
 
-$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
 
-$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
 
-$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\unichar.cpp
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_carbon_taskbar.obj: ..\..\src\osx\carbon\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\carbon\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
 
-$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
 
-$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
 
-$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datetimectrl_osx.obj: ..\..\src\osx\datetimectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\datetimectrl_osx.cpp
+!endif
 
-$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datectrl_osx.obj: ..\..\src\osx\datectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\datectrl_osx.cpp
+!endif
 
-$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_timectrl_osx.obj: ..\..\src\osx\timectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\timectrl_osx.cpp
+!endif
 
-$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
 
-$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
 
-$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cocoa_aboutdlg.obj: ..\..\src\osx\cocoa\aboutdlg.mm
+!endif
 
-$(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cocoa_dataview.obj: ..\..\src\osx\cocoa\dataview.mm
+!endif
 
-$(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cocoa_datetimectrl.obj: ..\..\src\osx\cocoa\datetimectrl.mm
+!endif
 
-$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_osx_cocoa_taskbar.obj: ..\..\src\osx\cocoa\taskbar.mm
+!endif
 
-$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_src_cocoa_taskbar.obj: ..\..\src\cocoa\taskbar.mm
+!endif
 
-$(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
 
-$(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
 
-$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
 
-$(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dde.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
 
-$(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dir.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
 
-$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
 
-$(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
 
-$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\power.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
 
-$(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\regconf.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
 
-$(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\registry.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
 
-$(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
 
-$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\thread.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk_eggtrayicon.obj: ..\..\src\gtk\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\gtk\eggtrayicon.c
+!endif
 
-$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\timer.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hildon_notifmsg.obj: ..\..\src\gtk\hildon\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\hildon\notifmsg.cpp
+!endif
 
-$(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utils.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_eggtrayicon.obj: ..\..\src\gtk1\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\gtk1\eggtrayicon.c
+!endif
 
-$(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gtk1_taskbar.obj: ..\..\src\gtk1\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk1\taskbar.cpp
+!endif
 
-$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_os2_joystick.obj: ..\..\src\os2\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\joystick.cpp
+!endif
 
-$(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_os2_sound.obj: ..\..\src\os2\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\os2\sound.cpp
+!endif
 
-$(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_aboutdlg.obj: ..\..\src\gtk\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\aboutdlg.cpp
+!endif
 
-$(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\msgout.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_animate.obj: ..\..\src\gtk\animate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\animate.cpp
+!endif
 
-$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_bmpcbox.obj: ..\..\src\gtk\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\bmpcbox.cpp
+!endif
 
-$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_calctrl.obj: ..\..\src\gtk\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\calctrl.cpp
+!endif
 
-$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_dataview.obj: ..\..\src\gtk\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\dataview.cpp
+!endif
 
-$(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gtk_hyperlink.obj: ..\..\src\gtk\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\gtk\hyperlink.cpp
+!endif
 
-$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!endif
 
-$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!endif
 
-$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+!endif
 
-$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!endif
 
-$(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\ftp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!endif
 
-$(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\http.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+!endif
 
-$(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\protocol.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_msw_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+!endif
 
-$(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+!endif
 
-$(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckfile.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+!endif
 
-$(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckipc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+!endif
 
-$(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+!endif
 
-$(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\socket.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
 
-$(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monodll_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
 
-$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
+$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc
 
-$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
+$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
-$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp
 
-$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp
+$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
 
-$(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\ftp.cpp
+$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcall.cpp
 
-$(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\http.cpp
+$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcfind.cpp
 
-$(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\protocol.cpp
+$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\archive.cpp
 
-$(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp
+$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
 
-$(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp
+$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\base64.cpp
 
-$(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clntdata.cpp
 
-$(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp
+$(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdline.cpp
 
-$(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\socket.cpp
+$(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\config.cpp
 
-$(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp
+$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\convauto.cpp
 
-$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
+$(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
 
-$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
+$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
 
-$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
 
-$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
+$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
 
-$(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+$(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
-$(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\msgout.cpp
+$(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynload.cpp
 
-$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+$(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\encconv.cpp
 
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
 
-$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp
+$(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\common\extended.c
 
-$(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp
+$(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ffile.cpp
 
-$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
+$(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\file.cpp
 
-$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileback.cpp
 
-$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+$(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileconf.cpp
 
-$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+$(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filefn.cpp
 
-$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+$(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filename.cpp
 
-$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
+$(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filesys.cpp
 
-$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtall.cpp
 
-$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtfind.cpp
 
-$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+$(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp
 
-$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
+$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp
 
-$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp
 
-$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
+$(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hash.cpp
 
-$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+$(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hashmap.cpp
 
-$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+$(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\init.cpp
 
-$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+$(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\intl.cpp
 
-$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+$(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 
-$(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
+$(OBJS)\monolib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 
-$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+$(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp
 
-$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+$(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\log.cpp
 
-$(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+$(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\longlong.cpp
 
-$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+$(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\memory.cpp
 
-$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+$(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp
 
-$(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
+$(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\module.cpp
 
-$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+$(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp
 
-$(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+$(OBJS)\monolib_numformatter.obj: ..\..\src\common\numformatter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\numformatter.cpp
 
-$(OBJS)\coredll_metafile.obj: ..\..\src\msw\metafile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\metafile.cpp
+$(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp
 
-$(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+$(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\platinfo.cpp
 
-$(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\powercmn.cpp
 
-$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+$(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\process.cpp
 
-$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+$(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\regex.cpp
 
-$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp
 
-$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
 
-$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
 
-$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+$(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
 
-$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+$(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strconv.cpp
 
-$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+$(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stream.cpp
 
-$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+$(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\string.cpp
 
-$(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
 
-$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringops.cpp
 
-$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strvararg.cpp
 
-$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+$(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sysopt.cpp
 
-$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp
 
-$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textbuf.cpp
 
-$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+$(OBJS)\monolib_common_time.obj: ..\..\src\common\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
 
-$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
+$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
-$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp
 
-$(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 
-$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+$(OBJS)\monolib_translation.obj: ..\..\src\common\translation.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\translation.cpp
 
-$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
 
-$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\unichar.cpp
 
-$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
 
-$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp
 
-$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
 
-$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
 
-$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp
 
-$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
 
-$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
 
-$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
+$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp
 
-$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp
 
-$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+$(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp
 
-$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
+$(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
 
-$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
 
-$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
 
-$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+$(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
-$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+$(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
 
-$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
+$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp
 
-$(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+$(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dde.cpp
 
-$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+$(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dir.cpp
 
-$(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
 
-$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+$(OBJS)\monolib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
 
-$(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+$(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
 
-$(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
+$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\power.cpp
 
-$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+$(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\regconf.cpp
 
-$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+$(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\registry.cpp
 
-$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+$(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp
 
-$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
 
-$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
 
-$(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\thread.cpp
 
-$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+$(OBJS)\monolib_msw_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timer.cpp
 
-$(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+$(OBJS)\monolib_msw_utils.obj: ..\..\src\msw\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utils.cpp
 
-$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+$(OBJS)\monolib_msw_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
 
-$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
 
-$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+$(OBJS)\monolib_wince_time.obj: ..\..\src\msw\wince\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\time.cpp
 
-$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+$(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
 
-$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+$(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
 
-$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+$(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\msgout.cpp
 
-$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
 
-$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+$(OBJS)\monolib_msw_main.obj: ..\..\src\msw\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp
 
-$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+$(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
 
-$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+$(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\volume.cpp
 
-$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+$(OBJS)\monolib_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
 
-$(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
+$(OBJS)\monolib_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
 
-$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+$(OBJS)\monolib_osx_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
 
-$(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+$(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp
 
-$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+$(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ftp.cpp
 
-$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+$(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\http.cpp
 
-$(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+$(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\protocol.cpp
 
-$(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+$(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp
 
-$(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+$(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckfile.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
+$(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
-!endif
+$(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_bitmap.obj: ..\..\src\msw\bitmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
-!endif
+$(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\socket.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp
-!endif
+$(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_caret.obj: ..\..\src\msw\caret.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp
-!endif
+$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
-!endif
+$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_colour.obj: ..\..\src\msw\colour.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp
-!endif
+$(OBJS)\monolib_net.obj: ..\..\src\msw\wince\net.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\net.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cursor.obj: ..\..\src\msw\cursor.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
-!endif
+$(OBJS)\monolib_gprint.obj: ..\..\src\gtk\gnome\gprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\gnome\gprint.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_data.obj: ..\..\src\msw\data.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp
-!endif
+$(OBJS)\monolib_gtk1_bmpbuttn.obj: ..\..\src\gtk1\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dc.obj: ..\..\src\msw\dc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp
-!endif
+$(OBJS)\monolib_gtk1_button.obj: ..\..\src\gtk1\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcclient.obj: ..\..\src\msw\dcclient.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
-!endif
+$(OBJS)\monolib_gtk1_checkbox.obj: ..\..\src\gtk1\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
-!endif
+$(OBJS)\monolib_gtk1_checklst.obj: ..\..\src\gtk1\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcprint.obj: ..\..\src\msw\dcprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
-!endif
+$(OBJS)\monolib_gtk1_choice.obj: ..\..\src\gtk1\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
-!endif
+$(OBJS)\monolib_gtk1_combobox.obj: ..\..\src\gtk1\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\combobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dialup.obj: ..\..\src\msw\dialup.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
-!endif
+$(OBJS)\monolib_gtk1_control.obj: ..\..\src\gtk1\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\control.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp
-!endif
+$(OBJS)\monolib_gtk1_dialog.obj: ..\..\src\gtk1\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp
-!endif
+$(OBJS)\monolib_gtk1_filedlg.obj: ..\..\src\gtk1\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\filedlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
-!endif
+$(OBJS)\monolib_gtk1_fontdlg.obj: ..\..\src\gtk1\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\fontdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp
-!endif
+$(OBJS)\monolib_gtk1_frame.obj: ..\..\src\gtk1\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\frame.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
-!endif
+$(OBJS)\monolib_gtk1_gauge.obj: ..\..\src\gtk1\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
-!endif
+$(OBJS)\monolib_gtk1_listbox.obj: ..\..\src\gtk1\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
-!endif
+$(OBJS)\monolib_gtk1_mdi.obj: ..\..\src\gtk1\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\mdi.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
-!endif
+$(OBJS)\monolib_gtk1_menu.obj: ..\..\src\gtk1\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
-!endif
+$(OBJS)\monolib_gtk1_mnemonics.obj: ..\..\src\gtk1\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\mnemonics.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
-!endif
+$(OBJS)\monolib_gtk1_notebook.obj: ..\..\src\gtk1\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp
-!endif
+$(OBJS)\monolib_gtk1_radiobox.obj: ..\..\src\gtk1\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
-!endif
+$(OBJS)\monolib_gtk1_radiobut.obj: ..\..\src\gtk1\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
+$(OBJS)\monolib_gtk1_scrolbar.obj: ..\..\src\gtk1\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
+$(OBJS)\monolib_gtk1_scrolwin.obj: ..\..\src\gtk1\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\scrolwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
-!endif
+$(OBJS)\monolib_gtk1_slider.obj: ..\..\src\gtk1\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
-!endif
+$(OBJS)\monolib_gtk1_spinbutt.obj: ..\..\src\gtk1\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
-!endif
+$(OBJS)\monolib_gtk1_spinctrl.obj: ..\..\src\gtk1\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\spinctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp
-!endif
+$(OBJS)\monolib_gtk1_statbmp.obj: ..\..\src\gtk1\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp
-!endif
+$(OBJS)\monolib_gtk1_statbox.obj: ..\..\src\gtk1\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
-!endif
+$(OBJS)\monolib_gtk1_statline.obj: ..\..\src\gtk1\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
-!endif
+$(OBJS)\monolib_gtk1_stattext.obj: ..\..\src\gtk1\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
-!endif
+$(OBJS)\monolib_gtk1_toolbar.obj: ..\..\src\gtk1\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp
-!endif
+$(OBJS)\monolib_gtk1_textctrl.obj: ..\..\src\gtk1\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
-!endif
+$(OBJS)\monolib_gtk1_tglbtn.obj: ..\..\src\gtk1\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp
-!endif
+$(OBJS)\monolib_motif_accel.obj: ..\..\src\motif\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\accel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
-!endif
+$(OBJS)\monolib_motif_app.obj: ..\..\src\motif\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\app.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
-!endif
+$(OBJS)\monolib_motif_bmpbuttn.obj: ..\..\src\motif\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
-!endif
+$(OBJS)\monolib_bmpmotif.obj: ..\..\src\motif\bmpmotif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\bmpmotif.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
-!endif
+$(OBJS)\monolib_motif_button.obj: ..\..\src\motif\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp
-!endif
+$(OBJS)\monolib_motif_checkbox.obj: ..\..\src\motif\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
-!endif
+$(OBJS)\monolib_motif_checklst.obj: ..\..\src\motif\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp
-!endif
+$(OBJS)\monolib_motif_choice.obj: ..\..\src\motif\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
-!endif
+$(OBJS)\monolib_motif_clipbrd.obj: ..\..\src\motif\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\clipbrd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
+$(OBJS)\monolib_motif_colour.obj: ..\..\src\motif\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\colour.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
-!endif
+$(OBJS)\monolib_motif_combobox.obj: ..\..\src\motif\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\combobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
-!endif
+$(OBJS)\monolib_combobox_native.obj: ..\..\src\motif\combobox_native.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\combobox_native.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
-!endif
+$(OBJS)\monolib_motif_control.obj: ..\..\src\motif\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\control.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
-!endif
+$(OBJS)\monolib_motif_cursor.obj: ..\..\src\motif\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\cursor.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
-!endif
+$(OBJS)\monolib_motif_data.obj: ..\..\src\motif\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\data.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
+$(OBJS)\monolib_motif_dataobj.obj: ..\..\src\motif\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dataobj.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
+$(OBJS)\monolib_motif_dc.obj: ..\..\src\motif\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dc.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
+$(OBJS)\monolib_motif_dcclient.obj: ..\..\src\motif\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dcclient.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
+$(OBJS)\monolib_motif_dcmemory.obj: ..\..\src\motif\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dcmemory.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
+$(OBJS)\monolib_motif_dcscreen.obj: ..\..\src\motif\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dcscreen.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
+$(OBJS)\monolib_motif_dialog.obj: ..\..\src\motif\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
+$(OBJS)\monolib_motif_evtloop.obj: ..\..\src\motif\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\evtloop.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
+$(OBJS)\monolib_motif_filedlg.obj: ..\..\src\motif\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\filedlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
+$(OBJS)\monolib_motif_font.obj: ..\..\src\motif\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\font.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
+$(OBJS)\monolib_motif_frame.obj: ..\..\src\motif\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\frame.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
+$(OBJS)\monolib_motif_gauge.obj: ..\..\src\motif\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
+$(OBJS)\monolib_sockmot.obj: ..\..\src\motif\sockmot.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\sockmot.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
+$(OBJS)\monolib_motif_icon.obj: ..\..\src\motif\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\icon.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
+$(OBJS)\monolib_motif_listbox.obj: ..\..\src\motif\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
+$(OBJS)\monolib_motif_main.obj: ..\..\src\motif\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\main.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
+$(OBJS)\monolib_motif_menu.obj: ..\..\src\motif\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
+$(OBJS)\monolib_motif_menuitem.obj: ..\..\src\motif\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\menuitem.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
+$(OBJS)\monolib_motif_minifram.obj: ..\..\src\motif\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\minifram.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
+$(OBJS)\monolib_motif_msgdlg.obj: ..\..\src\motif\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\msgdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
+$(OBJS)\monolib_motif_popupwin.obj: ..\..\src\motif\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\popupwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
+$(OBJS)\monolib_motif_radiobox.obj: ..\..\src\motif\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
+$(OBJS)\monolib_motif_radiobut.obj: ..\..\src\motif\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
-!endif
+$(OBJS)\monolib_motif_scrolbar.obj: ..\..\src\motif\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
-!endif
+$(OBJS)\monolib_motif_settings.obj: ..\..\src\motif\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\settings.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
-!endif
+$(OBJS)\monolib_motif_slider.obj: ..\..\src\motif\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
-!endif
+$(OBJS)\monolib_motif_spinbutt.obj: ..\..\src\motif\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
-!endif
+$(OBJS)\monolib_motif_statbmp.obj: ..\..\src\motif\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp
-!endif
+$(OBJS)\monolib_motif_statbox.obj: ..\..\src\motif\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
-!endif
+$(OBJS)\monolib_motif_stattext.obj: ..\..\src\motif\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docmdi.cpp
-!endif
+$(OBJS)\monolib_motif_textctrl.obj: ..\..\src\motif\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docview.cpp
-!endif
+$(OBJS)\monolib_motif_textentry.obj: ..\..\src\motif\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\textentry.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp
-!endif
+$(OBJS)\monolib_motif_timer.obj: ..\..\src\motif\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\timer.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
-!endif
+$(OBJS)\monolib_motif_toolbar.obj: ..\..\src\motif\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
+$(OBJS)\monolib_motif_toplevel.obj: ..\..\src\motif\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\toplevel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
-!endif
+$(OBJS)\monolib_motif_utils.obj: ..\..\src\motif\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\utils.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
-!endif
+$(OBJS)\monolib_motif_window.obj: ..\..\src\motif\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\motif\window.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
-!endif
+$(OBJS)\monolib_xmcombo.obj: ..\..\src\motif\xmcombo\xmcombo.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\motif\xmcombo\xmcombo.c
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
-!endif
+$(OBJS)\monolib_generic_notebook.obj: ..\..\src\generic\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
-!endif
+$(OBJS)\monolib_generic_statline.obj: ..\..\src\generic\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
-!endif
+$(OBJS)\monolib_tabg.obj: ..\..\src\generic\tabg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
-!endif
+$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmap.cpp
-!endif
+$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
-!endif
+$(OBJS)\monolib_msw_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\framecmn.cpp
-!endif
+$(OBJS)\monolib_wince_checklst.obj: ..\..\src\msw\wince\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
-!endif
+$(OBJS)\monolib_choicece.obj: ..\..\src\msw\wince\choicece.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\choicece.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp
-!endif
+$(OBJS)\monolib_crt.obj: ..\..\src\msw\wince\crt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\crt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp
-!endif
+$(OBJS)\monolib_filedlgwce.obj: ..\..\src\msw\wince\filedlgwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\filedlgwce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\geometry.cpp
-!endif
+$(OBJS)\monolib_filefnwce.obj: ..\..\src\msw\wince\filefnwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\filefnwce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp
-!endif
+$(OBJS)\monolib_helpwce.obj: ..\..\src\msw\wince\helpwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\helpwce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
-!endif
+$(OBJS)\monolib_menuce.obj: ..\..\src\msw\wince\menuce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\menuce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
-!endif
+$(OBJS)\monolib_tbarwce.obj: ..\..\src\msw\wince\tbarwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\tbarwce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
-!endif
+$(OBJS)\monolib_textctrlce.obj: ..\..\src\msw\wince\textctrlce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\wince\textctrlce.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
-!endif
+$(OBJS)\monolib_carbon_anybutton.obj: ..\..\src\osx\carbon\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\anybutton.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp
-!endif
+$(OBJS)\monolib_carbon_bmpbuttn.obj: ..\..\src\osx\carbon\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagall.cpp
-!endif
+$(OBJS)\monolib_carbon_button.obj: ..\..\src\osx\carbon\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp
-!endif
+$(OBJS)\monolib_carbon_checkbox.obj: ..\..\src\osx\carbon\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\image.cpp
-!endif
+$(OBJS)\monolib_carbon_choice.obj: ..\..\src\osx\carbon\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagfill.cpp
-!endif
+$(OBJS)\monolib_carbon_colordlg.obj: ..\..\src\osx\carbon\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\colordlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imaggif.cpp
-!endif
+$(OBJS)\monolib_carbon_dialog.obj: ..\..\src\osx\carbon\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagiff.cpp
-!endif
+$(OBJS)\monolib_carbon_dirdlg.obj: ..\..\src\osx\carbon\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\dirdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
-!endif
+$(OBJS)\monolib_carbon_dnd.obj: ..\..\src\osx\carbon\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\dnd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp
-!endif
+$(OBJS)\monolib_carbon_evtloop.obj: ..\..\src\osx\carbon\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\evtloop.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpng.cpp
-!endif
+$(OBJS)\monolib_carbon_filedlg.obj: ..\..\src\osx\carbon\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\filedlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp
-!endif
+$(OBJS)\monolib_carbon_gauge.obj: ..\..\src\osx\carbon\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtga.cpp
-!endif
+$(OBJS)\monolib_carbon_listbox.obj: ..\..\src\osx\carbon\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp
-!endif
+$(OBJS)\monolib_listctrl_mac.obj: ..\..\src\osx\carbon\listctrl_mac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\listctrl_mac.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp
-!endif
+$(OBJS)\monolib_carbon_menu.obj: ..\..\src\osx\carbon\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\layout.cpp
-!endif
+$(OBJS)\monolib_carbon_menuitem.obj: ..\..\src\osx\carbon\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\menuitem.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
-!endif
+$(OBJS)\monolib_carbon_msgdlg.obj: ..\..\src\osx\carbon\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\msgdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
-!endif
+$(OBJS)\monolib_carbon_nonownedwnd.obj: ..\..\src\osx\carbon\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\nonownedwnd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp
-!endif
+$(OBJS)\monolib_notebmac.obj: ..\..\src\osx\carbon\notebmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\notebmac.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
-!endif
+$(OBJS)\monolib_carbon_printdlg.obj: ..\..\src\osx\carbon\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\printdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
-!endif
+$(OBJS)\monolib_carbon_radiobut.obj: ..\..\src\osx\carbon\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
-!endif
+$(OBJS)\monolib_carbon_scrolbar.obj: ..\..\src\osx\carbon\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
-!endif
+$(OBJS)\monolib_carbon_slider.obj: ..\..\src\osx\carbon\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
-!endif
+$(OBJS)\monolib_carbon_spinbutt.obj: ..\..\src\osx\carbon\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
-!endif
+$(OBJS)\monolib_carbon_srchctrl.obj: ..\..\src\osx\carbon\srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\srchctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
-!endif
+$(OBJS)\monolib_carbon_statbmp.obj: ..\..\src\osx\carbon\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
-!endif
+$(OBJS)\monolib_carbon_statbox.obj: ..\..\src\osx\carbon\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
-!endif
+$(OBJS)\monolib_statlmac.obj: ..\..\src\osx\carbon\statlmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\statlmac.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp
-!endif
+$(OBJS)\monolib_carbon_stattext.obj: ..\..\src\osx\carbon\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
-!endif
+$(OBJS)\monolib_carbon_textctrl.obj: ..\..\src\osx\carbon\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
-!endif
+$(OBJS)\monolib_carbon_tglbtn.obj: ..\..\src\osx\carbon\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
-!endif
+$(OBJS)\monolib_carbon_toolbar.obj: ..\..\src\osx\carbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
-!endif
+$(OBJS)\monolib_carbon_tooltip.obj: ..\..\src\osx\carbon\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\tooltip.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
-!endif
+$(OBJS)\monolib_carbon_window.obj: ..\..\src\osx\carbon\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\window.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
-!endif
+$(OBJS)\monolib_cocoa_anybutton.obj: ..\..\src\osx\cocoa\anybutton.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_button.obj: ..\..\src\osx\cocoa\button.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_checkbox.obj: ..\..\src\osx\cocoa\checkbox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_choice.obj: ..\..\src\osx\cocoa\choice.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_colour.obj: ..\..\src\osx\cocoa\colour.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stockitem.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_combobox.obj: ..\..\src\osx\cocoa\combobox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_dialog.obj: ..\..\src\osx\cocoa\dialog.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_dirdlg.obj: ..\..\src\osx\cocoa\dirdlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
-!endif
+$(OBJS)\monolib_cocoa_dnd.obj: ..\..\src\osx\cocoa\dnd.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_evtloop.obj: ..\..\src\osx\cocoa\evtloop.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\treebase.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_filedlg.obj: ..\..\src\osx\cocoa\filedlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valgen.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_gauge.obj: ..\..\src\osx\cocoa\gauge.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\validate.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_listbox.obj: ..\..\src\osx\cocoa\listbox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_menu.obj: ..\..\src\osx\cocoa\menu.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_menuitem.obj: ..\..\src\osx\cocoa\menuitem.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_msgdlg.obj: ..\..\src\osx\cocoa\msgdlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
-!endif
+$(OBJS)\monolib_cocoa_nonownedwnd.obj: ..\..\src\osx\cocoa\nonownedwnd.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
-!endif
+$(OBJS)\monolib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_slider.obj: ..\..\src\osx\cocoa\slider.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_spinbutt.obj: ..\..\src\osx\cocoa\spinbutt.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
-!endif
+$(OBJS)\monolib_cocoa_srchctrl.obj: ..\..\src\osx\cocoa\srchctrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_statbox.obj: ..\..\src\osx\cocoa\statbox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
-!endif
+$(OBJS)\monolib_cocoa_statline.obj: ..\..\src\osx\cocoa\statline.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_stattext.obj: ..\..\src\osx\cocoa\stattext.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_textctrl.obj: ..\..\src\osx\cocoa\textctrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
-!endif
+$(OBJS)\monolib_cocoa_tglbtn.obj: ..\..\src\osx\cocoa\tglbtn.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_toolbar.obj: ..\..\src\osx\cocoa\toolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_tooltip.obj: ..\..\src\osx\cocoa\tooltip.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_window.obj: ..\..\src\osx\cocoa\window.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
-!endif
+$(OBJS)\monolib_iphone_anybutton.obj: ..\..\src\osx\iphone\anybutton.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp
-!endif
+$(OBJS)\monolib_iphone_button.obj: ..\..\src\osx\iphone\button.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\renderg.cpp
-!endif
+$(OBJS)\monolib_iphone_checkbox.obj: ..\..\src\osx\iphone\checkbox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
-!endif
+$(OBJS)\monolib_iphone_dialog.obj: ..\..\src\osx\iphone\dialog.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\selstore.cpp
-!endif
+$(OBJS)\monolib_iphone_evtloop.obj: ..\..\src\osx\iphone\evtloop.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
-!endif
+$(OBJS)\monolib_iphone_gauge.obj: ..\..\src\osx\iphone\gauge.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\splitter.cpp
-!endif
+$(OBJS)\monolib_iphone_msgdlg.obj: ..\..\src\osx\iphone\msgdlg.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
-!endif
+$(OBJS)\monolib_iphone_nonownedwnd.obj: ..\..\src\osx\iphone\nonownedwnd.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
-!endif
+$(OBJS)\monolib_iphone_scrolbar.obj: ..\..\src\osx\iphone\scrolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
-!endif
+$(OBJS)\monolib_iphone_slider.obj: ..\..\src\osx\iphone\slider.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
+$(OBJS)\monolib_iphone_stattext.obj: ..\..\src\osx\iphone\stattext.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
-!endif
+$(OBJS)\monolib_iphone_textctrl.obj: ..\..\src\osx\iphone\textctrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
-!endif
+$(OBJS)\monolib_iphone_toolbar.obj: ..\..\src\osx\iphone\toolbar.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
+$(OBJS)\monolib_iphone_utils.obj: ..\..\src\osx\iphone\utils.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
-!endif
+$(OBJS)\monolib_iphone_window.obj: ..\..\src\osx\iphone\window.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp
-!endif
+$(OBJS)\monolib_NSBox.obj: ..\..\src\cocoa\NSBox.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
-!endif
+$(OBJS)\monolib_NSButton.obj: ..\..\src\cocoa\NSButton.mm
 
-$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\monolib_NSControl.obj: ..\..\src\cocoa\NSControl.mm
 
-$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\event.cpp
+$(OBJS)\monolib_NSMenu.obj: ..\..\src\cocoa\NSMenu.mm
 
-$(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+$(OBJS)\monolib_NSPanel.obj: ..\..\src\cocoa\NSPanel.mm
 
-$(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\msgout.cpp
+$(OBJS)\monolib_NSScroller.obj: ..\..\src\cocoa\NSScroller.mm
 
-$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+$(OBJS)\monolib_NSSlider.obj: ..\..\src\cocoa\NSSlider.mm
 
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+$(OBJS)\monolib_NSTabView.obj: ..\..\src\cocoa\NSTabView.mm
 
-$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp
+$(OBJS)\monolib_NSTableView.obj: ..\..\src\cocoa\NSTableView.mm
 
-$(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
+$(OBJS)\monolib_NSTextField.obj: ..\..\src\cocoa\NSTextField.mm
 
-$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+$(OBJS)\monolib_NSView.obj: ..\..\src\cocoa\NSView.mm
 
-$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+$(OBJS)\monolib_NSWindow.obj: ..\..\src\cocoa\NSWindow.mm
 
-$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+$(OBJS)\monolib_ObjcRef.obj: ..\..\src\cocoa\ObjcRef.mm
 
-$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+$(OBJS)\monolib_cocoa_app.obj: ..\..\src\cocoa\app.mm
 
-$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+$(OBJS)\monolib_cocoa_bitmap.obj: ..\..\src\cocoa\bitmap.mm
 
-$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp
+$(OBJS)\monolib_cocoa_bmpbuttn.obj: ..\..\src\cocoa\bmpbuttn.mm
 
-$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+$(OBJS)\monolib_cocoa_brush.obj: ..\..\src\cocoa\brush.mm
 
-$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+$(OBJS)\monolib_src_cocoa_button.obj: ..\..\src\cocoa\button.mm
 
-$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+$(OBJS)\monolib_src_cocoa_checkbox.obj: ..\..\src\cocoa\checkbox.mm
 
-$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp
+$(OBJS)\monolib_cocoa_checklst.obj: ..\..\src\cocoa\checklst.mm
 
-$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+$(OBJS)\monolib_src_cocoa_choice.obj: ..\..\src\cocoa\choice.mm
 
-$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp
+$(OBJS)\monolib_cocoa_clipbrd.obj: ..\..\src\cocoa\clipbrd.mm
 
-$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+$(OBJS)\monolib_cocoa_colordlg.obj: ..\..\src\cocoa\colordlg.mm
 
-$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+$(OBJS)\monolib_src_cocoa_colour.obj: ..\..\src\cocoa\colour.mm
 
-$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+$(OBJS)\monolib_src_cocoa_combobox.obj: ..\..\src\cocoa\combobox.mm
 
-$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+$(OBJS)\monolib_cocoa_control.obj: ..\..\src\cocoa\control.mm
 
-$(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
+$(OBJS)\monolib_cocoa_cursor.obj: ..\..\src\cocoa\cursor.mm
 
-$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+$(OBJS)\monolib_cocoa_data.obj: ..\..\src\cocoa\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\cocoa\data.cpp
 
-$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+$(OBJS)\monolib_cocoa_dataobj.obj: ..\..\src\cocoa\dataobj.mm
 
-$(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+$(OBJS)\monolib_cocoa_dc.obj: ..\..\src\cocoa\dc.mm
 
-$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+$(OBJS)\monolib_cocoa_dcclient.obj: ..\..\src\cocoa\dcclient.mm
 
-$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+$(OBJS)\monolib_cocoa_dcmemory.obj: ..\..\src\cocoa\dcmemory.mm
 
-$(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
+$(OBJS)\monolib_cocoa_dcscreen.obj: ..\..\src\cocoa\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\cocoa\dcscreen.cpp
 
-$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+$(OBJS)\monolib_src_cocoa_dialog.obj: ..\..\src\cocoa\dialog.mm
 
-$(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+$(OBJS)\monolib_src_cocoa_dirdlg.obj: ..\..\src\cocoa\dirdlg.mm
 
-$(OBJS)\corelib_metafile.obj: ..\..\src\msw\metafile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\metafile.cpp
+$(OBJS)\monolib_cocoa_display.obj: ..\..\src\cocoa\display.mm
 
-$(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+$(OBJS)\monolib_cocoa_drawer.obj: ..\..\src\cocoa\drawer.mm
 
-$(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+$(OBJS)\monolib_src_cocoa_evtloop.obj: ..\..\src\cocoa\evtloop.mm
 
-$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+$(OBJS)\monolib_src_cocoa_filedlg.obj: ..\..\src\cocoa\filedlg.mm
 
-$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+$(OBJS)\monolib_cocoa_font.obj: ..\..\src\cocoa\font.mm
 
-$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+$(OBJS)\monolib_cocoa_fontdlg.obj: ..\..\src\cocoa\fontdlg.mm
 
-$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+$(OBJS)\monolib_cocoa_fontenum.obj: ..\..\src\cocoa\fontenum.mm
 
-$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+$(OBJS)\monolib_cocoa_fontutil.obj: ..\..\src\cocoa\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\cocoa\fontutil.cpp
 
-$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+$(OBJS)\monolib_cocoa_frame.obj: ..\..\src\cocoa\frame.mm
 
-$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+$(OBJS)\monolib_src_cocoa_gauge.obj: ..\..\src\cocoa\gauge.mm
 
-$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+$(OBJS)\monolib_cocoa_icon.obj: ..\..\src\cocoa\icon.mm
 
-$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+$(OBJS)\monolib_src_cocoa_listbox.obj: ..\..\src\cocoa\listbox.mm
 
-$(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+$(OBJS)\monolib_cocoa_main.obj: ..\..\src\cocoa\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\cocoa\main.cpp
 
-$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+$(OBJS)\monolib_mbarman.obj: ..\..\src\cocoa\mbarman.mm
 
-$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+$(OBJS)\monolib_cocoa_mdi.obj: ..\..\src\cocoa\mdi.mm
 
-$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+$(OBJS)\monolib_src_cocoa_menu.obj: ..\..\src\cocoa\menu.mm
 
-$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+$(OBJS)\monolib_src_cocoa_menuitem.obj: ..\..\src\cocoa\menuitem.mm
 
-$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+$(OBJS)\monolib_src_cocoa_msgdlg.obj: ..\..\src\cocoa\msgdlg.mm
 
-$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+$(OBJS)\monolib_src_cocoa_notebook.obj: ..\..\src\cocoa\notebook.mm
 
-$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+$(OBJS)\monolib_cocoa_pen.obj: ..\..\src\cocoa\pen.mm
 
-$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
+$(OBJS)\monolib_cocoa_radiobox.obj: ..\..\src\cocoa\radiobox.mm
 
-$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+$(OBJS)\monolib_src_cocoa_radiobut.obj: ..\..\src\cocoa\radiobut.mm
 
-$(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+$(OBJS)\monolib_cocoa_region.obj: ..\..\src\cocoa\region.mm
 
-$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+$(OBJS)\monolib_src_cocoa_scrolbar.obj: ..\..\src\cocoa\scrolbar.mm
 
-$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+$(OBJS)\monolib_cocoa_settings.obj: ..\..\src\cocoa\settings.mm
 
-$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+$(OBJS)\monolib_src_cocoa_slider.obj: ..\..\src\cocoa\slider.mm
 
-$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+$(OBJS)\monolib_cocoa_sound.obj: ..\..\src\cocoa\sound.mm
 
-$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\monolib_src_cocoa_spinbutt.obj: ..\..\src\cocoa\spinbutt.mm
 
-$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\monolib_cocoa_statbmp.obj: ..\..\src\cocoa\statbmp.mm
 
-$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\monolib_src_cocoa_statbox.obj: ..\..\src\cocoa\statbox.mm
 
-$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+$(OBJS)\monolib_statline2.obj: ..\..\src\cocoa\statline2.mm
 
-$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+$(OBJS)\monolib_src_cocoa_stattext.obj: ..\..\src\cocoa\stattext.mm
 
-$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+$(OBJS)\monolib_src_cocoa_textctrl.obj: ..\..\src\cocoa\textctrl.mm
 
-$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
+$(OBJS)\monolib_cocoa_timer.obj: ..\..\src\cocoa\timer.mm
 
-$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\monolib_src_cocoa_toolbar.obj: ..\..\src\cocoa\toolbar.mm
 
-$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+$(OBJS)\monolib_src_cocoa_tooltip.obj: ..\..\src\cocoa\tooltip.mm
 
-$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
+$(OBJS)\monolib_cocoa_toplevel.obj: ..\..\src\cocoa\toplevel.mm
 
-$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+$(OBJS)\monolib_src_cocoa_utils.obj: ..\..\src\cocoa\utils.mm
 
-$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+$(OBJS)\monolib_cocoa_utilsexc.obj: ..\..\src\cocoa\utilsexc.mm
 
-$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+$(OBJS)\monolib_src_cocoa_window.obj: ..\..\src\cocoa\window.mm
 
-$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+$(OBJS)\monolib_os2_accel.obj: ..\..\src\os2\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\accel.cpp
 
-$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
+$(OBJS)\monolib_os2_app.obj: ..\..\src\os2\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\app.cpp
 
-$(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+$(OBJS)\monolib_os2_bitmap.obj: ..\..\src\os2\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\bitmap.cpp
 
-$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+$(OBJS)\monolib_os2_bmpbuttn.obj: ..\..\src\os2\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\bmpbuttn.cpp
 
-$(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+$(OBJS)\monolib_os2_brush.obj: ..\..\src\os2\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\brush.cpp
 
-$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+$(OBJS)\monolib_os2_button.obj: ..\..\src\os2\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\button.cpp
 
-$(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+$(OBJS)\monolib_os2_checkbox.obj: ..\..\src\os2\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\checkbox.cpp
 
-$(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
+$(OBJS)\monolib_os2_checklst.obj: ..\..\src\os2\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\checklst.cpp
 
-$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+$(OBJS)\monolib_os2_choice.obj: ..\..\src\os2\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\choice.cpp
 
-$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+$(OBJS)\monolib_os2_clipbrd.obj: ..\..\src\os2\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\clipbrd.cpp
 
-$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+$(OBJS)\monolib_os2_colour.obj: ..\..\src\os2\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\colour.cpp
 
-$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+$(OBJS)\monolib_os2_combobox.obj: ..\..\src\os2\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\combobox.cpp
 
-$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+$(OBJS)\monolib_os2_control.obj: ..\..\src\os2\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\control.cpp
 
-$(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+$(OBJS)\monolib_os2_cursor.obj: ..\..\src\os2\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\cursor.cpp
 
-$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+$(OBJS)\monolib_os2_data.obj: ..\..\src\os2\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\data.cpp
 
-$(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+$(OBJS)\monolib_os2_dataobj.obj: ..\..\src\os2\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dataobj.cpp
 
-$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+$(OBJS)\monolib_os2_dc.obj: ..\..\src\os2\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dc.cpp
 
-$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\monolib_os2_dcclient.obj: ..\..\src\os2\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dcclient.cpp
 
-$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+$(OBJS)\monolib_os2_dcmemory.obj: ..\..\src\os2\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dcmemory.cpp
 
-$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+$(OBJS)\monolib_os2_dcprint.obj: ..\..\src\os2\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dcprint.cpp
 
-$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+$(OBJS)\monolib_os2_dcscreen.obj: ..\..\src\os2\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dcscreen.cpp
 
-$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+$(OBJS)\monolib_os2_dialog.obj: ..\..\src\os2\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dialog.cpp
 
-$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+$(OBJS)\monolib_os2_dnd.obj: ..\..\src\os2\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\dnd.cpp
 
-$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+$(OBJS)\monolib_os2_evtloop.obj: ..\..\src\os2\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\evtloop.cpp
 
-$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+$(OBJS)\monolib_os2_filedlg.obj: ..\..\src\os2\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\filedlg.cpp
 
-$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+$(OBJS)\monolib_os2_font.obj: ..\..\src\os2\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\font.cpp
 
-$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+$(OBJS)\monolib_os2_fontdlg.obj: ..\..\src\os2\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\fontdlg.cpp
 
-$(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
+$(OBJS)\monolib_os2_fontenum.obj: ..\..\src\os2\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\fontenum.cpp
 
-$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+$(OBJS)\monolib_os2_fontutil.obj: ..\..\src\os2\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\fontutil.cpp
 
-$(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+$(OBJS)\monolib_os2_frame.obj: ..\..\src\os2\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\frame.cpp
 
-$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+$(OBJS)\monolib_os2_gauge.obj: ..\..\src\os2\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\gauge.cpp
 
-$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+$(OBJS)\monolib_os2_gdiimage.obj: ..\..\src\os2\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\gdiimage.cpp
 
-$(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+$(OBJS)\monolib_sockpm.obj: ..\..\src\os2\sockpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\sockpm.cpp
 
-$(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+$(OBJS)\monolib_os2_helpwin.obj: ..\..\src\os2\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\helpwin.cpp
 
-$(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+$(OBJS)\monolib_os2_icon.obj: ..\..\src\os2\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\icon.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
+$(OBJS)\monolib_os2_iniconf.obj: ..\..\src\os2\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\iniconf.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
-!endif
+$(OBJS)\monolib_os2_listbox.obj: ..\..\src\os2\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_bitmap.obj: ..\..\src\msw\bitmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
-!endif
+$(OBJS)\monolib_os2_main.obj: ..\..\src\os2\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\main.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp
-!endif
+$(OBJS)\monolib_os2_menu.obj: ..\..\src\os2\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_caret.obj: ..\..\src\msw\caret.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp
-!endif
+$(OBJS)\monolib_os2_menuitem.obj: ..\..\src\os2\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\menuitem.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
-!endif
+$(OBJS)\monolib_os2_metafile.obj: ..\..\src\os2\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\metafile.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_colour.obj: ..\..\src\msw\colour.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp
-!endif
+$(OBJS)\monolib_os2_minifram.obj: ..\..\src\os2\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\minifram.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_cursor.obj: ..\..\src\msw\cursor.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
-!endif
+$(OBJS)\monolib_os2_msgdlg.obj: ..\..\src\os2\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\msgdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_data.obj: ..\..\src\msw\data.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp
-!endif
+$(OBJS)\monolib_os2_nativdlg.obj: ..\..\src\os2\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\nativdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dc.obj: ..\..\src\msw\dc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp
-!endif
+$(OBJS)\monolib_os2_notebook.obj: ..\..\src\os2\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcclient.obj: ..\..\src\msw\dcclient.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
-!endif
+$(OBJS)\monolib_os2_ownerdrw.obj: ..\..\src\os2\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\ownerdrw.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
-!endif
+$(OBJS)\monolib_os2_palette.obj: ..\..\src\os2\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\palette.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcprint.obj: ..\..\src\msw\dcprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
-!endif
+$(OBJS)\monolib_os2_pen.obj: ..\..\src\os2\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\pen.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
-!endif
+$(OBJS)\monolib_os2_popupwin.obj: ..\..\src\os2\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\popupwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dialup.obj: ..\..\src\msw\dialup.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
-!endif
+$(OBJS)\monolib_os2_print.obj: ..\..\src\os2\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\print.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp
-!endif
+$(OBJS)\monolib_os2_radiobox.obj: ..\..\src\os2\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp
-!endif
+$(OBJS)\monolib_os2_radiobut.obj: ..\..\src\os2\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
-!endif
+$(OBJS)\monolib_os2_region.obj: ..\..\src\os2\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\region.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp
-!endif
+$(OBJS)\monolib_os2_scrolbar.obj: ..\..\src\os2\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontenum.obj: ..\..\src\msw\fontenum.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
-!endif
+$(OBJS)\monolib_os2_settings.obj: ..\..\src\os2\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\settings.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontutil.obj: ..\..\src\msw\fontutil.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
-!endif
+$(OBJS)\monolib_os2_slider.obj: ..\..\src\os2\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
-!endif
+$(OBJS)\monolib_os2_spinbutt.obj: ..\..\src\os2\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
-!endif
+$(OBJS)\monolib_os2_spinctrl.obj: ..\..\src\os2\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\spinctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
-!endif
+$(OBJS)\monolib_os2_statbmp.obj: ..\..\src\os2\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp
-!endif
+$(OBJS)\monolib_os2_statbox.obj: ..\..\src\os2\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
-!endif
+$(OBJS)\monolib_os2_statline.obj: ..\..\src\os2\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
+$(OBJS)\monolib_os2_stattext.obj: ..\..\src\os2\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
+$(OBJS)\monolib_os2_textctrl.obj: ..\..\src\os2\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
-!endif
+$(OBJS)\monolib_os2_textentry.obj: ..\..\src\os2\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\textentry.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
-!endif
+$(OBJS)\monolib_os2_tglbtn.obj: ..\..\src\os2\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
-!endif
+$(OBJS)\monolib_os2_timer.obj: ..\..\src\os2\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\timer.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp
-!endif
+$(OBJS)\monolib_os2_toolbar.obj: ..\..\src\os2\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp
-!endif
+$(OBJS)\monolib_os2_tooltip.obj: ..\..\src\os2\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\tooltip.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
-!endif
+$(OBJS)\monolib_os2_toplevel.obj: ..\..\src\os2\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\toplevel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
-!endif
+$(OBJS)\monolib_os2_utilsgui.obj: ..\..\src\os2\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\utilsgui.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
-!endif
+$(OBJS)\monolib_os2_window.obj: ..\..\src\os2\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\window.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp
-!endif
+$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
-!endif
+$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp
-!endif
+$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
-!endif
+$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
-!endif
+$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
-!endif
+$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
-!endif
+$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
-!endif
+$(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
-!endif
+$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
-!endif
+$(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
-!endif
+$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
+$(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
-!endif
+$(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
-!endif
+$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
-!endif
+$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
-!endif
+$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
-!endif
+$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
+$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
+$(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
+$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
+$(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
+$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
+$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
+$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
+$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
+$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
+$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
+$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
+$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
+$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
+$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
+$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
+$(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
+$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
+$(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
+$(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
+$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
+$(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
+$(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
-!endif
+$(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
-!endif
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
-!endif
+$(OBJS)\monolib_carbon_mediactrl.obj: ..\..\src\osx\carbon\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\mediactrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp
-!endif
+$(OBJS)\monolib_osx_cocoa_mediactrl.obj: ..\..\src\osx\cocoa\mediactrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
-!endif
+$(OBJS)\monolib_src_cocoa_mediactrl.obj: ..\..\src\cocoa\mediactrl.mm
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp
-!endif
+$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
-!endif
+$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docmdi.cpp
-!endif
+$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docview.cpp
-!endif
+$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp
-!endif
+$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
-!endif
+$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
+$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
-!endif
+$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
-!endif
+$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
-!endif
+$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
-!endif
+$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
-!endif
+$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
-!endif
+$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
-!endif
+$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmap.cpp
-!endif
+$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
-!endif
+$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_image.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\framecmn.cpp
-!endif
+$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
-!endif
+$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_links.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp
-!endif
+$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_list.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp
-!endif
+$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\geometry.cpp
-!endif
+$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp
-!endif
+$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
-!endif
+$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
-!endif
+$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
-!endif
+$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
-!endif
+$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp
-!endif
+$(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagall.cpp
-!endif
+$(OBJS)\monolib_webview_webkit.obj: ..\..\src\gtk\webview_webkit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\webview_webkit.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp
-!endif
+$(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\image.cpp
-!endif
+$(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagfill.cpp
-!endif
+$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imaggif.cpp
-!endif
+$(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagiff.cpp
-!endif
+$(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
-!endif
+$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp
-!endif
+$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpng.cpp
-!endif
+$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp
-!endif
+$(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtga.cpp
-!endif
+$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp
-!endif
+$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp
-!endif
+$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\layout.cpp
-!endif
+$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
-!endif
+$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
-!endif
+$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp
-!endif
+$(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
-!endif
+$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
-!endif
+$(OBJS)\monolib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
-!endif
+$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
-!endif
+$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
-!endif
+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
-!endif
+$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
-!endif
+$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
-!endif
+$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
-!endif
+$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp
-!endif
+$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
-!endif
+$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
-!endif
+$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
-!endif
+$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
-!endif
+$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
-!endif
+$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
-!endif
+$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
-!endif
+$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
-!endif
+$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp
-!endif
+$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
-!endif
+$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stockitem.cpp
-!endif
+$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp
-!endif
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
-!endif
+$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
-!endif
+$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
-!endif
+$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\treebase.cpp
-!endif
+$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valgen.cpp
-!endif
+$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\validate.cpp
-!endif
+$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp
-!endif
+$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
-!endif
+$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
-!endif
+$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
-!endif
+$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
-!endif
+$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
-!endif
+$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
-!endif
+$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
-!endif
+$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
-!endif
+$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp
-!endif
+$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
-!endif
+$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
-!endif
+$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
-!endif
+$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
-!endif
+$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
-!endif
+$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
-!endif
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp
-!endif
+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
-!endif
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
-!endif
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
-!endif
+$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp
-!endif
+$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\renderg.cpp
-!endif
+$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
-!endif
+$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\selstore.cpp
-!endif
+$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
-!endif
+$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\splitter.cpp
-!endif
+$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
-!endif
+$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
-!endif
+$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\dockart.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
-!endif
+$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
+$(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
-!endif
+$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
-!endif
+$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
+$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
-!endif
+$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp
-!endif
+$(OBJS)\monolib_tabartgtk.obj: ..\..\src\aui\tabartgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabartgtk.cpp
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
-!endif
+$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
 
-$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
 
-$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
 
-$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
 
-$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
 
-$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
 
-$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
 
-$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
-$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
 
-$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
 
-$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
 
-$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
 
-$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
 
-$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
 
-$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
 
-$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
 
-$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
 
-$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp
+$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
 
-$(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grid.cpp
+$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp
 
-$(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\advdll_grideditors.obj: ..\..\src\generic\grideditors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
-$(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\helpext.cpp
+$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\advdll_infobar.obj: ..\..\src\generic\infobar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
-$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
+$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
+$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
 
-$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
 
-$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
-$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
 
-$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
 
-$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
 
-$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
+$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
 
-$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp
 
-$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
 
-$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
 
-$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
 
-$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
 
-$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
 
-$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
 
-$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
 
-$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
 
-$(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grid.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
 
-$(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\advlib_grideditors.obj: ..\..\src\generic\grideditors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
 
-$(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\advlib_infobar.obj: ..\..\src\generic\infobar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
 
-$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
 
-$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
+$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
 
-$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
 
-$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif\r
 
-$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif\r
 
-$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif\r
 
-$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif\r
 
-$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif\r
 
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif\r
 
-$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif\r
 
-$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif\r
 
-$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif\r
 
-$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif\r
 
-$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif\r
 
-$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif\r
 
-$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif\r
 
-$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif\r
 
-$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif\r
 
-$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif\r
 
-$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif\r
 
-$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif\r
 
-$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdata.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif\r
 
-$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif\r
 
-$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
 
-$(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
 
-$(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
 
-$(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmltag.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
 
-$(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
 
-$(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmprint.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
 
-$(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
 
-$(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
 
-$(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_hline.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
 
-$(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_image.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
 
-$(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_layout.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
 
-$(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_links.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
 
-$(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_list.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
 
-$(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
 
-$(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
 
-$(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
 
-$(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
 
-$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
 
-$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
 
-$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
 
-$(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
 
-$(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
 
-$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
 
-$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
 
-$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
 
-$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
 
-$(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
 
-$(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
 
-$(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
 
-$(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
 
-$(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
 
-$(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
 
-$(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
 
-$(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
 
-$(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_image.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
 
-$(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
 
-$(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_links.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
 
-$(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_list.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
 
-$(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
 
-$(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
 
-$(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
 
-$(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
 
-$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
 
-$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
 
-$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
 
-$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
 
-$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
 
-$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
 
-$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk_dcclient.obj: ..\..\src\gtk\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dcclient.cpp
+!endif\r
 
-$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk_dcmemory.obj: ..\..\src\gtk\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dcmemory.cpp
+!endif\r
 
-$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk_dcscreen.obj: ..\..\src\gtk\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dcscreen.cpp
+!endif\r
 
-$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif\r
 
-$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif\r
 
-$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif\r
 
-$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif\r
 
-$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\xml\xml.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif\r
 
-$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif\r
 
-$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"\r
+$(OBJS)\monolib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
 
-$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
+$(OBJS)\monolib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
-
-$(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_app.obj: ..\..\src\gtk1\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\app.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_bitmap.obj: ..\..\src\gtk1\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\bitmap.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_brush.obj: ..\..\src\gtk1\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\brush.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_clipbrd.obj: ..\..\src\gtk1\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\clipbrd.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_colour.obj: ..\..\src\gtk1\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\colour.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_cursor.obj: ..\..\src\gtk1\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\cursor.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_data.obj: ..\..\src\gtk1\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\data.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dataobj.obj: ..\..\src\gtk1\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dataobj.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dc.obj: ..\..\src\gtk1\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dc.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dcclient.obj: ..\..\src\gtk1\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dcclient.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dcmemory.obj: ..\..\src\gtk1\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dcmemory.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dcscreen.obj: ..\..\src\gtk1\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dcscreen.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_dnd.obj: ..\..\src\gtk1\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\dnd.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_evtloop.obj: ..\..\src\gtk1\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\evtloop.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_font.obj: ..\..\src\gtk1\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\font.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_sockgtk.obj: ..\..\src\gtk1\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\sockgtk.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_main.obj: ..\..\src\gtk1\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\main.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_minifram.obj: ..\..\src\gtk1\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\minifram.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_pen.obj: ..\..\src\gtk1\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\pen.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_popupwin.obj: ..\..\src\gtk1\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\popupwin.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_region.obj: ..\..\src\gtk1\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\region.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_renderer.obj: ..\..\src\gtk1\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\renderer.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_settings.obj: ..\..\src\gtk1\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\settings.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_timer.obj: ..\..\src\gtk1\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\timer.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_tooltip.obj: ..\..\src\gtk1\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\tooltip.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_toplevel.obj: ..\..\src\gtk1\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\toplevel.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_utilsgtk.obj: ..\..\src\gtk1\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\utilsgtk.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_win_gtk.obj: ..\..\src\gtk1\win_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\gtk1\win_gtk.c
+!endif
 
-$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_window.obj: ..\..\src\gtk1\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\window.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif\r
 
-$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
 
-$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
 
-$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
 
-$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
 
-$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
 
-$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
 
-$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
 
-$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
 
-$(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
 
-$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
 
-$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
 
-$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
 
-$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
 
-$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
 
-$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
 
-$(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
 
-$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
 
-$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
 
-$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
 
-$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
 
-$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
 
-$(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
 
-$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
 
-$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
 
-$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
 
-$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
 
-$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
 
-$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
 
-$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
 
-$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
 
-$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
 
-$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
 
-$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
 
-$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
 
-$(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
 
-$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif
 
-$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif\r
 
-$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif
 
-$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
 
-$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
 
-$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
 
-$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
 
-$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
 
-$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
 
-$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif
 
-$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif\r
 
-$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif\r
 
-$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif\r
 
-$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif\r
 
-$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif\r
 
-$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif\r
 
-$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\dockart.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif\r
 
-$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif\r
 
-$(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif\r
 
-$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msw_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hid.obj: ..\..\src\osx\core\hid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\hid.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_utilsexc_cf.obj: ..\..\src\osx\core\utilsexc_cf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\utilsexc_cf.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_timer.obj: ..\..\src\generic\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timer.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_app.obj: ..\..\src\x11\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\app.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_clipbrd.obj: ..\..\src\x11\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\clipbrd.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_colour.obj: ..\..\src\x11\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\colour.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_cursor.obj: ..\..\src\x11\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\cursor.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_data.obj: ..\..\src\x11\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\data.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_dataobj.obj: ..\..\src\x11\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\dataobj.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_dc.obj: ..\..\src\x11\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\dc.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_dcclient.obj: ..\..\src\x11\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\dcclient.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_dcmemory.obj: ..\..\src\x11\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\dcmemory.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_dcscreen.obj: ..\..\src\x11\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\dcscreen.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_evtloop.obj: ..\..\src\x11\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\evtloop.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_font.obj: ..\..\src\x11\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\font.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_minifram.obj: ..\..\src\x11\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\minifram.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_nanox.obj: ..\..\src\x11\nanox.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\x11\nanox.c
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_popupwin.obj: ..\..\src\x11\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\popupwin.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_reparent.obj: ..\..\src\x11\reparent.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\reparent.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_settings.obj: ..\..\src\x11\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\settings.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_toplevel.obj: ..\..\src\x11\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\toplevel.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_utils.obj: ..\..\src\x11\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\utils.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_x11_window.obj: ..\..\src\x11\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\x11\window.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontmgrcmn.obj: ..\..\src\common\fontmgrcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmgrcmn.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_colour.obj: ..\..\src\generic\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colour.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mask.obj: ..\..\src\generic\mask.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mask.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_app.obj: ..\..\src\dfb\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\app.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_bitmap.obj: ..\..\src\dfb\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\bitmap.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_brush.obj: ..\..\src\dfb\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\brush.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_cursor.obj: ..\..\src\dfb\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\cursor.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_dc.obj: ..\..\src\dfb\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\dc.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_dcclient.obj: ..\..\src\dfb\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\dcclient.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_dcmemory.obj: ..\..\src\dfb\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\dcmemory.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_dcscreen.obj: ..\..\src\dfb\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\dcscreen.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_evtloop.obj: ..\..\src\dfb\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\evtloop.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_font.obj: ..\..\src\dfb\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\font.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_fontenum.obj: ..\..\src\dfb\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\fontenum.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontmgr.obj: ..\..\src\dfb\fontmgr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\fontmgr.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_nonownedwnd.obj: ..\..\src\dfb\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\nonownedwnd.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_overlay.obj: ..\..\src\dfb\overlay.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\overlay.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_pen.obj: ..\..\src\dfb\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\pen.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_region.obj: ..\..\src\dfb\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\region.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_settings.obj: ..\..\src\dfb\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\settings.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_toplevel.obj: ..\..\src\dfb\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\toplevel.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_utils.obj: ..\..\src\dfb\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\utils.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dfb_window.obj: ..\..\src\dfb\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\window.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapdfb.obj: ..\..\src\dfb\wrapdfb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\dfb\wrapdfb.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif\r
 
-$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif\r
 
-$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
 
-$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
 
-$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\dockart.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
 
-$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
 
-$(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
 
-$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
 
-$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
 
-$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
 
-$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
 
-$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
 
-$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
 
-$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
 
-$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_anybutton.obj: ..\..\src\gtk\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\anybutton.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_artgtk.obj: ..\..\src\gtk\artgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\artgtk.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_bmpbuttn.obj: ..\..\src\gtk\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\bmpbuttn.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_button.obj: ..\..\src\gtk\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\button.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_checkbox.obj: ..\..\src\gtk\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\checkbox.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_checklst.obj: ..\..\src\gtk\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\checklst.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_choice.obj: ..\..\src\gtk\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\choice.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_collpane.obj: ..\..\src\gtk\collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\collpane.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_colordlg.obj: ..\..\src\gtk\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\colordlg.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_combobox.obj: ..\..\src\gtk\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\combobox.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_control.obj: ..\..\src\gtk\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\control.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_clrpicker.obj: ..\..\src\gtk\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\clrpicker.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dialog.obj: ..\..\src\gtk\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dialog.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_fontpicker.obj: ..\..\src\gtk\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\fontpicker.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filepicker.obj: ..\..\src\gtk\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filepicker.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dirdlg.obj: ..\..\src\gtk\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dirdlg.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_filedlg.obj: ..\..\src\gtk\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\filedlg.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_fontdlg.obj: ..\..\src\gtk\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\fontdlg.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_frame.obj: ..\..\src\gtk\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\frame.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_gauge.obj: ..\..\src\gtk\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\gauge.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gvfs.obj: ..\..\src\gtk\gnome\gvfs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\gnome\gvfs.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_infobar.obj: ..\..\src\gtk\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\infobar.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_listbox.obj: ..\..\src\gtk\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\listbox.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_mdi.obj: ..\..\src\gtk\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\mdi.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_menu.obj: ..\..\src\gtk\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\menu.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_mnemonics.obj: ..\..\src\gtk\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\mnemonics.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_msgdlg.obj: ..\..\src\gtk\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\msgdlg.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_nativewin.obj: ..\..\src\gtk\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\nativewin.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_notebook.obj: ..\..\src\gtk\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\notebook.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_print.obj: ..\..\src\gtk\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\print.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_radiobox.obj: ..\..\src\gtk\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\radiobox.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_radiobut.obj: ..\..\src\gtk\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\radiobut.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_scrolbar.obj: ..\..\src\gtk\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\scrolbar.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_scrolwin.obj: ..\..\src\gtk\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\scrolwin.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_slider.obj: ..\..\src\gtk\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\slider.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_spinbutt.obj: ..\..\src\gtk\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\spinbutt.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_spinctrl.obj: ..\..\src\gtk\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\spinctrl.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_statbmp.obj: ..\..\src\gtk\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\statbmp.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_statbox.obj: ..\..\src\gtk\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\statbox.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_statline.obj: ..\..\src\gtk\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\statline.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_stattext.obj: ..\..\src\gtk\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\stattext.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_toolbar.obj: ..\..\src\gtk\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\toolbar.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_textctrl.obj: ..\..\src\gtk\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\textctrl.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_textentry.obj: ..\..\src\gtk\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\textentry.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_tglbtn.obj: ..\..\src\gtk\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\tglbtn.cpp
+!endif\r
+
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_treeentry_gtk.obj: ..\..\src\gtk\treeentry_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\gtk\treeentry_gtk.c
+!endif\r
 
-$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
 
-$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
 
-$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
 
-$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
 
-$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
 
-$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
+!endif\r
 
-$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+!endif\r
 
-$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+!endif\r
 
-$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+!endif\r
 
-$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!endif\r
 
-$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+!endif\r
 
-$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!endif\r
 
-$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+!endif\r
 
-$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_colordlg.obj: ..\..\src\msw\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif\r
 
-$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_filedlg.obj: ..\..\src\msw\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+!endif\r
 
-$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_frame.obj: ..\..\src\msw\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_iniconf.obj: ..\..\src\msw\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_mdi.obj: ..\..\src\msw\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_menuitem.obj: ..\..\src\msw\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+!endif\r
 
-$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_metafile.obj: ..\..\src\msw\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\metafile.cpp
+!endif\r
 
-$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+!endif\r
 
-$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+!endif\r
 
-$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+!endif\r
 
-$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+!endif\r
 
-$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+!endif\r
 
-$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+!endif\r
 
-$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp
+!endif\r
 
-$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
+!endif\r
 
-$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!endif\r
 
-$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!endif\r
 
-$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp
+!endif\r
 
-$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!endif\r
 
-$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\msw\glcanvas.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif\r
 
-$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!endif\r
 
-$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\common\glcmn.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+!endif\r
 
-$(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\msw\glcanvas.cpp
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+!endif\r
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_regiong.obj: ..\..\src\generic\regiong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\regiong.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_arttango.obj: ..\..\src\common\arttango.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docmdi.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docview.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmap.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\framecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\geometry.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagall.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\image.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagfill.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imaggif.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagiff.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpng.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtga.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\layout.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stockitem.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\treebase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valgen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\validate.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_valnum.obj: ..\..\src\common\valnum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\renderg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\selstore.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splitter.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_carbon_aboutdlg.obj: ..\..\src\osx\carbon\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\aboutdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_carbon_drawer.obj: ..\..\src\osx\carbon\drawer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\drawer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_carbon_dataview.obj: ..\..\src\osx\carbon\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\dataview.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_carbon_taskbar.obj: ..\..\src\osx\carbon\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\carbon\taskbar.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datetimectrl_osx.obj: ..\..\src\osx\datetimectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\datetimectrl_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datectrl_osx.obj: ..\..\src\osx\datectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\datectrl_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_timectrl_osx.obj: ..\..\src\osx\timectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\timectrl_osx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cocoa_aboutdlg.obj: ..\..\src\osx\cocoa\aboutdlg.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cocoa_dataview.obj: ..\..\src\osx\cocoa\dataview.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cocoa_datetimectrl.obj: ..\..\src\osx\cocoa\datetimectrl.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_osx_cocoa_taskbar.obj: ..\..\src\osx\cocoa\taskbar.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_src_cocoa_taskbar.obj: ..\..\src\cocoa\taskbar.mm
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk_eggtrayicon.obj: ..\..\src\gtk\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\gtk\eggtrayicon.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hildon_notifmsg.obj: ..\..\src\gtk\hildon\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\hildon\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_eggtrayicon.obj: ..\..\src\gtk1\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\gtk1\eggtrayicon.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gtk1_taskbar.obj: ..\..\src\gtk1\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk1\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_os2_joystick.obj: ..\..\src\os2\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_os2_sound.obj: ..\..\src\os2\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\os2\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_aboutdlg.obj: ..\..\src\gtk\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\aboutdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_animate.obj: ..\..\src\gtk\animate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\animate.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_bmpcbox.obj: ..\..\src\gtk\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\bmpcbox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_calctrl.obj: ..\..\src\gtk\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\calctrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_dataview.obj: ..\..\src\gtk\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\dataview.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gtk_hyperlink.obj: ..\..\src\gtk\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\gtk\hyperlink.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_msw_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\monolib_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
+\r
+$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+\r
+$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+\r
+$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
+\r
+$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp
+\r
+$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcall.cpp
+\r
+$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcfind.cpp
+\r
+$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\archive.cpp
+\r
+$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arrstr.cpp
+\r
+$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\base64.cpp
+\r
+$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\clntdata.cpp
+\r
+$(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\cmdline.cpp
+\r
+$(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\config.cpp
+\r
+$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\convauto.cpp
+\r
+$(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
+\r
+$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+\r
+$(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
+\r
+$(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
+\r
+$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
+\r
+$(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
+\r
+$(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynload.cpp
+\r
+$(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\encconv.cpp
+\r
+$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
+\r
+$(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c
+       $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) ..\..\src\common\extended.c
+\r
+$(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ffile.cpp
+\r
+$(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\file.cpp
+\r
+$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileback.cpp
+\r
+$(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileconf.cpp
+\r
+$(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filefn.cpp
+\r
+$(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filename.cpp
+\r
+$(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filesys.cpp
+\r
+$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtall.cpp
+\r
+$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtfind.cpp
+\r
+$(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp
+\r
+$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp
+\r
+$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp
+\r
+$(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hash.cpp
+\r
+$(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hashmap.cpp
+\r
+$(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\init.cpp
+\r
+$(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\intl.cpp
+\r
+$(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
+\r
+$(OBJS)\basedll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
+\r
+$(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp
+\r
+$(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\log.cpp
+\r
+$(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\longlong.cpp
+\r
+$(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\memory.cpp
+\r
+$(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp
+\r
+$(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\module.cpp
+\r
+$(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp
+\r
+$(OBJS)\basedll_numformatter.obj: ..\..\src\common\numformatter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\numformatter.cpp
+\r
+$(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp
+\r
+$(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\platinfo.cpp
+\r
+$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\powercmn.cpp
+\r
+$(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\process.cpp
+\r
+$(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\regex.cpp
+\r
+$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp
+\r
+$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
+\r
+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+\r
+$(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
+\r
+$(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strconv.cpp
+\r
+$(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stream.cpp
+\r
+$(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\string.cpp
+\r
+$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+\r
+$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringops.cpp
+\r
+$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strvararg.cpp
+\r
+$(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sysopt.cpp
+\r
+$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp
+\r
+$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textbuf.cpp
+\r
+$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
+\r
+$(OBJS)\basedll_common_time.obj: ..\..\src\common\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
+\r
+$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
+\r
+$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp
+\r
+$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
+\r
+$(OBJS)\basedll_translation.obj: ..\..\src\common\translation.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\translation.cpp
+\r
+$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+\r
+$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\unichar.cpp
+\r
+$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
+\r
+$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp
+\r
+$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
+\r
+$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wfstream.cpp
+\r
+$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp
+\r
+$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+\r
+$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
+\r
+$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp
+\r
+$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp
+\r
+$(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp
+\r
+$(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
+\r
+$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+\r
+$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+\r
+$(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
+\r
+$(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
+\r
+$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp
+\r
+$(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dde.cpp
+\r
+$(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dir.cpp
+\r
+$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
+\r
+$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+\r
+$(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp
+\r
+$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\power.cpp
+\r
+$(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\regconf.cpp
+\r
+$(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\registry.cpp
+\r
+$(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp
+\r
+$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
+\r
+$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
+\r
+$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\thread.cpp
+\r
+$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\timer.cpp
+\r
+$(OBJS)\basedll_msw_utils.obj: ..\..\src\msw\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utils.cpp
+\r
+$(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
+\r
+$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+\r
+$(OBJS)\basedll_wince_time.obj: ..\..\src\msw\wince\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\wince\time.cpp
+\r
+$(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
+\r
+$(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+\r
+$(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\msgout.cpp
+\r
+$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+\r
+$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp
+\r
+$(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp
+\r
+$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
+\r
+$(OBJS)\basedll_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
+\r
+$(OBJS)\basedll_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
+\r
+$(OBJS)\basedll_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
+\r
+$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+\r
+$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp
+\r
+$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
+\r
+$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcall.cpp
+\r
+$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcfind.cpp
+\r
+$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\archive.cpp
+\r
+$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arrstr.cpp
+\r
+$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\base64.cpp
+\r
+$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\clntdata.cpp
+\r
+$(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\cmdline.cpp
+\r
+$(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\config.cpp
+\r
+$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\convauto.cpp
+\r
+$(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
+\r
+$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+\r
+$(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
+\r
+$(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
+\r
+$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
+\r
+$(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
+\r
+$(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynload.cpp
+\r
+$(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\encconv.cpp
+\r
+$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp
+\r
+$(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c
+       $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) ..\..\src\common\extended.c
+\r
+$(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ffile.cpp
+\r
+$(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\file.cpp
+\r
+$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileback.cpp
+\r
+$(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileconf.cpp
+\r
+$(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filefn.cpp
+\r
+$(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filename.cpp
+\r
+$(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filesys.cpp
+\r
+$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtall.cpp
+\r
+$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtfind.cpp
+\r
+$(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp
+\r
+$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp
+\r
+$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp
+\r
+$(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hash.cpp
+\r
+$(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hashmap.cpp
+\r
+$(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\init.cpp
+\r
+$(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\intl.cpp
+\r
+$(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
+\r
+$(OBJS)\baselib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
+\r
+$(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp
+\r
+$(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\log.cpp
+\r
+$(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\longlong.cpp
+\r
+$(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\memory.cpp
+\r
+$(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp
+\r
+$(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\module.cpp
+\r
+$(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp
+\r
+$(OBJS)\baselib_numformatter.obj: ..\..\src\common\numformatter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\numformatter.cpp
+\r
+$(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp
+\r
+$(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\platinfo.cpp
+\r
+$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\powercmn.cpp
+\r
+$(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\process.cpp
+\r
+$(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\regex.cpp
+\r
+$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp
+\r
+$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
+\r
+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+\r
+$(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
+\r
+$(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strconv.cpp
+\r
+$(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stream.cpp
+\r
+$(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\string.cpp
+\r
+$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp
+\r
+$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringops.cpp
+\r
+$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strvararg.cpp
+\r
+$(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sysopt.cpp
+\r
+$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp
+\r
+$(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textbuf.cpp
+\r
+$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
+\r
+$(OBJS)\baselib_common_time.obj: ..\..\src\common\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
+\r
+$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
+\r
+$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp
+\r
+$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
+\r
+$(OBJS)\baselib_translation.obj: ..\..\src\common\translation.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\translation.cpp
+\r
+$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
+\r
+$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\unichar.cpp
+\r
+$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
+\r
+$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp
+\r
+$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
+\r
+$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wfstream.cpp
+\r
+$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp
+\r
+$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
+\r
+$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
+\r
+$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp
+\r
+$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp
+\r
+$(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp
+\r
+$(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
+\r
+$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+\r
+$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+\r
+$(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
+\r
+$(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp
+\r
+$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp
+\r
+$(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dde.cpp
+\r
+$(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dir.cpp
+\r
+$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
+\r
+$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+\r
+$(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
+\r
+$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\power.cpp
+\r
+$(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\regconf.cpp
+\r
+$(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\registry.cpp
+\r
+$(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp
+\r
+$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp
+\r
+$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp
+\r
+$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\thread.cpp
+\r
+$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\timer.cpp
+\r
+$(OBJS)\baselib_msw_utils.obj: ..\..\src\msw\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utils.cpp
+\r
+$(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
+\r
+$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+\r
+$(OBJS)\baselib_wince_time.obj: ..\..\src\msw\wince\time.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\wince\time.cpp
+\r
+$(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
+\r
+$(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+\r
+$(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\msgout.cpp
+\r
+$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+\r
+$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp
+\r
+$(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
+\r
+$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+\r
+$(OBJS)\baselib_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
+\r
+$(OBJS)\baselib_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
+\r
+$(OBJS)\baselib_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
+\r
+$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+\r
+$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
+\r
+$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
+\r
+$(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\ftp.cpp
+\r
+$(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\http.cpp
+\r
+$(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\protocol.cpp
+\r
+$(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp
+\r
+$(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckfile.cpp
+\r
+$(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckipc.cpp
+\r
+$(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp
+\r
+$(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\socket.cpp
+\r
+$(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp
+\r
+$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
+\r
+$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
+\r
+$(OBJS)\netdll_net.obj: ..\..\src\msw\wince\net.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\wince\net.cpp
+\r
+$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+\r
+$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp
+\r
+$(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\ftp.cpp
+\r
+$(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\http.cpp
+\r
+$(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\protocol.cpp
+\r
+$(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp
+\r
+$(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp
+\r
+$(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp
+\r
+$(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp
+\r
+$(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\socket.cpp
+\r
+$(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp
+\r
+$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
+\r
+$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
+\r
+$(OBJS)\netlib_net.obj: ..\..\src\msw\wince\net.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\wince\net.cpp
+\r
+$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+\r
+$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
+\r
+$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
+\r
+$(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+\r
+$(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\msgout.cpp
+\r
+$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+\r
+$(OBJS)\coredll_msw_main.obj: ..\..\src\msw\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp
+\r
+$(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp
+\r
+$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
+\r
+$(OBJS)\coredll_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
+\r
+$(OBJS)\coredll_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
+\r
+$(OBJS)\coredll_osx_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
+\r
+$(OBJS)\coredll_gprint.obj: ..\..\src\gtk\gnome\gprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\gnome\gprint.cpp
+\r
+$(OBJS)\coredll_gtk1_bmpbuttn.obj: ..\..\src\gtk1\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\bmpbuttn.cpp
+\r
+$(OBJS)\coredll_gtk1_button.obj: ..\..\src\gtk1\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\button.cpp
+\r
+$(OBJS)\coredll_gtk1_checkbox.obj: ..\..\src\gtk1\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\checkbox.cpp
+\r
+$(OBJS)\coredll_gtk1_checklst.obj: ..\..\src\gtk1\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\checklst.cpp
+\r
+$(OBJS)\coredll_gtk1_choice.obj: ..\..\src\gtk1\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\choice.cpp
+\r
+$(OBJS)\coredll_gtk1_combobox.obj: ..\..\src\gtk1\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\combobox.cpp
+\r
+$(OBJS)\coredll_gtk1_control.obj: ..\..\src\gtk1\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\control.cpp
+\r
+$(OBJS)\coredll_gtk1_dialog.obj: ..\..\src\gtk1\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dialog.cpp
+\r
+$(OBJS)\coredll_gtk1_filedlg.obj: ..\..\src\gtk1\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\filedlg.cpp
+\r
+$(OBJS)\coredll_gtk1_fontdlg.obj: ..\..\src\gtk1\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\fontdlg.cpp
+\r
+$(OBJS)\coredll_gtk1_frame.obj: ..\..\src\gtk1\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\frame.cpp
+\r
+$(OBJS)\coredll_gtk1_gauge.obj: ..\..\src\gtk1\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\gauge.cpp
+\r
+$(OBJS)\coredll_gtk1_listbox.obj: ..\..\src\gtk1\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\listbox.cpp
+\r
+$(OBJS)\coredll_gtk1_mdi.obj: ..\..\src\gtk1\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\mdi.cpp
+\r
+$(OBJS)\coredll_gtk1_menu.obj: ..\..\src\gtk1\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\menu.cpp
+\r
+$(OBJS)\coredll_gtk1_mnemonics.obj: ..\..\src\gtk1\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\mnemonics.cpp
+\r
+$(OBJS)\coredll_gtk1_notebook.obj: ..\..\src\gtk1\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\notebook.cpp
+\r
+$(OBJS)\coredll_gtk1_radiobox.obj: ..\..\src\gtk1\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\radiobox.cpp
+\r
+$(OBJS)\coredll_gtk1_radiobut.obj: ..\..\src\gtk1\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\radiobut.cpp
+\r
+$(OBJS)\coredll_gtk1_scrolbar.obj: ..\..\src\gtk1\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\scrolbar.cpp
+\r
+$(OBJS)\coredll_gtk1_scrolwin.obj: ..\..\src\gtk1\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\scrolwin.cpp
+\r
+$(OBJS)\coredll_gtk1_slider.obj: ..\..\src\gtk1\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\slider.cpp
+\r
+$(OBJS)\coredll_gtk1_spinbutt.obj: ..\..\src\gtk1\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\spinbutt.cpp
+\r
+$(OBJS)\coredll_gtk1_spinctrl.obj: ..\..\src\gtk1\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\spinctrl.cpp
+\r
+$(OBJS)\coredll_gtk1_statbmp.obj: ..\..\src\gtk1\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\statbmp.cpp
+\r
+$(OBJS)\coredll_gtk1_statbox.obj: ..\..\src\gtk1\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\statbox.cpp
+\r
+$(OBJS)\coredll_gtk1_statline.obj: ..\..\src\gtk1\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\statline.cpp
+\r
+$(OBJS)\coredll_gtk1_stattext.obj: ..\..\src\gtk1\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\stattext.cpp
+\r
+$(OBJS)\coredll_gtk1_toolbar.obj: ..\..\src\gtk1\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\toolbar.cpp
+\r
+$(OBJS)\coredll_gtk1_textctrl.obj: ..\..\src\gtk1\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\textctrl.cpp
+\r
+$(OBJS)\coredll_gtk1_tglbtn.obj: ..\..\src\gtk1\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\tglbtn.cpp
+\r
+$(OBJS)\coredll_motif_accel.obj: ..\..\src\motif\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\accel.cpp
+\r
+$(OBJS)\coredll_motif_app.obj: ..\..\src\motif\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\app.cpp
+\r
+$(OBJS)\coredll_motif_bmpbuttn.obj: ..\..\src\motif\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\bmpbuttn.cpp
+\r
+$(OBJS)\coredll_bmpmotif.obj: ..\..\src\motif\bmpmotif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\bmpmotif.cpp
+\r
+$(OBJS)\coredll_motif_button.obj: ..\..\src\motif\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\button.cpp
+\r
+$(OBJS)\coredll_motif_checkbox.obj: ..\..\src\motif\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\checkbox.cpp
+\r
+$(OBJS)\coredll_motif_checklst.obj: ..\..\src\motif\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\checklst.cpp
+\r
+$(OBJS)\coredll_motif_choice.obj: ..\..\src\motif\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\choice.cpp
+\r
+$(OBJS)\coredll_motif_clipbrd.obj: ..\..\src\motif\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\clipbrd.cpp
+\r
+$(OBJS)\coredll_motif_colour.obj: ..\..\src\motif\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\colour.cpp
+\r
+$(OBJS)\coredll_motif_combobox.obj: ..\..\src\motif\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\combobox.cpp
+\r
+$(OBJS)\coredll_combobox_native.obj: ..\..\src\motif\combobox_native.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\combobox_native.cpp
+\r
+$(OBJS)\coredll_motif_control.obj: ..\..\src\motif\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\control.cpp
+\r
+$(OBJS)\coredll_motif_cursor.obj: ..\..\src\motif\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\cursor.cpp
+\r
+$(OBJS)\coredll_motif_data.obj: ..\..\src\motif\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\data.cpp
+\r
+$(OBJS)\coredll_motif_dataobj.obj: ..\..\src\motif\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dataobj.cpp
+\r
+$(OBJS)\coredll_motif_dc.obj: ..\..\src\motif\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dc.cpp
+\r
+$(OBJS)\coredll_motif_dcclient.obj: ..\..\src\motif\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dcclient.cpp
+\r
+$(OBJS)\coredll_motif_dcmemory.obj: ..\..\src\motif\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dcmemory.cpp
+\r
+$(OBJS)\coredll_motif_dcscreen.obj: ..\..\src\motif\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dcscreen.cpp
+\r
+$(OBJS)\coredll_motif_dialog.obj: ..\..\src\motif\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\dialog.cpp
+\r
+$(OBJS)\coredll_motif_evtloop.obj: ..\..\src\motif\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\evtloop.cpp
+\r
+$(OBJS)\coredll_motif_filedlg.obj: ..\..\src\motif\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\filedlg.cpp
+\r
+$(OBJS)\coredll_motif_font.obj: ..\..\src\motif\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\font.cpp
+\r
+$(OBJS)\coredll_motif_frame.obj: ..\..\src\motif\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\frame.cpp
+\r
+$(OBJS)\coredll_motif_gauge.obj: ..\..\src\motif\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\gauge.cpp
+\r
+$(OBJS)\coredll_sockmot.obj: ..\..\src\motif\sockmot.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\sockmot.cpp
+\r
+$(OBJS)\coredll_motif_icon.obj: ..\..\src\motif\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\icon.cpp
+\r
+$(OBJS)\coredll_motif_listbox.obj: ..\..\src\motif\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\listbox.cpp
+\r
+$(OBJS)\coredll_motif_main.obj: ..\..\src\motif\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\main.cpp
+\r
+$(OBJS)\coredll_motif_menu.obj: ..\..\src\motif\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\menu.cpp
+\r
+$(OBJS)\coredll_motif_menuitem.obj: ..\..\src\motif\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\menuitem.cpp
+\r
+$(OBJS)\coredll_motif_minifram.obj: ..\..\src\motif\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\minifram.cpp
+\r
+$(OBJS)\coredll_motif_msgdlg.obj: ..\..\src\motif\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\msgdlg.cpp
+\r
+$(OBJS)\coredll_motif_popupwin.obj: ..\..\src\motif\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\popupwin.cpp
+\r
+$(OBJS)\coredll_motif_radiobox.obj: ..\..\src\motif\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\radiobox.cpp
+\r
+$(OBJS)\coredll_motif_radiobut.obj: ..\..\src\motif\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\radiobut.cpp
+\r
+$(OBJS)\coredll_motif_scrolbar.obj: ..\..\src\motif\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\scrolbar.cpp
+\r
+$(OBJS)\coredll_motif_settings.obj: ..\..\src\motif\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\settings.cpp
+\r
+$(OBJS)\coredll_motif_slider.obj: ..\..\src\motif\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\slider.cpp
+\r
+$(OBJS)\coredll_motif_spinbutt.obj: ..\..\src\motif\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\spinbutt.cpp
+\r
+$(OBJS)\coredll_motif_statbmp.obj: ..\..\src\motif\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\statbmp.cpp
+\r
+$(OBJS)\coredll_motif_statbox.obj: ..\..\src\motif\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\statbox.cpp
+\r
+$(OBJS)\coredll_motif_stattext.obj: ..\..\src\motif\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\stattext.cpp
+\r
+$(OBJS)\coredll_motif_textctrl.obj: ..\..\src\motif\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\textctrl.cpp
+\r
+$(OBJS)\coredll_motif_textentry.obj: ..\..\src\motif\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\textentry.cpp
+\r
+$(OBJS)\coredll_motif_timer.obj: ..\..\src\motif\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\timer.cpp
+\r
+$(OBJS)\coredll_motif_toolbar.obj: ..\..\src\motif\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\toolbar.cpp
+\r
+$(OBJS)\coredll_motif_toplevel.obj: ..\..\src\motif\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\toplevel.cpp
+\r
+$(OBJS)\coredll_motif_utils.obj: ..\..\src\motif\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\utils.cpp
+\r
+$(OBJS)\coredll_motif_window.obj: ..\..\src\motif\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\motif\window.cpp
+\r
+$(OBJS)\coredll_xmcombo.obj: ..\..\src\motif\xmcombo\xmcombo.c
+       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) ..\..\src\motif\xmcombo\xmcombo.c
+\r
+$(OBJS)\coredll_generic_notebook.obj: ..\..\src\generic\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\notebook.cpp
+\r
+$(OBJS)\coredll_generic_statline.obj: ..\..\src\generic\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statline.cpp
+\r
+$(OBJS)\coredll_tabg.obj: ..\..\src\generic\tabg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
+\r
+$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+\r
+$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+\r
+$(OBJS)\coredll_msw_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+\r
+$(OBJS)\coredll_wince_checklst.obj: ..\..\src\msw\wince\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\checklst.cpp
+\r
+$(OBJS)\coredll_choicece.obj: ..\..\src\msw\wince\choicece.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\choicece.cpp
+\r
+$(OBJS)\coredll_crt.obj: ..\..\src\msw\wince\crt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\crt.cpp
+\r
+$(OBJS)\coredll_filedlgwce.obj: ..\..\src\msw\wince\filedlgwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\filedlgwce.cpp
+\r
+$(OBJS)\coredll_filefnwce.obj: ..\..\src\msw\wince\filefnwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\filefnwce.cpp
+\r
+$(OBJS)\coredll_helpwce.obj: ..\..\src\msw\wince\helpwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\helpwce.cpp
+\r
+$(OBJS)\coredll_menuce.obj: ..\..\src\msw\wince\menuce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\menuce.cpp
+\r
+$(OBJS)\coredll_tbarwce.obj: ..\..\src\msw\wince\tbarwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\tbarwce.cpp
+\r
+$(OBJS)\coredll_textctrlce.obj: ..\..\src\msw\wince\textctrlce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\wince\textctrlce.cpp
+\r
+$(OBJS)\coredll_carbon_anybutton.obj: ..\..\src\osx\carbon\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\anybutton.cpp
+\r
+$(OBJS)\coredll_carbon_bmpbuttn.obj: ..\..\src\osx\carbon\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\bmpbuttn.cpp
+\r
+$(OBJS)\coredll_carbon_button.obj: ..\..\src\osx\carbon\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\button.cpp
+\r
+$(OBJS)\coredll_carbon_checkbox.obj: ..\..\src\osx\carbon\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\checkbox.cpp
+\r
+$(OBJS)\coredll_carbon_choice.obj: ..\..\src\osx\carbon\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\choice.cpp
+\r
+$(OBJS)\coredll_carbon_colordlg.obj: ..\..\src\osx\carbon\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\colordlg.cpp
+\r
+$(OBJS)\coredll_carbon_dialog.obj: ..\..\src\osx\carbon\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\dialog.cpp
+\r
+$(OBJS)\coredll_carbon_dirdlg.obj: ..\..\src\osx\carbon\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\dirdlg.cpp
+\r
+$(OBJS)\coredll_carbon_dnd.obj: ..\..\src\osx\carbon\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\dnd.cpp
+\r
+$(OBJS)\coredll_carbon_evtloop.obj: ..\..\src\osx\carbon\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\evtloop.cpp
+\r
+$(OBJS)\coredll_carbon_filedlg.obj: ..\..\src\osx\carbon\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\filedlg.cpp
+\r
+$(OBJS)\coredll_carbon_gauge.obj: ..\..\src\osx\carbon\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\gauge.cpp
+\r
+$(OBJS)\coredll_carbon_listbox.obj: ..\..\src\osx\carbon\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\listbox.cpp
+\r
+$(OBJS)\coredll_listctrl_mac.obj: ..\..\src\osx\carbon\listctrl_mac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\listctrl_mac.cpp
+\r
+$(OBJS)\coredll_carbon_menu.obj: ..\..\src\osx\carbon\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\menu.cpp
+\r
+$(OBJS)\coredll_carbon_menuitem.obj: ..\..\src\osx\carbon\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\menuitem.cpp
+\r
+$(OBJS)\coredll_carbon_msgdlg.obj: ..\..\src\osx\carbon\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\msgdlg.cpp
+\r
+$(OBJS)\coredll_carbon_nonownedwnd.obj: ..\..\src\osx\carbon\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\nonownedwnd.cpp
+\r
+$(OBJS)\coredll_notebmac.obj: ..\..\src\osx\carbon\notebmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\notebmac.cpp
+\r
+$(OBJS)\coredll_carbon_printdlg.obj: ..\..\src\osx\carbon\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\printdlg.cpp
+\r
+$(OBJS)\coredll_carbon_radiobut.obj: ..\..\src\osx\carbon\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\radiobut.cpp
+\r
+$(OBJS)\coredll_carbon_scrolbar.obj: ..\..\src\osx\carbon\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\scrolbar.cpp
+\r
+$(OBJS)\coredll_carbon_slider.obj: ..\..\src\osx\carbon\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\slider.cpp
+\r
+$(OBJS)\coredll_carbon_spinbutt.obj: ..\..\src\osx\carbon\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\spinbutt.cpp
+\r
+$(OBJS)\coredll_carbon_srchctrl.obj: ..\..\src\osx\carbon\srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\srchctrl.cpp
+\r
+$(OBJS)\coredll_carbon_statbmp.obj: ..\..\src\osx\carbon\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\statbmp.cpp
+\r
+$(OBJS)\coredll_carbon_statbox.obj: ..\..\src\osx\carbon\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\statbox.cpp
+\r
+$(OBJS)\coredll_statlmac.obj: ..\..\src\osx\carbon\statlmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\statlmac.cpp
+\r
+$(OBJS)\coredll_carbon_stattext.obj: ..\..\src\osx\carbon\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\stattext.cpp
+\r
+$(OBJS)\coredll_carbon_textctrl.obj: ..\..\src\osx\carbon\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\textctrl.cpp
+\r
+$(OBJS)\coredll_carbon_tglbtn.obj: ..\..\src\osx\carbon\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\tglbtn.cpp
+\r
+$(OBJS)\coredll_carbon_toolbar.obj: ..\..\src\osx\carbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\toolbar.cpp
+\r
+$(OBJS)\coredll_carbon_tooltip.obj: ..\..\src\osx\carbon\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\tooltip.cpp
+\r
+$(OBJS)\coredll_carbon_window.obj: ..\..\src\osx\carbon\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\carbon\window.cpp
+\r
+$(OBJS)\coredll_cocoa_anybutton.obj: ..\..\src\osx\cocoa\anybutton.mm
+\r
+$(OBJS)\coredll_osx_cocoa_button.obj: ..\..\src\osx\cocoa\button.mm
+\r
+$(OBJS)\coredll_osx_cocoa_checkbox.obj: ..\..\src\osx\cocoa\checkbox.mm
+\r
+$(OBJS)\coredll_osx_cocoa_choice.obj: ..\..\src\osx\cocoa\choice.mm
+\r
+$(OBJS)\coredll_osx_cocoa_colour.obj: ..\..\src\osx\cocoa\colour.mm
+\r
+$(OBJS)\coredll_osx_cocoa_combobox.obj: ..\..\src\osx\cocoa\combobox.mm
+\r
+$(OBJS)\coredll_osx_cocoa_dialog.obj: ..\..\src\osx\cocoa\dialog.mm
+\r
+$(OBJS)\coredll_osx_cocoa_dirdlg.obj: ..\..\src\osx\cocoa\dirdlg.mm
+\r
+$(OBJS)\coredll_cocoa_dnd.obj: ..\..\src\osx\cocoa\dnd.mm
+\r
+$(OBJS)\coredll_osx_cocoa_evtloop.obj: ..\..\src\osx\cocoa\evtloop.mm
+\r
+$(OBJS)\coredll_osx_cocoa_filedlg.obj: ..\..\src\osx\cocoa\filedlg.mm
+\r
+$(OBJS)\coredll_osx_cocoa_gauge.obj: ..\..\src\osx\cocoa\gauge.mm
+\r
+$(OBJS)\coredll_osx_cocoa_listbox.obj: ..\..\src\osx\cocoa\listbox.mm
+\r
+$(OBJS)\coredll_osx_cocoa_menu.obj: ..\..\src\osx\cocoa\menu.mm
+\r
+$(OBJS)\coredll_osx_cocoa_menuitem.obj: ..\..\src\osx\cocoa\menuitem.mm
+\r
+$(OBJS)\coredll_osx_cocoa_msgdlg.obj: ..\..\src\osx\cocoa\msgdlg.mm
+\r
+$(OBJS)\coredll_cocoa_nonownedwnd.obj: ..\..\src\osx\cocoa\nonownedwnd.mm
+\r
+$(OBJS)\coredll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
+
+$(OBJS)\coredll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
+\r
+$(OBJS)\coredll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
+\r
+$(OBJS)\coredll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
+\r
+$(OBJS)\coredll_osx_cocoa_slider.obj: ..\..\src\osx\cocoa\slider.mm
+\r
+$(OBJS)\coredll_osx_cocoa_spinbutt.obj: ..\..\src\osx\cocoa\spinbutt.mm
+\r
+$(OBJS)\coredll_cocoa_srchctrl.obj: ..\..\src\osx\cocoa\srchctrl.mm
+\r
+$(OBJS)\coredll_osx_cocoa_statbox.obj: ..\..\src\osx\cocoa\statbox.mm
+\r
+$(OBJS)\coredll_cocoa_statline.obj: ..\..\src\osx\cocoa\statline.mm
+\r
+$(OBJS)\coredll_osx_cocoa_stattext.obj: ..\..\src\osx\cocoa\stattext.mm
+\r
+$(OBJS)\coredll_osx_cocoa_textctrl.obj: ..\..\src\osx\cocoa\textctrl.mm
+\r
+$(OBJS)\coredll_cocoa_tglbtn.obj: ..\..\src\osx\cocoa\tglbtn.mm
+\r
+$(OBJS)\coredll_osx_cocoa_toolbar.obj: ..\..\src\osx\cocoa\toolbar.mm
+\r
+$(OBJS)\coredll_osx_cocoa_tooltip.obj: ..\..\src\osx\cocoa\tooltip.mm
+\r
+$(OBJS)\coredll_osx_cocoa_window.obj: ..\..\src\osx\cocoa\window.mm
+\r
+$(OBJS)\coredll_iphone_anybutton.obj: ..\..\src\osx\iphone\anybutton.mm
+\r
+$(OBJS)\coredll_iphone_button.obj: ..\..\src\osx\iphone\button.mm
+\r
+$(OBJS)\coredll_iphone_checkbox.obj: ..\..\src\osx\iphone\checkbox.mm
+\r
+$(OBJS)\coredll_iphone_dialog.obj: ..\..\src\osx\iphone\dialog.mm
+\r
+$(OBJS)\coredll_iphone_evtloop.obj: ..\..\src\osx\iphone\evtloop.mm
+\r
+$(OBJS)\coredll_iphone_gauge.obj: ..\..\src\osx\iphone\gauge.mm
+\r
+$(OBJS)\coredll_iphone_msgdlg.obj: ..\..\src\osx\iphone\msgdlg.mm
+\r
+$(OBJS)\coredll_iphone_nonownedwnd.obj: ..\..\src\osx\iphone\nonownedwnd.mm
+\r
+$(OBJS)\coredll_iphone_scrolbar.obj: ..\..\src\osx\iphone\scrolbar.mm
+\r
+$(OBJS)\coredll_iphone_slider.obj: ..\..\src\osx\iphone\slider.mm
+\r
+$(OBJS)\coredll_iphone_stattext.obj: ..\..\src\osx\iphone\stattext.mm
+\r
+$(OBJS)\coredll_iphone_textctrl.obj: ..\..\src\osx\iphone\textctrl.mm
+\r
+$(OBJS)\coredll_iphone_toolbar.obj: ..\..\src\osx\iphone\toolbar.mm
+\r
+$(OBJS)\coredll_iphone_utils.obj: ..\..\src\osx\iphone\utils.mm
+\r
+$(OBJS)\coredll_iphone_window.obj: ..\..\src\osx\iphone\window.mm
+\r
+$(OBJS)\coredll_NSBox.obj: ..\..\src\cocoa\NSBox.mm
+\r
+$(OBJS)\coredll_NSButton.obj: ..\..\src\cocoa\NSButton.mm
+\r
+$(OBJS)\coredll_NSControl.obj: ..\..\src\cocoa\NSControl.mm
+\r
+$(OBJS)\coredll_NSMenu.obj: ..\..\src\cocoa\NSMenu.mm
+\r
+$(OBJS)\coredll_NSPanel.obj: ..\..\src\cocoa\NSPanel.mm
+\r
+$(OBJS)\coredll_NSScroller.obj: ..\..\src\cocoa\NSScroller.mm
+\r
+$(OBJS)\coredll_NSSlider.obj: ..\..\src\cocoa\NSSlider.mm
+\r
+$(OBJS)\coredll_NSTabView.obj: ..\..\src\cocoa\NSTabView.mm
+\r
+$(OBJS)\coredll_NSTableView.obj: ..\..\src\cocoa\NSTableView.mm
+\r
+$(OBJS)\coredll_NSTextField.obj: ..\..\src\cocoa\NSTextField.mm
+\r
+$(OBJS)\coredll_NSView.obj: ..\..\src\cocoa\NSView.mm
+\r
+$(OBJS)\coredll_NSWindow.obj: ..\..\src\cocoa\NSWindow.mm
+\r
+$(OBJS)\coredll_ObjcRef.obj: ..\..\src\cocoa\ObjcRef.mm
+\r
+$(OBJS)\coredll_cocoa_app.obj: ..\..\src\cocoa\app.mm
+\r
+$(OBJS)\coredll_cocoa_bitmap.obj: ..\..\src\cocoa\bitmap.mm
+\r
+$(OBJS)\coredll_cocoa_bmpbuttn.obj: ..\..\src\cocoa\bmpbuttn.mm
+\r
+$(OBJS)\coredll_cocoa_brush.obj: ..\..\src\cocoa\brush.mm
+\r
+$(OBJS)\coredll_src_cocoa_button.obj: ..\..\src\cocoa\button.mm
+\r
+$(OBJS)\coredll_src_cocoa_checkbox.obj: ..\..\src\cocoa\checkbox.mm
+\r
+$(OBJS)\coredll_cocoa_checklst.obj: ..\..\src\cocoa\checklst.mm
+\r
+$(OBJS)\coredll_src_cocoa_choice.obj: ..\..\src\cocoa\choice.mm
+\r
+$(OBJS)\coredll_cocoa_clipbrd.obj: ..\..\src\cocoa\clipbrd.mm
+\r
+$(OBJS)\coredll_cocoa_colordlg.obj: ..\..\src\cocoa\colordlg.mm
+\r
+$(OBJS)\coredll_src_cocoa_colour.obj: ..\..\src\cocoa\colour.mm
+\r
+$(OBJS)\coredll_src_cocoa_combobox.obj: ..\..\src\cocoa\combobox.mm
+\r
+$(OBJS)\coredll_cocoa_control.obj: ..\..\src\cocoa\control.mm
+\r
+$(OBJS)\coredll_cocoa_cursor.obj: ..\..\src\cocoa\cursor.mm
+\r
+$(OBJS)\coredll_cocoa_data.obj: ..\..\src\cocoa\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\cocoa\data.cpp
+\r
+$(OBJS)\coredll_cocoa_dataobj.obj: ..\..\src\cocoa\dataobj.mm
+\r
+$(OBJS)\coredll_cocoa_dc.obj: ..\..\src\cocoa\dc.mm
+\r
+$(OBJS)\coredll_cocoa_dcclient.obj: ..\..\src\cocoa\dcclient.mm
+\r
+$(OBJS)\coredll_cocoa_dcmemory.obj: ..\..\src\cocoa\dcmemory.mm
+\r
+$(OBJS)\coredll_cocoa_dcscreen.obj: ..\..\src\cocoa\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\cocoa\dcscreen.cpp
+\r
+$(OBJS)\coredll_src_cocoa_dialog.obj: ..\..\src\cocoa\dialog.mm
+\r
+$(OBJS)\coredll_src_cocoa_dirdlg.obj: ..\..\src\cocoa\dirdlg.mm
+\r
+$(OBJS)\coredll_cocoa_display.obj: ..\..\src\cocoa\display.mm
+\r
+$(OBJS)\coredll_drawer.obj: ..\..\src\cocoa\drawer.mm
+\r
+$(OBJS)\coredll_src_cocoa_evtloop.obj: ..\..\src\cocoa\evtloop.mm
+\r
+$(OBJS)\coredll_src_cocoa_filedlg.obj: ..\..\src\cocoa\filedlg.mm
+
+$(OBJS)\coredll_cocoa_font.obj: ..\..\src\cocoa\font.mm
+
+$(OBJS)\coredll_cocoa_fontdlg.obj: ..\..\src\cocoa\fontdlg.mm
+\r
+$(OBJS)\coredll_cocoa_fontenum.obj: ..\..\src\cocoa\fontenum.mm
+\r
+$(OBJS)\coredll_cocoa_fontutil.obj: ..\..\src\cocoa\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\cocoa\fontutil.cpp
+\r
+$(OBJS)\coredll_cocoa_frame.obj: ..\..\src\cocoa\frame.mm
+\r
+$(OBJS)\coredll_src_cocoa_gauge.obj: ..\..\src\cocoa\gauge.mm
+\r
+$(OBJS)\coredll_cocoa_icon.obj: ..\..\src\cocoa\icon.mm
+\r
+$(OBJS)\coredll_src_cocoa_listbox.obj: ..\..\src\cocoa\listbox.mm
+\r
+$(OBJS)\coredll_cocoa_main.obj: ..\..\src\cocoa\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\cocoa\main.cpp
+\r
+$(OBJS)\coredll_mbarman.obj: ..\..\src\cocoa\mbarman.mm
+\r
+$(OBJS)\coredll_cocoa_mdi.obj: ..\..\src\cocoa\mdi.mm
+\r
+$(OBJS)\coredll_src_cocoa_menu.obj: ..\..\src\cocoa\menu.mm
+\r
+$(OBJS)\coredll_src_cocoa_menuitem.obj: ..\..\src\cocoa\menuitem.mm
+\r
+$(OBJS)\coredll_src_cocoa_msgdlg.obj: ..\..\src\cocoa\msgdlg.mm
+\r
+$(OBJS)\coredll_src_cocoa_notebook.obj: ..\..\src\cocoa\notebook.mm
+\r
+$(OBJS)\coredll_cocoa_pen.obj: ..\..\src\cocoa\pen.mm
+\r
+$(OBJS)\coredll_cocoa_radiobox.obj: ..\..\src\cocoa\radiobox.mm
+\r
+$(OBJS)\coredll_src_cocoa_radiobut.obj: ..\..\src\cocoa\radiobut.mm
+\r
+$(OBJS)\coredll_cocoa_region.obj: ..\..\src\cocoa\region.mm
+\r
+$(OBJS)\coredll_src_cocoa_scrolbar.obj: ..\..\src\cocoa\scrolbar.mm
+\r
+$(OBJS)\coredll_cocoa_settings.obj: ..\..\src\cocoa\settings.mm
+\r
+$(OBJS)\coredll_src_cocoa_slider.obj: ..\..\src\cocoa\slider.mm
+\r
+$(OBJS)\coredll_sound.obj: ..\..\src\cocoa\sound.mm
+\r
+$(OBJS)\coredll_src_cocoa_spinbutt.obj: ..\..\src\cocoa\spinbutt.mm
+\r
+$(OBJS)\coredll_cocoa_statbmp.obj: ..\..\src\cocoa\statbmp.mm
+\r
+$(OBJS)\coredll_src_cocoa_statbox.obj: ..\..\src\cocoa\statbox.mm
+\r
+$(OBJS)\coredll_statline2.obj: ..\..\src\cocoa\statline2.mm
+\r
+$(OBJS)\coredll_src_cocoa_stattext.obj: ..\..\src\cocoa\stattext.mm
+\r
+$(OBJS)\coredll_src_cocoa_textctrl.obj: ..\..\src\cocoa\textctrl.mm
+\r
+$(OBJS)\coredll_cocoa_timer.obj: ..\..\src\cocoa\timer.mm
+\r
+$(OBJS)\coredll_src_cocoa_toolbar.obj: ..\..\src\cocoa\toolbar.mm
+\r
+$(OBJS)\coredll_src_cocoa_tooltip.obj: ..\..\src\cocoa\tooltip.mm
+\r
+$(OBJS)\coredll_cocoa_toplevel.obj: ..\..\src\cocoa\toplevel.mm
+\r
+$(OBJS)\coredll_src_cocoa_utils.obj: ..\..\src\cocoa\utils.mm
+\r
+$(OBJS)\coredll_utilsexc.obj: ..\..\src\cocoa\utilsexc.mm
+\r
+$(OBJS)\coredll_src_cocoa_window.obj: ..\..\src\cocoa\window.mm
+\r
+$(OBJS)\coredll_os2_accel.obj: ..\..\src\os2\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\accel.cpp
+\r
+$(OBJS)\coredll_os2_app.obj: ..\..\src\os2\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\app.cpp
+\r
+$(OBJS)\coredll_os2_bitmap.obj: ..\..\src\os2\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\bitmap.cpp
+\r
+$(OBJS)\coredll_os2_bmpbuttn.obj: ..\..\src\os2\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\bmpbuttn.cpp
+\r
+$(OBJS)\coredll_os2_brush.obj: ..\..\src\os2\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\brush.cpp
+\r
+$(OBJS)\coredll_os2_button.obj: ..\..\src\os2\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\button.cpp
+\r
+$(OBJS)\coredll_os2_checkbox.obj: ..\..\src\os2\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\checkbox.cpp
+\r
+$(OBJS)\coredll_os2_checklst.obj: ..\..\src\os2\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\checklst.cpp
+\r
+$(OBJS)\coredll_os2_choice.obj: ..\..\src\os2\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\choice.cpp
+\r
+$(OBJS)\coredll_os2_clipbrd.obj: ..\..\src\os2\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\clipbrd.cpp
+\r
+$(OBJS)\coredll_os2_colour.obj: ..\..\src\os2\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\colour.cpp
+\r
+$(OBJS)\coredll_os2_combobox.obj: ..\..\src\os2\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\combobox.cpp
+\r
+$(OBJS)\coredll_os2_control.obj: ..\..\src\os2\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\control.cpp
+\r
+$(OBJS)\coredll_os2_cursor.obj: ..\..\src\os2\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\cursor.cpp
+\r
+$(OBJS)\coredll_os2_data.obj: ..\..\src\os2\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\data.cpp
+\r
+$(OBJS)\coredll_os2_dataobj.obj: ..\..\src\os2\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dataobj.cpp
+\r
+$(OBJS)\coredll_os2_dc.obj: ..\..\src\os2\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dc.cpp
+\r
+$(OBJS)\coredll_os2_dcclient.obj: ..\..\src\os2\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dcclient.cpp
+\r
+$(OBJS)\coredll_os2_dcmemory.obj: ..\..\src\os2\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dcmemory.cpp
+\r
+$(OBJS)\coredll_os2_dcprint.obj: ..\..\src\os2\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dcprint.cpp
+\r
+$(OBJS)\coredll_os2_dcscreen.obj: ..\..\src\os2\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dcscreen.cpp
+\r
+$(OBJS)\coredll_os2_dialog.obj: ..\..\src\os2\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dialog.cpp
+\r
+$(OBJS)\coredll_os2_dnd.obj: ..\..\src\os2\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\dnd.cpp
+\r
+$(OBJS)\coredll_os2_evtloop.obj: ..\..\src\os2\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\evtloop.cpp
+\r
+$(OBJS)\coredll_os2_filedlg.obj: ..\..\src\os2\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\filedlg.cpp
+\r
+$(OBJS)\coredll_os2_font.obj: ..\..\src\os2\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\font.cpp
+\r
+$(OBJS)\coredll_os2_fontdlg.obj: ..\..\src\os2\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\fontdlg.cpp
+\r
+$(OBJS)\coredll_os2_fontenum.obj: ..\..\src\os2\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\fontenum.cpp
+\r
+$(OBJS)\coredll_os2_fontutil.obj: ..\..\src\os2\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\fontutil.cpp
+\r
+$(OBJS)\coredll_os2_frame.obj: ..\..\src\os2\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\frame.cpp
+\r
+$(OBJS)\coredll_os2_gauge.obj: ..\..\src\os2\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\gauge.cpp
+\r
+$(OBJS)\coredll_os2_gdiimage.obj: ..\..\src\os2\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\gdiimage.cpp
+\r
+$(OBJS)\coredll_sockpm.obj: ..\..\src\os2\sockpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\sockpm.cpp
+\r
+$(OBJS)\coredll_os2_helpwin.obj: ..\..\src\os2\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\helpwin.cpp
+\r
+$(OBJS)\coredll_os2_icon.obj: ..\..\src\os2\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\icon.cpp
+\r
+$(OBJS)\coredll_os2_iniconf.obj: ..\..\src\os2\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\iniconf.cpp
+\r
+$(OBJS)\coredll_os2_listbox.obj: ..\..\src\os2\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\listbox.cpp
+\r
+$(OBJS)\coredll_os2_main.obj: ..\..\src\os2\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\main.cpp
+\r
+$(OBJS)\coredll_os2_menu.obj: ..\..\src\os2\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\menu.cpp
+\r
+$(OBJS)\coredll_os2_menuitem.obj: ..\..\src\os2\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\menuitem.cpp
+\r
+$(OBJS)\coredll_os2_metafile.obj: ..\..\src\os2\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\metafile.cpp
+\r
+$(OBJS)\coredll_os2_minifram.obj: ..\..\src\os2\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\minifram.cpp
+\r
+$(OBJS)\coredll_os2_msgdlg.obj: ..\..\src\os2\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\msgdlg.cpp
+\r
+$(OBJS)\coredll_os2_nativdlg.obj: ..\..\src\os2\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\nativdlg.cpp
+\r
+$(OBJS)\coredll_os2_notebook.obj: ..\..\src\os2\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\notebook.cpp
+\r
+$(OBJS)\coredll_os2_ownerdrw.obj: ..\..\src\os2\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\ownerdrw.cpp
+\r
+$(OBJS)\coredll_os2_palette.obj: ..\..\src\os2\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\palette.cpp
+\r
+$(OBJS)\coredll_os2_pen.obj: ..\..\src\os2\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\pen.cpp
+\r
+$(OBJS)\coredll_os2_popupwin.obj: ..\..\src\os2\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\popupwin.cpp
+\r
+$(OBJS)\coredll_os2_print.obj: ..\..\src\os2\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\print.cpp
+\r
+$(OBJS)\coredll_os2_radiobox.obj: ..\..\src\os2\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\radiobox.cpp
+\r
+$(OBJS)\coredll_os2_radiobut.obj: ..\..\src\os2\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\radiobut.cpp
+\r
+$(OBJS)\coredll_os2_region.obj: ..\..\src\os2\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\region.cpp
+\r
+$(OBJS)\coredll_os2_scrolbar.obj: ..\..\src\os2\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\scrolbar.cpp
+\r
+$(OBJS)\coredll_os2_settings.obj: ..\..\src\os2\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\settings.cpp
+\r
+$(OBJS)\coredll_os2_slider.obj: ..\..\src\os2\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\slider.cpp
+\r
+$(OBJS)\coredll_os2_spinbutt.obj: ..\..\src\os2\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\spinbutt.cpp
+\r
+$(OBJS)\coredll_os2_spinctrl.obj: ..\..\src\os2\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\spinctrl.cpp
+\r
+$(OBJS)\coredll_os2_statbmp.obj: ..\..\src\os2\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\statbmp.cpp
+\r
+$(OBJS)\coredll_os2_statbox.obj: ..\..\src\os2\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\statbox.cpp
+\r
+$(OBJS)\coredll_os2_statline.obj: ..\..\src\os2\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\statline.cpp
+\r
+$(OBJS)\coredll_os2_stattext.obj: ..\..\src\os2\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\stattext.cpp
+\r
+$(OBJS)\coredll_os2_textctrl.obj: ..\..\src\os2\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\textctrl.cpp
+\r
+$(OBJS)\coredll_os2_textentry.obj: ..\..\src\os2\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\textentry.cpp
+\r
+$(OBJS)\coredll_os2_tglbtn.obj: ..\..\src\os2\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\tglbtn.cpp
+\r
+$(OBJS)\coredll_os2_timer.obj: ..\..\src\os2\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\timer.cpp
+\r
+$(OBJS)\coredll_os2_toolbar.obj: ..\..\src\os2\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\toolbar.cpp
+\r
+$(OBJS)\coredll_os2_tooltip.obj: ..\..\src\os2\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\tooltip.cpp
+\r
+$(OBJS)\coredll_os2_toplevel.obj: ..\..\src\os2\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\toplevel.cpp
+\r
+$(OBJS)\coredll_os2_utilsgui.obj: ..\..\src\os2\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\utilsgui.cpp
+\r
+$(OBJS)\coredll_os2_window.obj: ..\..\src\os2\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\os2\window.cpp
+\r
+$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+\r
+$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
+\r
+$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+\r
+$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+\r
+$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+\r
+$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+\r
+$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
+\r
+$(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+\r
+$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+\r
+$(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+\r
+$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+\r
+$(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+\r
+$(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
+\r
+$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+\r
+$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+\r
+$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+\r
+$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+\r
+$(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+\r
+$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+\r
+$(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+\r
+$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+\r
+$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+\r
+$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+\r
+$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+\r
+$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+\r
+$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+\r
+$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+\r
+$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+\r
+$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+\r
+$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+\r
+$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+\r
+$(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
+\r
+$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+\r
+$(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+\r
+$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+\r
+$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+\r
+$(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+\r
+$(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+\r
+$(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk_dcclient.obj: ..\..\src\gtk\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk_dcmemory.obj: ..\..\src\gtk\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk_dcscreen.obj: ..\..\src\gtk\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dcscreen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_app.obj: ..\..\src\gtk1\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_bitmap.obj: ..\..\src\gtk1\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_brush.obj: ..\..\src\gtk1\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_clipbrd.obj: ..\..\src\gtk1\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_colour.obj: ..\..\src\gtk1\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_cursor.obj: ..\..\src\gtk1\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_data.obj: ..\..\src\gtk1\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\data.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dataobj.obj: ..\..\src\gtk1\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dc.obj: ..\..\src\gtk1\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dcclient.obj: ..\..\src\gtk1\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dcmemory.obj: ..\..\src\gtk1\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dcscreen.obj: ..\..\src\gtk1\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dcscreen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_dnd.obj: ..\..\src\gtk1\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_evtloop.obj: ..\..\src\gtk1\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_font.obj: ..\..\src\gtk1\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_sockgtk.obj: ..\..\src\gtk1\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_main.obj: ..\..\src\gtk1\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\main.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_minifram.obj: ..\..\src\gtk1\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_pen.obj: ..\..\src\gtk1\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_popupwin.obj: ..\..\src\gtk1\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_region.obj: ..\..\src\gtk1\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_renderer.obj: ..\..\src\gtk1\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_settings.obj: ..\..\src\gtk1\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_timer.obj: ..\..\src\gtk1\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_tooltip.obj: ..\..\src\gtk1\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_toplevel.obj: ..\..\src\gtk1\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_utilsgtk.obj: ..\..\src\gtk1\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_win_gtk.obj: ..\..\src\gtk1\win_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) ..\..\src\gtk1\win_gtk.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gtk1_window.obj: ..\..\src\gtk1\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk1\window.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_msw_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_hid.obj: ..\..\src\osx\core\hid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\core\hid.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_utilsexc_cf.obj: ..\..\src\osx\core\utilsexc_cf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\osx\core\utilsexc_cf.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_timer.obj: ..\..\src\generic\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_app.obj: ..\..\src\x11\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_clipbrd.obj: ..\..\src\x11\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_colour.obj: ..\..\src\x11\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_cursor.obj: ..\..\src\x11\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_data.obj: ..\..\src\x11\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\data.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_dataobj.obj: ..\..\src\x11\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_dc.obj: ..\..\src\x11\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_dcclient.obj: ..\..\src\x11\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_dcmemory.obj: ..\..\src\x11\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_dcscreen.obj: ..\..\src\x11\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\dcscreen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_evtloop.obj: ..\..\src\x11\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_font.obj: ..\..\src\x11\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_minifram.obj: ..\..\src\x11\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_nanox.obj: ..\..\src\x11\nanox.c
+       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) ..\..\src\x11\nanox.c
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_popupwin.obj: ..\..\src\x11\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_reparent.obj: ..\..\src\x11\reparent.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\reparent.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_settings.obj: ..\..\src\x11\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_toplevel.obj: ..\..\src\x11\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_utils.obj: ..\..\src\x11\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\utils.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_x11_window.obj: ..\..\src\x11\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\x11\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontmgrcmn.obj: ..\..\src\common\fontmgrcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmgrcmn.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_colour.obj: ..\..\src\generic\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_mask.obj: ..\..\src\generic\mask.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mask.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_app.obj: ..\..\src\dfb\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_bitmap.obj: ..\..\src\dfb\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_brush.obj: ..\..\src\dfb\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_cursor.obj: ..\..\src\dfb\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_dc.obj: ..\..\src\dfb\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_dcclient.obj: ..\..\src\dfb\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_dcmemory.obj: ..\..\src\dfb\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_dcscreen.obj: ..\..\src\dfb\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\dcscreen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_evtloop.obj: ..\..\src\dfb\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_font.obj: ..\..\src\dfb\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_fontenum.obj: ..\..\src\dfb\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\fontenum.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontmgr.obj: ..\..\src\dfb\fontmgr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\fontmgr.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_nonownedwnd.obj: ..\..\src\dfb\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\nonownedwnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_overlay.obj: ..\..\src\dfb\overlay.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\overlay.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_pen.obj: ..\..\src\dfb\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_region.obj: ..\..\src\dfb\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_settings.obj: ..\..\src\dfb\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_toplevel.obj: ..\..\src\dfb\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_utils.obj: ..\..\src\dfb\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\utils.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dfb_window.obj: ..\..\src\dfb\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\coredll_wrapdfb.obj: ..\..\src\dfb\wrapdfb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\dfb\wrapdfb.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_anybutton.obj: ..\..\src\gtk\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\anybutton.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_artgtk.obj: ..\..\src\gtk\artgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\artgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_bmpbuttn.obj: ..\..\src\gtk\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\bmpbuttn.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_button.obj: ..\..\src\gtk\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\button.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_checkbox.obj: ..\..\src\gtk\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\checkbox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_checklst.obj: ..\..\src\gtk\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\checklst.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_choice.obj: ..\..\src\gtk\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\choice.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_collpane.obj: ..\..\src\gtk\collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\collpane.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_colordlg.obj: ..\..\src\gtk\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\colordlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_combobox.obj: ..\..\src\gtk\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\combobox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_control.obj: ..\..\src\gtk\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\control.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_clrpicker.obj: ..\..\src\gtk\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\clrpicker.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_dialog.obj: ..\..\src\gtk\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dialog.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_fontpicker.obj: ..\..\src\gtk\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\fontpicker.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filepicker.obj: ..\..\src\gtk\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filepicker.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_dirdlg.obj: ..\..\src\gtk\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\dirdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_filedlg.obj: ..\..\src\gtk\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\filedlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_fontdlg.obj: ..\..\src\gtk\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\fontdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_frame.obj: ..\..\src\gtk\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\frame.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_gauge.obj: ..\..\src\gtk\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\gauge.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gvfs.obj: ..\..\src\gtk\gnome\gvfs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\gnome\gvfs.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_infobar.obj: ..\..\src\gtk\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\infobar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_listbox.obj: ..\..\src\gtk\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\listbox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_mdi.obj: ..\..\src\gtk\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\mdi.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_menu.obj: ..\..\src\gtk\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\menu.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_mnemonics.obj: ..\..\src\gtk\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\mnemonics.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_msgdlg.obj: ..\..\src\gtk\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\msgdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_nativewin.obj: ..\..\src\gtk\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\nativewin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_notebook.obj: ..\..\src\gtk\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\notebook.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_print.obj: ..\..\src\gtk\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\print.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_radiobox.obj: ..\..\src\gtk\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\radiobox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_radiobut.obj: ..\..\src\gtk\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\radiobut.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_scrolbar.obj: ..\..\src\gtk\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\scrolbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_scrolwin.obj: ..\..\src\gtk\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\scrolwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_slider.obj: ..\..\src\gtk\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\slider.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_spinbutt.obj: ..\..\src\gtk\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\spinbutt.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_spinctrl.obj: ..\..\src\gtk\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\spinctrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_statbmp.obj: ..\..\src\gtk\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\statbmp.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_statbox.obj: ..\..\src\gtk\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\statbox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_statline.obj: ..\..\src\gtk\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\statline.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_stattext.obj: ..\..\src\gtk\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\stattext.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_toolbar.obj: ..\..\src\gtk\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\toolbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_textctrl.obj: ..\..\src\gtk\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\textctrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_textentry.obj: ..\..\src\gtk\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\textentry.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gtk_tglbtn.obj: ..\..\src\gtk\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\gtk\tglbtn.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_treeentry_gtk.obj: ..\..\src\gtk\treeentry_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) ..\..\src\gtk\treeentry_gtk.c
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_colordlg.obj: ..\..\src\msw\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_filedlg.obj: ..\..\src\msw\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_frame.obj: ..\..\src\msw\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_iniconf.obj: ..\..\src\msw\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_mdi.obj: ..\..\src\msw\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_menuitem.obj: ..\..\src\msw\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_metafile.obj: ..\..\src\msw\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\metafile.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_regiong.obj: ..\..\src\generic\regiong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\regiong.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_arttango.obj: ..\..\src\common\arttango.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docmdi.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docview.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmap.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\framecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\geometry.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagall.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\image.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagfill.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imaggif.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagiff.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpng.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtga.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\layout.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stockitem.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\treebase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valgen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\validate.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_valnum.obj: ..\..\src\common\valnum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_generic_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\renderg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\selstore.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\splitter.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
+!endif\r
+\r
+$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\event.cpp
+
+$(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp
+
+$(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\msgout.cpp
+
+$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
+
+$(OBJS)\corelib_msw_main.obj: ..\..\src\msw\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp
+
+$(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp
+
+$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
+
+$(OBJS)\corelib_carbon_utils.obj: ..\..\src\osx\carbon\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\utils.cpp
+
+$(OBJS)\corelib_uma.obj: ..\..\src\osx\carbon\uma.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\uma.cpp
+
+$(OBJS)\corelib_osx_cocoa_utils.obj: ..\..\src\osx\cocoa\utils.mm
+
+$(OBJS)\corelib_gprint.obj: ..\..\src\gtk\gnome\gprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\gnome\gprint.cpp
+
+$(OBJS)\corelib_gtk1_bmpbuttn.obj: ..\..\src\gtk1\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\bmpbuttn.cpp
+
+$(OBJS)\corelib_gtk1_button.obj: ..\..\src\gtk1\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\button.cpp
+
+$(OBJS)\corelib_gtk1_checkbox.obj: ..\..\src\gtk1\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\checkbox.cpp
+
+$(OBJS)\corelib_gtk1_checklst.obj: ..\..\src\gtk1\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\checklst.cpp
+
+$(OBJS)\corelib_gtk1_choice.obj: ..\..\src\gtk1\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\choice.cpp
+
+$(OBJS)\corelib_gtk1_combobox.obj: ..\..\src\gtk1\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\combobox.cpp
+
+$(OBJS)\corelib_gtk1_control.obj: ..\..\src\gtk1\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\control.cpp
+
+$(OBJS)\corelib_gtk1_dialog.obj: ..\..\src\gtk1\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dialog.cpp
+
+$(OBJS)\corelib_gtk1_filedlg.obj: ..\..\src\gtk1\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\filedlg.cpp
+
+$(OBJS)\corelib_gtk1_fontdlg.obj: ..\..\src\gtk1\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\fontdlg.cpp
+
+$(OBJS)\corelib_gtk1_frame.obj: ..\..\src\gtk1\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\frame.cpp
+
+$(OBJS)\corelib_gtk1_gauge.obj: ..\..\src\gtk1\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\gauge.cpp
+
+$(OBJS)\corelib_gtk1_listbox.obj: ..\..\src\gtk1\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\listbox.cpp
+
+$(OBJS)\corelib_gtk1_mdi.obj: ..\..\src\gtk1\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\mdi.cpp
+
+$(OBJS)\corelib_gtk1_menu.obj: ..\..\src\gtk1\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\menu.cpp
+
+$(OBJS)\corelib_gtk1_mnemonics.obj: ..\..\src\gtk1\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\mnemonics.cpp
+
+$(OBJS)\corelib_gtk1_notebook.obj: ..\..\src\gtk1\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\notebook.cpp
+
+$(OBJS)\corelib_gtk1_radiobox.obj: ..\..\src\gtk1\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\radiobox.cpp
+
+$(OBJS)\corelib_gtk1_radiobut.obj: ..\..\src\gtk1\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\radiobut.cpp
+
+$(OBJS)\corelib_gtk1_scrolbar.obj: ..\..\src\gtk1\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\scrolbar.cpp
+
+$(OBJS)\corelib_gtk1_scrolwin.obj: ..\..\src\gtk1\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\scrolwin.cpp
+
+$(OBJS)\corelib_gtk1_slider.obj: ..\..\src\gtk1\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\slider.cpp
+
+$(OBJS)\corelib_gtk1_spinbutt.obj: ..\..\src\gtk1\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\spinbutt.cpp
+
+$(OBJS)\corelib_gtk1_spinctrl.obj: ..\..\src\gtk1\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\spinctrl.cpp
+
+$(OBJS)\corelib_gtk1_statbmp.obj: ..\..\src\gtk1\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\statbmp.cpp
+
+$(OBJS)\corelib_gtk1_statbox.obj: ..\..\src\gtk1\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\statbox.cpp
+
+$(OBJS)\corelib_gtk1_statline.obj: ..\..\src\gtk1\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\statline.cpp
+
+$(OBJS)\corelib_gtk1_stattext.obj: ..\..\src\gtk1\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\stattext.cpp
+
+$(OBJS)\corelib_gtk1_toolbar.obj: ..\..\src\gtk1\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\toolbar.cpp
+
+$(OBJS)\corelib_gtk1_textctrl.obj: ..\..\src\gtk1\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\textctrl.cpp
+
+$(OBJS)\corelib_gtk1_tglbtn.obj: ..\..\src\gtk1\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\tglbtn.cpp
+
+$(OBJS)\corelib_motif_accel.obj: ..\..\src\motif\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\accel.cpp
+
+$(OBJS)\corelib_motif_app.obj: ..\..\src\motif\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\app.cpp
+
+$(OBJS)\corelib_motif_bmpbuttn.obj: ..\..\src\motif\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\bmpbuttn.cpp
+
+$(OBJS)\corelib_bmpmotif.obj: ..\..\src\motif\bmpmotif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\bmpmotif.cpp
+
+$(OBJS)\corelib_motif_button.obj: ..\..\src\motif\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\button.cpp
+
+$(OBJS)\corelib_motif_checkbox.obj: ..\..\src\motif\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\checkbox.cpp
+
+$(OBJS)\corelib_motif_checklst.obj: ..\..\src\motif\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\checklst.cpp
+
+$(OBJS)\corelib_motif_choice.obj: ..\..\src\motif\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\choice.cpp
+
+$(OBJS)\corelib_motif_clipbrd.obj: ..\..\src\motif\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\clipbrd.cpp
+
+$(OBJS)\corelib_motif_colour.obj: ..\..\src\motif\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\colour.cpp
+
+$(OBJS)\corelib_motif_combobox.obj: ..\..\src\motif\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\combobox.cpp
+
+$(OBJS)\corelib_combobox_native.obj: ..\..\src\motif\combobox_native.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\combobox_native.cpp
+
+$(OBJS)\corelib_motif_control.obj: ..\..\src\motif\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\control.cpp
+
+$(OBJS)\corelib_motif_cursor.obj: ..\..\src\motif\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\cursor.cpp
+
+$(OBJS)\corelib_motif_data.obj: ..\..\src\motif\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\data.cpp
+
+$(OBJS)\corelib_motif_dataobj.obj: ..\..\src\motif\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dataobj.cpp
+
+$(OBJS)\corelib_motif_dc.obj: ..\..\src\motif\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dc.cpp
+
+$(OBJS)\corelib_motif_dcclient.obj: ..\..\src\motif\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dcclient.cpp
+
+$(OBJS)\corelib_motif_dcmemory.obj: ..\..\src\motif\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dcmemory.cpp
+
+$(OBJS)\corelib_motif_dcscreen.obj: ..\..\src\motif\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dcscreen.cpp
+
+$(OBJS)\corelib_motif_dialog.obj: ..\..\src\motif\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\dialog.cpp
+
+$(OBJS)\corelib_motif_evtloop.obj: ..\..\src\motif\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\evtloop.cpp
+
+$(OBJS)\corelib_motif_filedlg.obj: ..\..\src\motif\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\filedlg.cpp
+
+$(OBJS)\corelib_motif_font.obj: ..\..\src\motif\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\font.cpp
+
+$(OBJS)\corelib_motif_frame.obj: ..\..\src\motif\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\frame.cpp
+
+$(OBJS)\corelib_motif_gauge.obj: ..\..\src\motif\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\gauge.cpp
+
+$(OBJS)\corelib_sockmot.obj: ..\..\src\motif\sockmot.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\sockmot.cpp
+
+$(OBJS)\corelib_motif_icon.obj: ..\..\src\motif\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\icon.cpp
+
+$(OBJS)\corelib_motif_listbox.obj: ..\..\src\motif\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\listbox.cpp
+
+$(OBJS)\corelib_motif_main.obj: ..\..\src\motif\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\main.cpp
+
+$(OBJS)\corelib_motif_menu.obj: ..\..\src\motif\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\menu.cpp
+
+$(OBJS)\corelib_motif_menuitem.obj: ..\..\src\motif\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\menuitem.cpp
+
+$(OBJS)\corelib_motif_minifram.obj: ..\..\src\motif\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\minifram.cpp
+
+$(OBJS)\corelib_motif_msgdlg.obj: ..\..\src\motif\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\msgdlg.cpp
+
+$(OBJS)\corelib_motif_popupwin.obj: ..\..\src\motif\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\popupwin.cpp
+
+$(OBJS)\corelib_motif_radiobox.obj: ..\..\src\motif\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\radiobox.cpp
+
+$(OBJS)\corelib_motif_radiobut.obj: ..\..\src\motif\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\radiobut.cpp
+
+$(OBJS)\corelib_motif_scrolbar.obj: ..\..\src\motif\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\scrolbar.cpp
+
+$(OBJS)\corelib_motif_settings.obj: ..\..\src\motif\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\settings.cpp
+
+$(OBJS)\corelib_motif_slider.obj: ..\..\src\motif\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\slider.cpp
+
+$(OBJS)\corelib_motif_spinbutt.obj: ..\..\src\motif\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\spinbutt.cpp
+
+$(OBJS)\corelib_motif_statbmp.obj: ..\..\src\motif\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\statbmp.cpp
+
+$(OBJS)\corelib_motif_statbox.obj: ..\..\src\motif\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\statbox.cpp
+
+$(OBJS)\corelib_motif_stattext.obj: ..\..\src\motif\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\stattext.cpp
+
+$(OBJS)\corelib_motif_textctrl.obj: ..\..\src\motif\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\textctrl.cpp
+
+$(OBJS)\corelib_motif_textentry.obj: ..\..\src\motif\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\textentry.cpp
+
+$(OBJS)\corelib_motif_timer.obj: ..\..\src\motif\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\timer.cpp
+
+$(OBJS)\corelib_motif_toolbar.obj: ..\..\src\motif\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\toolbar.cpp
+
+$(OBJS)\corelib_motif_toplevel.obj: ..\..\src\motif\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\toplevel.cpp
+
+$(OBJS)\corelib_motif_utils.obj: ..\..\src\motif\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\utils.cpp
+
+$(OBJS)\corelib_motif_window.obj: ..\..\src\motif\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\motif\window.cpp
+
+$(OBJS)\corelib_xmcombo.obj: ..\..\src\motif\xmcombo\xmcombo.c
+       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) ..\..\src\motif\xmcombo\xmcombo.c
+
+$(OBJS)\corelib_generic_notebook.obj: ..\..\src\generic\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\notebook.cpp
+
+$(OBJS)\corelib_generic_statline.obj: ..\..\src\generic\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statline.cpp
+
+$(OBJS)\corelib_tabg.obj: ..\..\src\generic\tabg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
+
+$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+
+$(OBJS)\corelib_msw_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
+
+$(OBJS)\corelib_wince_checklst.obj: ..\..\src\msw\wince\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\checklst.cpp
+
+$(OBJS)\corelib_choicece.obj: ..\..\src\msw\wince\choicece.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\choicece.cpp
+
+$(OBJS)\corelib_crt.obj: ..\..\src\msw\wince\crt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\crt.cpp
+
+$(OBJS)\corelib_filedlgwce.obj: ..\..\src\msw\wince\filedlgwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\filedlgwce.cpp
+
+$(OBJS)\corelib_filefnwce.obj: ..\..\src\msw\wince\filefnwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\filefnwce.cpp
+
+$(OBJS)\corelib_helpwce.obj: ..\..\src\msw\wince\helpwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\helpwce.cpp
+
+$(OBJS)\corelib_menuce.obj: ..\..\src\msw\wince\menuce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\menuce.cpp
+
+$(OBJS)\corelib_tbarwce.obj: ..\..\src\msw\wince\tbarwce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\tbarwce.cpp
+
+$(OBJS)\corelib_textctrlce.obj: ..\..\src\msw\wince\textctrlce.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\wince\textctrlce.cpp
+
+$(OBJS)\corelib_carbon_anybutton.obj: ..\..\src\osx\carbon\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\anybutton.cpp
+
+$(OBJS)\corelib_carbon_bmpbuttn.obj: ..\..\src\osx\carbon\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\bmpbuttn.cpp
+
+$(OBJS)\corelib_carbon_button.obj: ..\..\src\osx\carbon\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\button.cpp
+
+$(OBJS)\corelib_carbon_checkbox.obj: ..\..\src\osx\carbon\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\checkbox.cpp
+
+$(OBJS)\corelib_carbon_choice.obj: ..\..\src\osx\carbon\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\choice.cpp
+
+$(OBJS)\corelib_carbon_colordlg.obj: ..\..\src\osx\carbon\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\colordlg.cpp
+
+$(OBJS)\corelib_carbon_dialog.obj: ..\..\src\osx\carbon\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\dialog.cpp
+
+$(OBJS)\corelib_carbon_dirdlg.obj: ..\..\src\osx\carbon\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\dirdlg.cpp
+
+$(OBJS)\corelib_carbon_dnd.obj: ..\..\src\osx\carbon\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\dnd.cpp
+
+$(OBJS)\corelib_carbon_evtloop.obj: ..\..\src\osx\carbon\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\evtloop.cpp
+
+$(OBJS)\corelib_carbon_filedlg.obj: ..\..\src\osx\carbon\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\filedlg.cpp
+
+$(OBJS)\corelib_carbon_gauge.obj: ..\..\src\osx\carbon\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\gauge.cpp
+
+$(OBJS)\corelib_carbon_listbox.obj: ..\..\src\osx\carbon\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\listbox.cpp
+
+$(OBJS)\corelib_listctrl_mac.obj: ..\..\src\osx\carbon\listctrl_mac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\listctrl_mac.cpp
+
+$(OBJS)\corelib_carbon_menu.obj: ..\..\src\osx\carbon\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\menu.cpp
+
+$(OBJS)\corelib_carbon_menuitem.obj: ..\..\src\osx\carbon\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\menuitem.cpp
+
+$(OBJS)\corelib_carbon_msgdlg.obj: ..\..\src\osx\carbon\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\msgdlg.cpp
+
+$(OBJS)\corelib_carbon_nonownedwnd.obj: ..\..\src\osx\carbon\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\nonownedwnd.cpp
+
+$(OBJS)\corelib_notebmac.obj: ..\..\src\osx\carbon\notebmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\notebmac.cpp
+
+$(OBJS)\corelib_carbon_printdlg.obj: ..\..\src\osx\carbon\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\printdlg.cpp
+
+$(OBJS)\corelib_carbon_radiobut.obj: ..\..\src\osx\carbon\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\radiobut.cpp
+
+$(OBJS)\corelib_carbon_scrolbar.obj: ..\..\src\osx\carbon\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\scrolbar.cpp
+
+$(OBJS)\corelib_carbon_slider.obj: ..\..\src\osx\carbon\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\slider.cpp
+
+$(OBJS)\corelib_carbon_spinbutt.obj: ..\..\src\osx\carbon\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\spinbutt.cpp
+
+$(OBJS)\corelib_carbon_srchctrl.obj: ..\..\src\osx\carbon\srchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\srchctrl.cpp
+
+$(OBJS)\corelib_carbon_statbmp.obj: ..\..\src\osx\carbon\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\statbmp.cpp
+
+$(OBJS)\corelib_carbon_statbox.obj: ..\..\src\osx\carbon\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\statbox.cpp
+
+$(OBJS)\corelib_statlmac.obj: ..\..\src\osx\carbon\statlmac.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\statlmac.cpp
+
+$(OBJS)\corelib_carbon_stattext.obj: ..\..\src\osx\carbon\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\stattext.cpp
+
+$(OBJS)\corelib_carbon_textctrl.obj: ..\..\src\osx\carbon\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\textctrl.cpp
+
+$(OBJS)\corelib_carbon_tglbtn.obj: ..\..\src\osx\carbon\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\tglbtn.cpp
+\r
+$(OBJS)\corelib_carbon_toolbar.obj: ..\..\src\osx\carbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\toolbar.cpp
+\r
+$(OBJS)\corelib_carbon_tooltip.obj: ..\..\src\osx\carbon\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\tooltip.cpp
+\r
+$(OBJS)\corelib_carbon_window.obj: ..\..\src\osx\carbon\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\carbon\window.cpp
+\r
+$(OBJS)\corelib_cocoa_anybutton.obj: ..\..\src\osx\cocoa\anybutton.mm
+\r
+$(OBJS)\corelib_osx_cocoa_button.obj: ..\..\src\osx\cocoa\button.mm
+\r
+$(OBJS)\corelib_osx_cocoa_checkbox.obj: ..\..\src\osx\cocoa\checkbox.mm
+\r
+$(OBJS)\corelib_osx_cocoa_choice.obj: ..\..\src\osx\cocoa\choice.mm
+\r
+$(OBJS)\corelib_osx_cocoa_colour.obj: ..\..\src\osx\cocoa\colour.mm
+\r
+$(OBJS)\corelib_osx_cocoa_combobox.obj: ..\..\src\osx\cocoa\combobox.mm
+\r
+$(OBJS)\corelib_osx_cocoa_dialog.obj: ..\..\src\osx\cocoa\dialog.mm
+\r
+$(OBJS)\corelib_osx_cocoa_dirdlg.obj: ..\..\src\osx\cocoa\dirdlg.mm
+\r
+$(OBJS)\corelib_cocoa_dnd.obj: ..\..\src\osx\cocoa\dnd.mm
+\r
+$(OBJS)\corelib_osx_cocoa_evtloop.obj: ..\..\src\osx\cocoa\evtloop.mm
+\r
+$(OBJS)\corelib_osx_cocoa_filedlg.obj: ..\..\src\osx\cocoa\filedlg.mm
+\r
+$(OBJS)\corelib_osx_cocoa_gauge.obj: ..\..\src\osx\cocoa\gauge.mm
+\r
+$(OBJS)\corelib_osx_cocoa_listbox.obj: ..\..\src\osx\cocoa\listbox.mm
+\r
+$(OBJS)\corelib_osx_cocoa_menu.obj: ..\..\src\osx\cocoa\menu.mm
+\r
+$(OBJS)\corelib_osx_cocoa_menuitem.obj: ..\..\src\osx\cocoa\menuitem.mm
+\r
+$(OBJS)\corelib_osx_cocoa_msgdlg.obj: ..\..\src\osx\cocoa\msgdlg.mm
+\r
+$(OBJS)\corelib_cocoa_nonownedwnd.obj: ..\..\src\osx\cocoa\nonownedwnd.mm
+\r
+$(OBJS)\corelib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
+\r
+$(OBJS)\corelib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
+\r
+$(OBJS)\corelib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
+\r
+$(OBJS)\corelib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
+\r
+$(OBJS)\corelib_osx_cocoa_slider.obj: ..\..\src\osx\cocoa\slider.mm
+\r
+$(OBJS)\corelib_osx_cocoa_spinbutt.obj: ..\..\src\osx\cocoa\spinbutt.mm
+\r
+$(OBJS)\corelib_cocoa_srchctrl.obj: ..\..\src\osx\cocoa\srchctrl.mm
+\r
+$(OBJS)\corelib_osx_cocoa_statbox.obj: ..\..\src\osx\cocoa\statbox.mm
+\r
+$(OBJS)\corelib_cocoa_statline.obj: ..\..\src\osx\cocoa\statline.mm
+\r
+$(OBJS)\corelib_osx_cocoa_stattext.obj: ..\..\src\osx\cocoa\stattext.mm
+\r
+$(OBJS)\corelib_osx_cocoa_textctrl.obj: ..\..\src\osx\cocoa\textctrl.mm
+\r
+$(OBJS)\corelib_cocoa_tglbtn.obj: ..\..\src\osx\cocoa\tglbtn.mm
+\r
+$(OBJS)\corelib_osx_cocoa_toolbar.obj: ..\..\src\osx\cocoa\toolbar.mm
+\r
+$(OBJS)\corelib_osx_cocoa_tooltip.obj: ..\..\src\osx\cocoa\tooltip.mm
+\r
+$(OBJS)\corelib_osx_cocoa_window.obj: ..\..\src\osx\cocoa\window.mm
+\r
+$(OBJS)\corelib_iphone_anybutton.obj: ..\..\src\osx\iphone\anybutton.mm
+\r
+$(OBJS)\corelib_iphone_button.obj: ..\..\src\osx\iphone\button.mm
+\r
+$(OBJS)\corelib_iphone_checkbox.obj: ..\..\src\osx\iphone\checkbox.mm
+\r
+$(OBJS)\corelib_iphone_dialog.obj: ..\..\src\osx\iphone\dialog.mm
+\r
+$(OBJS)\corelib_iphone_evtloop.obj: ..\..\src\osx\iphone\evtloop.mm
+\r
+$(OBJS)\corelib_iphone_gauge.obj: ..\..\src\osx\iphone\gauge.mm
+\r
+$(OBJS)\corelib_iphone_msgdlg.obj: ..\..\src\osx\iphone\msgdlg.mm
+\r
+$(OBJS)\corelib_iphone_nonownedwnd.obj: ..\..\src\osx\iphone\nonownedwnd.mm
+\r
+$(OBJS)\corelib_iphone_scrolbar.obj: ..\..\src\osx\iphone\scrolbar.mm
+\r
+$(OBJS)\corelib_iphone_slider.obj: ..\..\src\osx\iphone\slider.mm
+\r
+$(OBJS)\corelib_iphone_stattext.obj: ..\..\src\osx\iphone\stattext.mm
+\r
+$(OBJS)\corelib_iphone_textctrl.obj: ..\..\src\osx\iphone\textctrl.mm
+\r
+$(OBJS)\corelib_iphone_toolbar.obj: ..\..\src\osx\iphone\toolbar.mm
+\r
+$(OBJS)\corelib_iphone_utils.obj: ..\..\src\osx\iphone\utils.mm
+\r
+$(OBJS)\corelib_iphone_window.obj: ..\..\src\osx\iphone\window.mm
+\r
+$(OBJS)\corelib_NSBox.obj: ..\..\src\cocoa\NSBox.mm
+\r
+$(OBJS)\corelib_NSButton.obj: ..\..\src\cocoa\NSButton.mm
+\r
+$(OBJS)\corelib_NSControl.obj: ..\..\src\cocoa\NSControl.mm
+\r
+$(OBJS)\corelib_NSMenu.obj: ..\..\src\cocoa\NSMenu.mm
+\r
+$(OBJS)\corelib_NSPanel.obj: ..\..\src\cocoa\NSPanel.mm
+\r
+$(OBJS)\corelib_NSScroller.obj: ..\..\src\cocoa\NSScroller.mm
+\r
+$(OBJS)\corelib_NSSlider.obj: ..\..\src\cocoa\NSSlider.mm
+\r
+$(OBJS)\corelib_NSTabView.obj: ..\..\src\cocoa\NSTabView.mm
+\r
+$(OBJS)\corelib_NSTableView.obj: ..\..\src\cocoa\NSTableView.mm
+\r
+$(OBJS)\corelib_NSTextField.obj: ..\..\src\cocoa\NSTextField.mm
+\r
+$(OBJS)\corelib_NSView.obj: ..\..\src\cocoa\NSView.mm
+\r
+$(OBJS)\corelib_NSWindow.obj: ..\..\src\cocoa\NSWindow.mm
+\r
+$(OBJS)\corelib_ObjcRef.obj: ..\..\src\cocoa\ObjcRef.mm
+\r
+$(OBJS)\corelib_cocoa_app.obj: ..\..\src\cocoa\app.mm
+\r
+$(OBJS)\corelib_cocoa_bitmap.obj: ..\..\src\cocoa\bitmap.mm
+\r
+$(OBJS)\corelib_cocoa_bmpbuttn.obj: ..\..\src\cocoa\bmpbuttn.mm
+\r
+$(OBJS)\corelib_cocoa_brush.obj: ..\..\src\cocoa\brush.mm
+\r
+$(OBJS)\corelib_src_cocoa_button.obj: ..\..\src\cocoa\button.mm
+\r
+$(OBJS)\corelib_src_cocoa_checkbox.obj: ..\..\src\cocoa\checkbox.mm
+\r
+$(OBJS)\corelib_cocoa_checklst.obj: ..\..\src\cocoa\checklst.mm
+\r
+$(OBJS)\corelib_src_cocoa_choice.obj: ..\..\src\cocoa\choice.mm
+\r
+$(OBJS)\corelib_cocoa_clipbrd.obj: ..\..\src\cocoa\clipbrd.mm
+\r
+$(OBJS)\corelib_cocoa_colordlg.obj: ..\..\src\cocoa\colordlg.mm
+\r
+$(OBJS)\corelib_src_cocoa_colour.obj: ..\..\src\cocoa\colour.mm
+\r
+$(OBJS)\corelib_src_cocoa_combobox.obj: ..\..\src\cocoa\combobox.mm
+\r
+$(OBJS)\corelib_cocoa_control.obj: ..\..\src\cocoa\control.mm
+\r
+$(OBJS)\corelib_cocoa_cursor.obj: ..\..\src\cocoa\cursor.mm
+\r
+$(OBJS)\corelib_cocoa_data.obj: ..\..\src\cocoa\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\cocoa\data.cpp
+\r
+$(OBJS)\corelib_cocoa_dataobj.obj: ..\..\src\cocoa\dataobj.mm
+\r
+$(OBJS)\corelib_cocoa_dc.obj: ..\..\src\cocoa\dc.mm
+\r
+$(OBJS)\corelib_cocoa_dcclient.obj: ..\..\src\cocoa\dcclient.mm
+\r
+$(OBJS)\corelib_cocoa_dcmemory.obj: ..\..\src\cocoa\dcmemory.mm
+\r
+$(OBJS)\corelib_cocoa_dcscreen.obj: ..\..\src\cocoa\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\cocoa\dcscreen.cpp
+\r
+$(OBJS)\corelib_src_cocoa_dialog.obj: ..\..\src\cocoa\dialog.mm
+\r
+$(OBJS)\corelib_src_cocoa_dirdlg.obj: ..\..\src\cocoa\dirdlg.mm
+\r
+$(OBJS)\corelib_cocoa_display.obj: ..\..\src\cocoa\display.mm
+\r
+$(OBJS)\corelib_drawer.obj: ..\..\src\cocoa\drawer.mm
+\r
+$(OBJS)\corelib_src_cocoa_evtloop.obj: ..\..\src\cocoa\evtloop.mm
+\r
+$(OBJS)\corelib_src_cocoa_filedlg.obj: ..\..\src\cocoa\filedlg.mm
+\r
+$(OBJS)\corelib_cocoa_font.obj: ..\..\src\cocoa\font.mm
+\r
+$(OBJS)\corelib_cocoa_fontdlg.obj: ..\..\src\cocoa\fontdlg.mm
+\r
+$(OBJS)\corelib_cocoa_fontenum.obj: ..\..\src\cocoa\fontenum.mm
+
+$(OBJS)\corelib_cocoa_fontutil.obj: ..\..\src\cocoa\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\cocoa\fontutil.cpp
+
+$(OBJS)\corelib_cocoa_frame.obj: ..\..\src\cocoa\frame.mm
+\r
+$(OBJS)\corelib_src_cocoa_gauge.obj: ..\..\src\cocoa\gauge.mm
+\r
+$(OBJS)\corelib_cocoa_icon.obj: ..\..\src\cocoa\icon.mm
+\r
+$(OBJS)\corelib_src_cocoa_listbox.obj: ..\..\src\cocoa\listbox.mm
+\r
+$(OBJS)\corelib_cocoa_main.obj: ..\..\src\cocoa\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\cocoa\main.cpp
+\r
+$(OBJS)\corelib_mbarman.obj: ..\..\src\cocoa\mbarman.mm
+\r
+$(OBJS)\corelib_cocoa_mdi.obj: ..\..\src\cocoa\mdi.mm
+\r
+$(OBJS)\corelib_src_cocoa_menu.obj: ..\..\src\cocoa\menu.mm
+\r
+$(OBJS)\corelib_src_cocoa_menuitem.obj: ..\..\src\cocoa\menuitem.mm
+\r
+$(OBJS)\corelib_src_cocoa_msgdlg.obj: ..\..\src\cocoa\msgdlg.mm
+\r
+$(OBJS)\corelib_src_cocoa_notebook.obj: ..\..\src\cocoa\notebook.mm
+\r
+$(OBJS)\corelib_cocoa_pen.obj: ..\..\src\cocoa\pen.mm
+\r
+$(OBJS)\corelib_cocoa_radiobox.obj: ..\..\src\cocoa\radiobox.mm
+\r
+$(OBJS)\corelib_src_cocoa_radiobut.obj: ..\..\src\cocoa\radiobut.mm
+\r
+$(OBJS)\corelib_cocoa_region.obj: ..\..\src\cocoa\region.mm
+\r
+$(OBJS)\corelib_src_cocoa_scrolbar.obj: ..\..\src\cocoa\scrolbar.mm
+\r
+$(OBJS)\corelib_cocoa_settings.obj: ..\..\src\cocoa\settings.mm
+\r
+$(OBJS)\corelib_src_cocoa_slider.obj: ..\..\src\cocoa\slider.mm
+\r
+$(OBJS)\corelib_sound.obj: ..\..\src\cocoa\sound.mm
+\r
+$(OBJS)\corelib_src_cocoa_spinbutt.obj: ..\..\src\cocoa\spinbutt.mm
+\r
+$(OBJS)\corelib_cocoa_statbmp.obj: ..\..\src\cocoa\statbmp.mm
+\r
+$(OBJS)\corelib_src_cocoa_statbox.obj: ..\..\src\cocoa\statbox.mm
+\r
+$(OBJS)\corelib_statline2.obj: ..\..\src\cocoa\statline2.mm
+\r
+$(OBJS)\corelib_src_cocoa_stattext.obj: ..\..\src\cocoa\stattext.mm
+\r
+$(OBJS)\corelib_src_cocoa_textctrl.obj: ..\..\src\cocoa\textctrl.mm
+\r
+$(OBJS)\corelib_cocoa_timer.obj: ..\..\src\cocoa\timer.mm
+\r
+$(OBJS)\corelib_src_cocoa_toolbar.obj: ..\..\src\cocoa\toolbar.mm
+\r
+$(OBJS)\corelib_src_cocoa_tooltip.obj: ..\..\src\cocoa\tooltip.mm
+\r
+$(OBJS)\corelib_cocoa_toplevel.obj: ..\..\src\cocoa\toplevel.mm
+\r
+$(OBJS)\corelib_src_cocoa_utils.obj: ..\..\src\cocoa\utils.mm
+\r
+$(OBJS)\corelib_utilsexc.obj: ..\..\src\cocoa\utilsexc.mm
+\r
+$(OBJS)\corelib_src_cocoa_window.obj: ..\..\src\cocoa\window.mm
+\r
+$(OBJS)\corelib_os2_accel.obj: ..\..\src\os2\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\accel.cpp
+\r
+$(OBJS)\corelib_os2_app.obj: ..\..\src\os2\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\app.cpp
+\r
+$(OBJS)\corelib_os2_bitmap.obj: ..\..\src\os2\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\bitmap.cpp
+\r
+$(OBJS)\corelib_os2_bmpbuttn.obj: ..\..\src\os2\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\bmpbuttn.cpp
+\r
+$(OBJS)\corelib_os2_brush.obj: ..\..\src\os2\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\brush.cpp
+\r
+$(OBJS)\corelib_os2_button.obj: ..\..\src\os2\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\button.cpp
+\r
+$(OBJS)\corelib_os2_checkbox.obj: ..\..\src\os2\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\checkbox.cpp
+\r
+$(OBJS)\corelib_os2_checklst.obj: ..\..\src\os2\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\checklst.cpp
+\r
+$(OBJS)\corelib_os2_choice.obj: ..\..\src\os2\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\choice.cpp
+\r
+$(OBJS)\corelib_os2_clipbrd.obj: ..\..\src\os2\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\clipbrd.cpp
+\r
+$(OBJS)\corelib_os2_colour.obj: ..\..\src\os2\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\colour.cpp
+\r
+$(OBJS)\corelib_os2_combobox.obj: ..\..\src\os2\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\combobox.cpp
+\r
+$(OBJS)\corelib_os2_control.obj: ..\..\src\os2\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\control.cpp
+\r
+$(OBJS)\corelib_os2_cursor.obj: ..\..\src\os2\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\cursor.cpp
+\r
+$(OBJS)\corelib_os2_data.obj: ..\..\src\os2\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\data.cpp
+\r
+$(OBJS)\corelib_os2_dataobj.obj: ..\..\src\os2\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dataobj.cpp
+\r
+$(OBJS)\corelib_os2_dc.obj: ..\..\src\os2\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dc.cpp
+\r
+$(OBJS)\corelib_os2_dcclient.obj: ..\..\src\os2\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dcclient.cpp
+\r
+$(OBJS)\corelib_os2_dcmemory.obj: ..\..\src\os2\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dcmemory.cpp
+\r
+$(OBJS)\corelib_os2_dcprint.obj: ..\..\src\os2\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dcprint.cpp
+\r
+$(OBJS)\corelib_os2_dcscreen.obj: ..\..\src\os2\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dcscreen.cpp
+\r
+$(OBJS)\corelib_os2_dialog.obj: ..\..\src\os2\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dialog.cpp
+\r
+$(OBJS)\corelib_os2_dnd.obj: ..\..\src\os2\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\dnd.cpp
+\r
+$(OBJS)\corelib_os2_evtloop.obj: ..\..\src\os2\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\evtloop.cpp
+\r
+$(OBJS)\corelib_os2_filedlg.obj: ..\..\src\os2\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\filedlg.cpp
+\r
+$(OBJS)\corelib_os2_font.obj: ..\..\src\os2\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\font.cpp
+\r
+$(OBJS)\corelib_os2_fontdlg.obj: ..\..\src\os2\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\fontdlg.cpp
+\r
+$(OBJS)\corelib_os2_fontenum.obj: ..\..\src\os2\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\fontenum.cpp
+\r
+$(OBJS)\corelib_os2_fontutil.obj: ..\..\src\os2\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\fontutil.cpp
+\r
+$(OBJS)\corelib_os2_frame.obj: ..\..\src\os2\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\frame.cpp
+\r
+$(OBJS)\corelib_os2_gauge.obj: ..\..\src\os2\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\gauge.cpp
+\r
+$(OBJS)\corelib_os2_gdiimage.obj: ..\..\src\os2\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\gdiimage.cpp
+\r
+$(OBJS)\corelib_sockpm.obj: ..\..\src\os2\sockpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\sockpm.cpp
+\r
+$(OBJS)\corelib_os2_helpwin.obj: ..\..\src\os2\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\helpwin.cpp
+\r
+$(OBJS)\corelib_os2_icon.obj: ..\..\src\os2\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\icon.cpp
+\r
+$(OBJS)\corelib_os2_iniconf.obj: ..\..\src\os2\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\iniconf.cpp
+\r
+$(OBJS)\corelib_os2_listbox.obj: ..\..\src\os2\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\listbox.cpp
+\r
+$(OBJS)\corelib_os2_main.obj: ..\..\src\os2\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\main.cpp
+\r
+$(OBJS)\corelib_os2_menu.obj: ..\..\src\os2\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\menu.cpp
+\r
+$(OBJS)\corelib_os2_menuitem.obj: ..\..\src\os2\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\menuitem.cpp
+\r
+$(OBJS)\corelib_os2_metafile.obj: ..\..\src\os2\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\metafile.cpp
+\r
+$(OBJS)\corelib_os2_minifram.obj: ..\..\src\os2\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\minifram.cpp
+\r
+$(OBJS)\corelib_os2_msgdlg.obj: ..\..\src\os2\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\msgdlg.cpp
+\r
+$(OBJS)\corelib_os2_nativdlg.obj: ..\..\src\os2\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\nativdlg.cpp
+\r
+$(OBJS)\corelib_os2_notebook.obj: ..\..\src\os2\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\notebook.cpp
+\r
+$(OBJS)\corelib_os2_ownerdrw.obj: ..\..\src\os2\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\ownerdrw.cpp
+\r
+$(OBJS)\corelib_os2_palette.obj: ..\..\src\os2\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\palette.cpp
+\r
+$(OBJS)\corelib_os2_pen.obj: ..\..\src\os2\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\pen.cpp
+\r
+$(OBJS)\corelib_os2_popupwin.obj: ..\..\src\os2\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\popupwin.cpp
+\r
+$(OBJS)\corelib_os2_print.obj: ..\..\src\os2\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\print.cpp
+\r
+$(OBJS)\corelib_os2_radiobox.obj: ..\..\src\os2\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\radiobox.cpp
+\r
+$(OBJS)\corelib_os2_radiobut.obj: ..\..\src\os2\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\radiobut.cpp
+\r
+$(OBJS)\corelib_os2_region.obj: ..\..\src\os2\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\region.cpp
+\r
+$(OBJS)\corelib_os2_scrolbar.obj: ..\..\src\os2\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\scrolbar.cpp
+\r
+$(OBJS)\corelib_os2_settings.obj: ..\..\src\os2\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\settings.cpp
+\r
+$(OBJS)\corelib_os2_slider.obj: ..\..\src\os2\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\slider.cpp
+\r
+$(OBJS)\corelib_os2_spinbutt.obj: ..\..\src\os2\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\spinbutt.cpp
+\r
+$(OBJS)\corelib_os2_spinctrl.obj: ..\..\src\os2\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\spinctrl.cpp
+\r
+$(OBJS)\corelib_os2_statbmp.obj: ..\..\src\os2\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\statbmp.cpp
+\r
+$(OBJS)\corelib_os2_statbox.obj: ..\..\src\os2\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\statbox.cpp
+\r
+$(OBJS)\corelib_os2_statline.obj: ..\..\src\os2\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\statline.cpp
+\r
+$(OBJS)\corelib_os2_stattext.obj: ..\..\src\os2\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\stattext.cpp
+\r
+$(OBJS)\corelib_os2_textctrl.obj: ..\..\src\os2\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\textctrl.cpp
+\r
+$(OBJS)\corelib_os2_textentry.obj: ..\..\src\os2\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\textentry.cpp
+\r
+$(OBJS)\corelib_os2_tglbtn.obj: ..\..\src\os2\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\tglbtn.cpp
+\r
+$(OBJS)\corelib_os2_timer.obj: ..\..\src\os2\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\timer.cpp
+\r
+$(OBJS)\corelib_os2_toolbar.obj: ..\..\src\os2\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\toolbar.cpp
+\r
+$(OBJS)\corelib_os2_tooltip.obj: ..\..\src\os2\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\tooltip.cpp
+\r
+$(OBJS)\corelib_os2_toplevel.obj: ..\..\src\os2\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\toplevel.cpp
+\r
+$(OBJS)\corelib_os2_utilsgui.obj: ..\..\src\os2\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\utilsgui.cpp
+\r
+$(OBJS)\corelib_os2_window.obj: ..\..\src\os2\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\os2\window.cpp
+\r
+$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+\r
+$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
+\r
+$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+\r
+$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+\r
+$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+\r
+$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+\r
+$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
+\r
+$(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
+\r
+$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+\r
+$(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
+\r
+$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+\r
+$(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
+\r
+$(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
+
+$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+\r
+$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+\r
+$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+\r
+$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+\r
+$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+\r
+$(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
+\r
+$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+\r
+$(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
+\r
+$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+\r
+$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+\r
+$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+\r
+$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+\r
+$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+\r
+$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+\r
+$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+\r
+$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+\r
+$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
+\r
+$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+\r
+$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+\r
+$(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
+\r
+$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+\r
+$(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
+\r
+$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
+\r
+$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
+\r
+$(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp
+\r
+$(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp
+\r
+$(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_caret.obj: ..\..\src\generic\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\caret.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dialup.obj: ..\..\src\msw\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_display.obj: ..\..\src\msw\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_unix_fontenum.obj: ..\..\src\unix\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontenum.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_unix_fontutil.obj: ..\..\src\unix\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\fontutil.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_icon.obj: ..\..\src\generic\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\icon.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_paletteg.obj: ..\..\src\generic\paletteg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\paletteg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_app.obj: ..\..\src\gtk\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_assertdlg_gtk.obj: ..\..\src\gtk\assertdlg_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\assertdlg_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_bitmap.obj: ..\..\src\gtk\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_brush.obj: ..\..\src\gtk\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_clipbrd.obj: ..\..\src\gtk\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_colour.obj: ..\..\src\gtk\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_cursor.obj: ..\..\src\gtk\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_dataobj.obj: ..\..\src\gtk\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_dc.obj: ..\..\src\gtk\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_dnd.obj: ..\..\src\gtk\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_evtloop.obj: ..\..\src\gtk\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_filectrl.obj: ..\..\src\gtk\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filectrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_filehistory.obj: ..\..\src\gtk\filehistory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filehistory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_font.obj: ..\..\src\gtk\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_sockgtk.obj: ..\..\src\gtk\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_minifram.obj: ..\..\src\gtk\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_nonownedwnd.obj: ..\..\src\gtk\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\nonownedwnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_pen.obj: ..\..\src\gtk\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_popupwin.obj: ..\..\src\gtk\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_private.obj: ..\..\src\gtk\private.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\private.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_region.obj: ..\..\src\gtk\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_renderer.obj: ..\..\src\gtk\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_settings.obj: ..\..\src\gtk\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_textmeasure.obj: ..\..\src\gtk\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_timer.obj: ..\..\src\gtk\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_tooltip.obj: ..\..\src\gtk\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_toplevel.obj: ..\..\src\gtk\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_utilsgtk.obj: ..\..\src\gtk\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_win_gtk.obj: ..\..\src\gtk\win_gtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\win_gtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gtk_window.obj: ..\..\src\gtk\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\window.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk_dcclient.obj: ..\..\src\gtk\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk_dcmemory.obj: ..\..\src\gtk\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk_dcscreen.obj: ..\..\src\gtk\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dcscreen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_unix_dialup.obj: ..\..\src\unix\dialup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\dialup.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_displayx11.obj: ..\..\src\unix\displayx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\displayx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_uiactionx11.obj: ..\..\src\unix\uiactionx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\uiactionx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_utilsx11.obj: ..\..\src\unix\utilsx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\unix\utilsx11.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_generic_textmeasure.obj: ..\..\src\generic\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textmeasure.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_app.obj: ..\..\src\gtk1\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\app.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_bitmap.obj: ..\..\src\gtk1\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\bitmap.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_brush.obj: ..\..\src\gtk1\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\brush.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_clipbrd.obj: ..\..\src\gtk1\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\clipbrd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_colour.obj: ..\..\src\gtk1\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\colour.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_cursor.obj: ..\..\src\gtk1\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\cursor.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_data.obj: ..\..\src\gtk1\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\data.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dataobj.obj: ..\..\src\gtk1\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dataobj.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dc.obj: ..\..\src\gtk1\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dc.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dcclient.obj: ..\..\src\gtk1\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dcclient.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dcmemory.obj: ..\..\src\gtk1\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dcmemory.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dcscreen.obj: ..\..\src\gtk1\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dcscreen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_dnd.obj: ..\..\src\gtk1\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\dnd.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_evtloop.obj: ..\..\src\gtk1\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\evtloop.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_font.obj: ..\..\src\gtk1\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\font.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_sockgtk.obj: ..\..\src\gtk1\sockgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\sockgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_main.obj: ..\..\src\gtk1\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\main.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_minifram.obj: ..\..\src\gtk1\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\minifram.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_pen.obj: ..\..\src\gtk1\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\pen.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_popupwin.obj: ..\..\src\gtk1\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\popupwin.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_region.obj: ..\..\src\gtk1\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\region.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_renderer.obj: ..\..\src\gtk1\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\renderer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_settings.obj: ..\..\src\gtk1\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\settings.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_timer.obj: ..\..\src\gtk1\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\timer.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_tooltip.obj: ..\..\src\gtk1\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\tooltip.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_toplevel.obj: ..\..\src\gtk1\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\toplevel.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_utilsgtk.obj: ..\..\src\gtk1\utilsgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\utilsgtk.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_win_gtk.obj: ..\..\src\gtk1\win_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) ..\..\src\gtk1\win_gtk.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gtk1_window.obj: ..\..\src\gtk1\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk1\window.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_x11_bitmap.obj: ..\..\src\x11\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\bitmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_x11_brush.obj: ..\..\src\x11\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\brush.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_x11_palette.obj: ..\..\src\x11\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\palette.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_x11_pen.obj: ..\..\src\x11\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\pen.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_x11_region.obj: ..\..\src\x11\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\region.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_utilsx.obj: ..\..\src\x11\utilsx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\utilsx.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_app.obj: ..\..\src\msw\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_bitmap.obj: ..\..\src\msw\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_brush.obj: ..\..\src\msw\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_caret.obj: ..\..\src\msw\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_colour.obj: ..\..\src\msw\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_cursor.obj: ..\..\src\msw\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_data.obj: ..\..\src\msw\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dc.obj: ..\..\src\msw\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dcclient.obj: ..\..\src\msw\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dcprint.obj: ..\..\src\msw\dcprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_font.obj: ..\..\src\msw\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_fontenum.obj: ..\..\src\msw\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_fontutil.obj: ..\..\src\msw\fontutil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_ole_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_msw_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_hid.obj: ..\..\src\osx\core\hid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\core\hid.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "COCOA" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_utilsexc_cf.obj: ..\..\src\osx\core\utilsexc_cf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\osx\core\utilsexc_cf.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_timer.obj: ..\..\src\generic\timer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\timer.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_app.obj: ..\..\src\x11\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\app.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_clipbrd.obj: ..\..\src\x11\clipbrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\clipbrd.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_colour.obj: ..\..\src\x11\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\colour.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_cursor.obj: ..\..\src\x11\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\cursor.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_data.obj: ..\..\src\x11\data.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\data.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_dataobj.obj: ..\..\src\x11\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\dataobj.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_dc.obj: ..\..\src\x11\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\dc.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_dcclient.obj: ..\..\src\x11\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\dcclient.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_dcmemory.obj: ..\..\src\x11\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\dcmemory.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_dcscreen.obj: ..\..\src\x11\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\dcscreen.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_evtloop.obj: ..\..\src\x11\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\evtloop.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_font.obj: ..\..\src\x11\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\font.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_minifram.obj: ..\..\src\x11\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\minifram.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_nanox.obj: ..\..\src\x11\nanox.c
+       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) ..\..\src\x11\nanox.c
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_popupwin.obj: ..\..\src\x11\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\popupwin.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_reparent.obj: ..\..\src\x11\reparent.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\reparent.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_settings.obj: ..\..\src\x11\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\settings.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_toplevel.obj: ..\..\src\x11\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\toplevel.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_utils.obj: ..\..\src\x11\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\utils.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "X11" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_x11_window.obj: ..\..\src\x11\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\x11\window.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontmgrcmn.obj: ..\..\src\common\fontmgrcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmgrcmn.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_generic_colour.obj: ..\..\src\generic\colour.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colour.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_mask.obj: ..\..\src\generic\mask.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mask.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_app.obj: ..\..\src\dfb\app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\app.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_bitmap.obj: ..\..\src\dfb\bitmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\bitmap.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_brush.obj: ..\..\src\dfb\brush.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\brush.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_cursor.obj: ..\..\src\dfb\cursor.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\cursor.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_dc.obj: ..\..\src\dfb\dc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\dc.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_dcclient.obj: ..\..\src\dfb\dcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\dcclient.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_dcmemory.obj: ..\..\src\dfb\dcmemory.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\dcmemory.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_dcscreen.obj: ..\..\src\dfb\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\dcscreen.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_evtloop.obj: ..\..\src\dfb\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\evtloop.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_font.obj: ..\..\src\dfb\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\font.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_fontenum.obj: ..\..\src\dfb\fontenum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\fontenum.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontmgr.obj: ..\..\src\dfb\fontmgr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\fontmgr.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_nonownedwnd.obj: ..\..\src\dfb\nonownedwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\nonownedwnd.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_overlay.obj: ..\..\src\dfb\overlay.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\overlay.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_pen.obj: ..\..\src\dfb\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\pen.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_region.obj: ..\..\src\dfb\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\region.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_settings.obj: ..\..\src\dfb\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\settings.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_toplevel.obj: ..\..\src\dfb\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\toplevel.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_utils.obj: ..\..\src\dfb\utils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\utils.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dfb_window.obj: ..\..\src\dfb\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\window.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "DFB" && "$(USE_GUI)" == "1"
+$(OBJS)\corelib_wrapdfb.obj: ..\..\src\dfb\wrapdfb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\dfb\wrapdfb.cpp
+!endif
+
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_anybutton.obj: ..\..\src\gtk\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\anybutton.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_artgtk.obj: ..\..\src\gtk\artgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\artgtk.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_bmpbuttn.obj: ..\..\src\gtk\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\bmpbuttn.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_button.obj: ..\..\src\gtk\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\button.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_checkbox.obj: ..\..\src\gtk\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\checkbox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_checklst.obj: ..\..\src\gtk\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\checklst.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_choice.obj: ..\..\src\gtk\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\choice.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_collpane.obj: ..\..\src\gtk\collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\collpane.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_colordlg.obj: ..\..\src\gtk\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\colordlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_combobox.obj: ..\..\src\gtk\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\combobox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_control.obj: ..\..\src\gtk\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\control.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_clrpicker.obj: ..\..\src\gtk\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\clrpicker.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_dialog.obj: ..\..\src\gtk\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dialog.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_fontpicker.obj: ..\..\src\gtk\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\fontpicker.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filepicker.obj: ..\..\src\gtk\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filepicker.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_dirdlg.obj: ..\..\src\gtk\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\dirdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_filedlg.obj: ..\..\src\gtk\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\filedlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_fontdlg.obj: ..\..\src\gtk\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\fontdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_frame.obj: ..\..\src\gtk\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\frame.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_gauge.obj: ..\..\src\gtk\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\gauge.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gvfs.obj: ..\..\src\gtk\gnome\gvfs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\gnome\gvfs.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_infobar.obj: ..\..\src\gtk\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\infobar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_listbox.obj: ..\..\src\gtk\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\listbox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_mdi.obj: ..\..\src\gtk\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\mdi.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_menu.obj: ..\..\src\gtk\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\menu.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_mnemonics.obj: ..\..\src\gtk\mnemonics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\mnemonics.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_msgdlg.obj: ..\..\src\gtk\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\msgdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_nativewin.obj: ..\..\src\gtk\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\nativewin.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_notebook.obj: ..\..\src\gtk\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\notebook.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_print.obj: ..\..\src\gtk\print.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\print.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_radiobox.obj: ..\..\src\gtk\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\radiobox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_radiobut.obj: ..\..\src\gtk\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\radiobut.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_scrolbar.obj: ..\..\src\gtk\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\scrolbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_scrolwin.obj: ..\..\src\gtk\scrolwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\scrolwin.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_slider.obj: ..\..\src\gtk\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\slider.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_spinbutt.obj: ..\..\src\gtk\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\spinbutt.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_spinctrl.obj: ..\..\src\gtk\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\spinctrl.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_statbmp.obj: ..\..\src\gtk\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\statbmp.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_statbox.obj: ..\..\src\gtk\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\statbox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_statline.obj: ..\..\src\gtk\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\statline.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_stattext.obj: ..\..\src\gtk\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\stattext.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_toolbar.obj: ..\..\src\gtk\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\toolbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_textctrl.obj: ..\..\src\gtk\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\textctrl.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_textentry.obj: ..\..\src\gtk\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\textentry.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gtk_tglbtn.obj: ..\..\src\gtk\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\gtk\tglbtn.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_treeentry_gtk.obj: ..\..\src\gtk\treeentry_gtk.c
+       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) ..\..\src\gtk\treeentry_gtk.c
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "WINCE" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_colordlg.obj: ..\..\src\msw\colordlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif
+
+!if "$(TOOLKIT)" == "MSW" && "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_msw_evtloop.obj: ..\..\src\msw\evtloop.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_filedlg.obj: ..\..\src\msw\filedlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_frame.obj: ..\..\src\msw\frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_iniconf.obj: ..\..\src\msw\iniconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_mdi.obj: ..\..\src\msw\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_menuitem.obj: ..\..\src\msw\menuitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_metafile.obj: ..\..\src\msw\metafile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\metafile.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_nativewin.obj: ..\..\src\msw\nativewin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_textentry.obj: ..\..\src\msw\textentry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp\r
+!endif
+\r
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_regiong.obj: ..\..\src\generic\regiong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\regiong.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artprov.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_arttango.obj: ..\..\src\common\arttango.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\containr.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cshelp.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docmdi.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docview.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmap.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\framecmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp
+!endif
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\geometry.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagall.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\image.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagfill.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imaggif.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagiff.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpng.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtga.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\layout.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stockitem.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\treebase.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valgen.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\validate.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_valnum.obj: ..\..\src\common\valnum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_generic_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\renderg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\selstore.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\splitter.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
+!endif\r
+\r
+$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+
+$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+
+$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+
+$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
+$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+
+$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+
+$(OBJS)\advdll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp
+
+$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+
+$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grid.cpp
+
+$(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+
+$(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\helpext.cpp
+
+$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+
+$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
+
+$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+\r
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+\r
+$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+$(OBJS)\advdll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+\r
+!if "$(TOOLKIT)" == "WINCE" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "MSW"
+$(OBJS)\advdll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advdll_carbon_aboutdlg.obj: ..\..\src\osx\carbon\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\aboutdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advdll_drawer.obj: ..\..\src\osx\carbon\drawer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\drawer.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advdll_carbon_dataview.obj: ..\..\src\osx\carbon\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\dataview.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif\r
+\r
+$(OBJS)\advdll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advdll_carbon_taskbar.obj: ..\..\src\osx\carbon\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\carbon\taskbar.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif\r
+\r
+$(OBJS)\advdll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_datetimectrl_osx.obj: ..\..\src\osx\datetimectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\datetimectrl_osx.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_datectrl_osx.obj: ..\..\src\osx\datectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\datectrl_osx.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_timectrl_osx.obj: ..\..\src\osx\timectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\timectrl_osx.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_cocoa_aboutdlg.obj: ..\..\src\osx\cocoa\aboutdlg.mm
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_cocoa_dataview.obj: ..\..\src\osx\cocoa\dataview.mm
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_cocoa_datetimectrl.obj: ..\..\src\osx\cocoa\datetimectrl.mm
+!endif\r
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advdll_osx_cocoa_taskbar.obj: ..\..\src\osx\cocoa\taskbar.mm
+!endif\r
+\r
+!if "$(TOOLKIT)" == "COCOA"
+$(OBJS)\advdll_src_cocoa_taskbar.obj: ..\..\src\cocoa\taskbar.mm
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advdll_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advdll_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+$(OBJS)\advdll_gtk_eggtrayicon.obj: ..\..\src\gtk\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(ADVDLL_CFLAGS) ..\..\src\gtk\eggtrayicon.c
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+$(OBJS)\advdll_hildon_notifmsg.obj: ..\..\src\gtk\hildon\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\hildon\notifmsg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_gtk1_eggtrayicon.obj: ..\..\src\gtk1\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(ADVDLL_CFLAGS) ..\..\src\gtk1\eggtrayicon.c
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advdll_gtk1_taskbar.obj: ..\..\src\gtk1\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk1\taskbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM"
+$(OBJS)\advdll_os2_joystick.obj: ..\..\src\os2\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\os2\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "PM"
+$(OBJS)\advdll_os2_sound.obj: ..\..\src\os2\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\os2\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_aboutdlg.obj: ..\..\src\gtk\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\aboutdlg.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_animate.obj: ..\..\src\gtk\animate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\animate.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_bmpcbox.obj: ..\..\src\gtk\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\bmpcbox.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_calctrl.obj: ..\..\src\gtk\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\calctrl.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_dataview.obj: ..\..\src\gtk\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\dataview.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advdll_gtk_hyperlink.obj: ..\..\src\gtk\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\gtk\hyperlink.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_msw_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+!endif
+
+$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
+
+$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+
+$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
+$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
+
+$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
+
+$(OBJS)\advlib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp
+
+$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
+
+$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grid.cpp
+
+$(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
+
+$(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp
+
+$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
+
+$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(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
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
+
+$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
+$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
+
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+$(OBJS)\advlib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+\r
+!if "$(TOOLKIT)" == "WINCE" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "MSW"
+$(OBJS)\advlib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_msw_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
+!endif\r
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advlib_carbon_aboutdlg.obj: ..\..\src\osx\carbon\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\aboutdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advlib_drawer.obj: ..\..\src\osx\carbon\drawer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\drawer.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_dataview_osx.obj: ..\..\src\osx\dataview_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\dataview_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advlib_carbon_dataview.obj: ..\..\src\osx\carbon\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\dataview.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
+\r
+$(OBJS)\advlib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_sound_osx.obj: ..\..\src\osx\sound_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\sound_osx.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_carbon_sound.obj: ..\..\src\osx\carbon\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_CARBON"
+$(OBJS)\advlib_carbon_taskbar.obj: ..\..\src\osx\carbon\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\carbon\taskbar.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
+\r
+$(OBJS)\advlib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_hidjoystick.obj: ..\..\src\osx\core\hidjoystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\core\hidjoystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_datetimectrl_osx.obj: ..\..\src\osx\datetimectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\datetimectrl_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_datectrl_osx.obj: ..\..\src\osx\datectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\datectrl_osx.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_timectrl_osx.obj: ..\..\src\osx\timectrl_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\timectrl_osx.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_core_sound.obj: ..\..\src\osx\core\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\osx\core\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_cocoa_aboutdlg.obj: ..\..\src\osx\cocoa\aboutdlg.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_cocoa_dataview.obj: ..\..\src\osx\cocoa\dataview.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_cocoa_datetimectrl.obj: ..\..\src\osx\cocoa\datetimectrl.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "OSX_COCOA"
+$(OBJS)\advlib_osx_cocoa_taskbar.obj: ..\..\src\osx\cocoa\taskbar.mm
+!endif
+\r
+!if "$(TOOLKIT)" == "COCOA"
+$(OBJS)\advlib_src_cocoa_taskbar.obj: ..\..\src\cocoa\taskbar.mm
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_unix_joystick.obj: ..\..\src\unix\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\joystick.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_unix_sound.obj: ..\..\src\unix\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\sound.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "1"
+$(OBJS)\advlib_taskbarx11.obj: ..\..\src\unix\taskbarx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\unix\taskbarx11.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_gtk_notifmsg.obj: ..\..\src\gtk\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "1"
+$(OBJS)\advlib_gtk_taskbar.obj: ..\..\src\gtk\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+$(OBJS)\advlib_gtk_eggtrayicon.obj: ..\..\src\gtk\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(ADVLIB_CFLAGS) ..\..\src\gtk\eggtrayicon.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+$(OBJS)\advlib_hildon_notifmsg.obj: ..\..\src\gtk\hildon\notifmsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\hildon\notifmsg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_gtk1_eggtrayicon.obj: ..\..\src\gtk1\eggtrayicon.c
+       $(CC) /c /nologo /TC /Fo$@ $(ADVLIB_CFLAGS) ..\..\src\gtk1\eggtrayicon.c
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == ""
+$(OBJS)\advlib_gtk1_taskbar.obj: ..\..\src\gtk1\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk1\taskbar.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM"
+$(OBJS)\advlib_os2_joystick.obj: ..\..\src\os2\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\os2\joystick.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "PM"
+$(OBJS)\advlib_os2_sound.obj: ..\..\src\os2\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\os2\sound.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_aboutdlg.obj: ..\..\src\gtk\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\aboutdlg.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_animate.obj: ..\..\src\gtk\animate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\animate.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_bmpcbox.obj: ..\..\src\gtk\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\bmpcbox.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_calctrl.obj: ..\..\src\gtk\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\calctrl.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_dataview.obj: ..\..\src\gtk\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\dataview.cpp
+!endif
+\r
+!if "$(TOOLKIT)" == "GTK" && "$(WXUNIV)" == "0"
+$(OBJS)\advlib_gtk_hyperlink.obj: ..\..\src\gtk\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\gtk\hyperlink.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+!endif
+\r
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_msw_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+!endif
+
+!if "$(WXUNIV)" == "0"
+$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+!endif
+\r
+$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+\r
+$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\mediadll_carbon_mediactrl.obj: ..\..\src\osx\carbon\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\osx\carbon\mediactrl.cpp
+
+$(OBJS)\mediadll_osx_cocoa_mediactrl.obj: ..\..\src\osx\cocoa\mediactrl.mm
+
+$(OBJS)\mediadll_src_cocoa_mediactrl.obj: ..\..\src\cocoa\mediactrl.mm
+
+$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
+$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
+\r
+$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp\r
+\r
+$(OBJS)\mediadll_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+
+!if "$(TOOLKIT)" == "X11"
+$(OBJS)\mediadll_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
+
+$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\medialib_carbon_mediactrl.obj: ..\..\src\osx\carbon\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\osx\carbon\mediactrl.cpp
+
+$(OBJS)\medialib_osx_cocoa_mediactrl.obj: ..\..\src\osx\cocoa\mediactrl.mm
+
+$(OBJS)\medialib_src_cocoa_mediactrl.obj: ..\..\src\cocoa\mediactrl.mm
+
+$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
+$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
+\r
+$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp\r
+\r
+$(OBJS)\medialib_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+
+!if "$(TOOLKIT)" == "X11"
+$(OBJS)\medialib_unix_mediactrl.obj: ..\..\src\unix\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\unix\mediactrl.cpp
+!endif
+
+$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
+\r
+$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp\r
+\r
+$(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp\r
+\r
+$(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdata.cpp\r
+\r
+$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp\r
+\r
+$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp\r
+\r
+$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp\r
+\r
+$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp\r
+\r
+$(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp\r
+\r
+$(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp\r
+\r
+$(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmltag.cpp\r
+\r
+$(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp\r
+\r
+$(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmprint.cpp\r
+\r
+$(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp\r
+\r
+$(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp\r
+\r
+$(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_hline.cpp\r
+\r
+$(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_image.cpp\r
+\r
+$(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_layout.cpp\r
+\r
+$(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_links.cpp\r
+\r
+$(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_list.cpp\r
+\r
+$(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
+\r
+$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
+$(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp\r
+\r
+$(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
+\r
+$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
+$(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp\r
+\r
+$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
+\r
+$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp\r
+\r
+$(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp\r
+\r
+$(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp\r
+\r
+$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp\r
+\r
+$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp\r
+\r
+$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp\r
+\r
+$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp\r
+\r
+$(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp\r
+\r
+$(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp\r
+\r
+$(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp\r
+\r
+$(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp\r
+\r
+$(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp\r
+\r
+$(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp\r
+\r
+$(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp\r
+\r
+$(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp\r
+\r
+$(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_image.cpp\r
+\r
+$(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp\r
+\r
+$(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_links.cpp\r
+\r
+$(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_list.cpp\r
+\r
+$(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
+\r
+$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
+$(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp\r
+\r
+$(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
+\r
+$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
+$(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp\r
+\r
+$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp\r
+\r
+$(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc
+\r
+$(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\webviewdll_webview_webkit.obj: ..\..\src\gtk\webview_webkit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\gtk\webview_webkit.cpp
+
+$(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
+$(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp\r
+\r
+$(OBJS)\webviewlib_webview_webkit.obj: ..\..\src\gtk\webview_webkit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\gtk\webview_webkit.cpp
+
+$(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp\r
+\r
+$(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
+\r
+$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
+$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
+\r
+$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
+\r
+$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp\r
+\r
+$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
+\r
+$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp\r
+\r
+$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
+\r
+$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp\r
+\r
+$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\common\xtixml.cpp\r
+\r
+$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\xml\xml.cpp\r
+\r
+$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp\r
+\r
+$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
+\r
+$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r
+$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
+\r
+$(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp\r
+\r
+$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp\r
+\r
+$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp\r
+\r
+$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp\r
+\r
+$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp\r
+\r
+$(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp\r
+\r
+$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp\r
+\r
+$(OBJS)\xrcdll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp\r
+\r
+$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp\r
+\r
+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp\r
+\r
+$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp\r
+\r
+$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp\r
+\r
+$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp\r
+\r
+$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp\r
+\r
+$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp\r
+\r
+$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp\r
+\r
+$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp\r
+\r
+$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp\r
+\r
+$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp\r
+\r
+$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp\r
+\r
+$(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp\r
+\r
+$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp\r
+\r
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp\r
+\r
+$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp\r
+\r
+$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp\r
+\r
+$(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp\r
+\r
+$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp\r
+\r
+$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp\r
+\r
+$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp\r
+\r
+$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp\r
+\r
+$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp\r
+\r
+$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp\r
+\r
+$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp\r
+\r
+$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp\r
+\r
+$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp\r
+\r
+$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp\r
+\r
+$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp\r
+\r
+$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp\r
+\r
+$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp\r
+\r
+$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp\r
+\r
+$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp\r
+\r
+$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
+\r
+$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
+$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
+\r
+$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp\r
+\r
+$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp\r
+\r
+$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp\r
+\r
+$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp\r
+\r
+$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp\r
+\r
+$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp\r
+\r
+$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp\r
+\r
+$(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp\r
+\r
+$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp\r
+\r
+$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp\r
+\r
+$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp\r
+\r
+$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp\r
+\r
+$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp\r
+\r
+$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp\r
+\r
+$(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp\r
+\r
+$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp\r
+\r
+$(OBJS)\xrclib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp\r
+\r
+$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp\r
+\r
+$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp\r
+\r
+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp\r
+\r
+$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp\r
+\r
+$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp\r
+\r
+$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp\r
+\r
+$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp\r
+\r
+$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp\r
+\r
+$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp\r
+\r
+$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp\r
+\r
+$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp\r
+\r
+$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp\r
+\r
+$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp\r
+\r
+$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp\r
+\r
+$(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp\r
+\r
+$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp\r
+\r
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp\r
+\r
+$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp\r
+\r
+$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp\r
+\r
+$(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp\r
+\r
+$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp\r
+\r
+$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp\r
+\r
+$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp\r
+\r
+$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp\r
+\r
+$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp\r
+\r
+$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp\r
+\r
+$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp\r
+\r
+$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp\r
+\r
+$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp\r
+\r
+$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp\r
+\r
+$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp\r
+\r
+$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp\r
+\r
+$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp\r
+\r
+$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp\r
+\r
+$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp\r
+\r
+$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
+\r
+$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
+$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
+\r
+$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp\r
+\r
+$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp\r
+\r
+$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp\r
+\r
+$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp\r
+\r
+$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp\r
+\r
+$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp\r
+\r
+$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
+\r
+$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp\r
+\r
+$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\dockart.cpp\r
+\r
+$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp\r
+\r
+$(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp\r
+\r
+$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp\r
+\r
+$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
+\r
+$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
+$(OBJS)\auidll_tabartgtk.obj: ..\..\src\aui\tabartgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabartgtk.cpp
+
+$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp\r
+\r
+$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\dockart.cpp\r
+\r
+$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp\r
+\r
+$(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp\r
+\r
+$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp\r
+\r
+$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp\r
+\r
+$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
+\r
+$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
+$(OBJS)\auilib_tabartgtk.obj: ..\..\src\aui\tabartgtk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabartgtk.cpp
+
+$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+\r
+$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp\r
+\r
+$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp\r
+\r
+$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp\r
+\r
+$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp\r
+\r
+$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp\r
+\r
+$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp\r
+\r
+$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp\r
+\r
+$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
+\r
+$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
+\r
+$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
+\r
+$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
+$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp\r
+\r
+$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp\r
+\r
+$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp\r
+\r
+$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp\r
+\r
+$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp\r
+\r
+$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp\r
+\r
+$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp\r
+\r
+$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp\r
+\r
+$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp\r
+\r
+$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
+\r
+$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
+$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+\r
+$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
+\r
+$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp\r
+\r
+$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp\r
+\r
+$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp\r
+\r
+$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp\r
+\r
+$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp\r
+\r
+$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp\r
+\r
+$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp\r
+\r
+$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
+\r
+$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp\r
+\r
+$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp\r
+\r
+$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp\r
+\r
+$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp\r
+\r
+$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp\r
+\r
+$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp\r
+\r
+$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp\r
+\r
+$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
+\r
+$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
+\r
+$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
+\r
+$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+\r
+$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
+\r
+$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+\r
+$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+\r
+$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
+\r
+$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r
+\r
+$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
+$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
+\r
+$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp\r
+\r
+$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp\r
+\r
+$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp\r
+\r
+$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp\r
+\r
+$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp\r
+\r
+$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp\r
+\r
+$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp\r
+\r
+$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp\r
+\r
+$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
+\r
+$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
+$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
+\r
+$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
+\r
+$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp\r
+\r
+$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp\r
+\r
+$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r
+\r
+$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp\r
+\r
+$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp\r
+\r
+$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
+\r
+$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp\r
+\r
+$(OBJS)\gldll_carbon_glcanvas.obj: ..\..\src\osx\carbon\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\osx\carbon\glcanvas.cpp
+
+$(OBJS)\gldll_osx_cocoa_glcanvas.obj: ..\..\src\osx\cocoa\glcanvas.mm
+
+$(OBJS)\gldll_iphone_glcanvas.obj: ..\..\src\osx\iphone\glcanvas.mm
+
+$(OBJS)\gldll_src_cocoa_glcanvas.obj: ..\..\src\cocoa\glcanvas.mm
+
+$(OBJS)\gldll_gtk_glcanvas.obj: ..\..\src\gtk\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\gtk\glcanvas.cpp
+
+$(OBJS)\gldll_gtk1_glcanvas.obj: ..\..\src\gtk1\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\gtk1\glcanvas.cpp
+
+$(OBJS)\gldll_os2_glcanvas.obj: ..\..\src\os2\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\os2\glcanvas.cpp
+
+$(OBJS)\gldll_glcanvas_osx.obj: ..\..\src\osx\glcanvas_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\osx\glcanvas_osx.cpp
+
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+$(OBJS)\gldll_glcanvas_osx.obj: ..\..\src\osx\glcanvas_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\osx\glcanvas_osx.cpp
+!endif
+
+$(OBJS)\gldll_glx11.obj: ..\..\src\unix\glx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\unix\glx11.cpp
+
+!if "$(TOOLKIT)" == "X11"
+$(OBJS)\gldll_glx11.obj: ..\..\src\unix\glx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\unix\glx11.cpp
+!endif
+
+$(OBJS)\gldll_msw_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\msw\glcanvas.cpp\r
+\r
+$(OBJS)\gldll_x11_glcanvas.obj: ..\..\src\x11\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\x11\glcanvas.cpp
+
+$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
+\r
+$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\common\glcmn.cpp\r
+\r
+$(OBJS)\gllib_carbon_glcanvas.obj: ..\..\src\osx\carbon\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\osx\carbon\glcanvas.cpp
+
+$(OBJS)\gllib_osx_cocoa_glcanvas.obj: ..\..\src\osx\cocoa\glcanvas.mm
+
+$(OBJS)\gllib_iphone_glcanvas.obj: ..\..\src\osx\iphone\glcanvas.mm
+
+$(OBJS)\gllib_src_cocoa_glcanvas.obj: ..\..\src\cocoa\glcanvas.mm
+
+$(OBJS)\gllib_gtk_glcanvas.obj: ..\..\src\gtk\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\gtk\glcanvas.cpp
+
+$(OBJS)\gllib_gtk1_glcanvas.obj: ..\..\src\gtk1\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\gtk1\glcanvas.cpp
+
+$(OBJS)\gllib_os2_glcanvas.obj: ..\..\src\os2\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\os2\glcanvas.cpp
+
+$(OBJS)\gllib_glcanvas_osx.obj: ..\..\src\osx\glcanvas_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\osx\glcanvas_osx.cpp
+
+!if "$(TOOLKIT)" == "OSX_IPHONE"
+$(OBJS)\gllib_glcanvas_osx.obj: ..\..\src\osx\glcanvas_osx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\osx\glcanvas_osx.cpp
+!endif
+
+$(OBJS)\gllib_glx11.obj: ..\..\src\unix\glx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\unix\glx11.cpp
+
+!if "$(TOOLKIT)" == "X11"
+$(OBJS)\gllib_glx11.obj: ..\..\src\unix\glx11.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\unix\glx11.cpp
+!endif
 
+$(OBJS)\gllib_msw_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\msw\glcanvas.cpp\r
+\r
+$(OBJS)\gllib_x11_glcanvas.obj: ..\..\src\x11\glcanvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\x11\glcanvas.cpp