]> git.saurik.com Git - wxWidgets.git/blobdiff - build/makefile.bcc
minor additional notes
[wxWidgets.git] / build / makefile.bcc
index 67d3db2a893e4b69468ea8cf1b8a0ad40d6afa8a..53376734b28bf313f2c8f7d2e1683529c81b9176 100644 (file)
@@ -20,12 +20,56 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advdll.csm
+ADVDLL_OBJECTS =  \
+       $(OBJS)\advdll_dummy.obj \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_dcbuffer.obj \
+       $(OBJS)\advdll_grid.obj \
+       $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_gridsel.obj \
+       $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_wave.obj
+ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advlib.csm
+ADVLIB_OBJECTS =  \
+       $(OBJS)\advlib_dummy.obj \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_dcbuffer.obj \
+       $(OBJS)\advlib_grid.obj \
+       $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_gridsel.obj \
+       $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_wave.obj
+BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
-BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -39,8 +83,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \
        $(OBJS)\basedll_datstrm.obj \
-       $(OBJS)\basedll_db.obj \
-       $(OBJS)\basedll_dbtable.obj \
        $(OBJS)\basedll_dircmn.obj \
        $(OBJS)\basedll_dynarray.obj \
        $(OBJS)\basedll_dynlib.obj \
@@ -86,6 +128,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \
+       $(OBJS)\basedll_crashrpt.obj \
        $(OBJS)\basedll_dde.obj \
        $(OBJS)\basedll_dir.obj \
        $(OBJS)\basedll_mimetype.obj \
@@ -95,7 +138,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
-       $(OBJS)\basedll_crashrpt.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
@@ -103,12 +145,12 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -121,8 +163,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \
        $(OBJS)\baselib_datstrm.obj \
-       $(OBJS)\baselib_db.obj \
-       $(OBJS)\baselib_dbtable.obj \
        $(OBJS)\baselib_dircmn.obj \
        $(OBJS)\baselib_dynarray.obj \
        $(OBJS)\baselib_dynlib.obj \
@@ -168,6 +208,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \
+       $(OBJS)\baselib_crashrpt.obj \
        $(OBJS)\baselib_dde.obj \
        $(OBJS)\baselib_dir.obj \
        $(OBJS)\baselib_mimetype.obj \
@@ -177,7 +218,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
-       $(OBJS)\baselib_crashrpt.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
@@ -185,7 +225,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
-COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -201,7 +241,7 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -216,7 +256,24 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
-GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(CXXFLAGS) -Hu \
+       -H=$(OBJS)\wxprec_dbgriddll.csm
+DBGRIDDLL_OBJECTS =  \
+       $(OBJS)\dbgriddll_dummy.obj \
+       $(OBJS)\dbgriddll_dbgrid.obj
+DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_dbgridlib.csm
+DBGRIDLIB_OBJECTS =  \
+       $(OBJS)\dbgridlib_dummy.obj \
+       $(OBJS)\dbgridlib_dbgrid.obj
+GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -224,7 +281,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -232,7 +289,7 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG)
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -241,28 +298,28 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \
+       $(OBJS)\htmldll_helpctrl.obj \
        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpfrm.obj \
-       $(OBJS)\htmldll_helpctrl.obj \
        $(OBJS)\htmldll_htmlcell.obj \
        $(OBJS)\htmldll_htmlfilt.obj \
        $(OBJS)\htmldll_htmlpars.obj \
        $(OBJS)\htmldll_htmltag.obj \
        $(OBJS)\htmldll_htmlwin.obj \
-       $(OBJS)\htmldll_winpars.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_dflist.obj \
        $(OBJS)\htmldll_m_pre.obj \
-       $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_m_style.obj \
-       $(OBJS)\htmldll_htmprint.obj \
+       $(OBJS)\htmldll_m_tables.obj \
+       $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -270,35 +327,35 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \
+       $(OBJS)\htmllib_helpctrl.obj \
        $(OBJS)\htmllib_helpdata.obj \
        $(OBJS)\htmllib_helpfrm.obj \
-       $(OBJS)\htmllib_helpctrl.obj \
        $(OBJS)\htmllib_htmlcell.obj \
        $(OBJS)\htmllib_htmlfilt.obj \
        $(OBJS)\htmllib_htmlpars.obj \
        $(OBJS)\htmllib_htmltag.obj \
        $(OBJS)\htmllib_htmlwin.obj \
-       $(OBJS)\htmllib_winpars.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_dflist.obj \
        $(OBJS)\htmllib_m_pre.obj \
-       $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_m_style.obj \
-       $(OBJS)\htmllib_htmprint.obj \
+       $(OBJS)\htmllib_m_tables.obj \
+       $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
        ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS)
-MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -311,8 +368,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \
        $(OBJS)\monodll_datstrm.obj \
-       $(OBJS)\monodll_db.obj \
-       $(OBJS)\monodll_dbtable.obj \
        $(OBJS)\monodll_dircmn.obj \
        $(OBJS)\monodll_dynarray.obj \
        $(OBJS)\monodll_dynlib.obj \
@@ -358,6 +413,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \
+       $(OBJS)\monodll_crashrpt.obj \
        $(OBJS)\monodll_dde.obj \
        $(OBJS)\monodll_dir.obj \
        $(OBJS)\monodll_mimetype.obj \
@@ -367,7 +423,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
-       $(OBJS)\monodll_crashrpt.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
@@ -379,22 +434,22 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_ftp.obj \
        $(OBJS)\monodll_http.obj \
        $(OBJS)\monodll_protocol.obj \
-       $(OBJS)\monodll_url.obj \
-       $(OBJS)\monodll_sckfile.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_gsocket.obj \
        $(OBJS)\monodll_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj
-MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -407,8 +462,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \
        $(OBJS)\monolib_datstrm.obj \
-       $(OBJS)\monolib_db.obj \
-       $(OBJS)\monolib_dbtable.obj \
        $(OBJS)\monolib_dircmn.obj \
        $(OBJS)\monolib_dynarray.obj \
        $(OBJS)\monolib_dynlib.obj \
@@ -454,6 +507,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \
+       $(OBJS)\monolib_crashrpt.obj \
        $(OBJS)\monolib_dde.obj \
        $(OBJS)\monolib_dir.obj \
        $(OBJS)\monolib_mimetype.obj \
@@ -463,7 +517,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
-       $(OBJS)\monolib_crashrpt.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
@@ -475,22 +528,22 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_ftp.obj \
        $(OBJS)\monolib_http.obj \
        $(OBJS)\monolib_protocol.obj \
-       $(OBJS)\monolib_url.obj \
-       $(OBJS)\monolib_sckfile.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_gsocket.obj \
        $(OBJS)\monolib_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj
-NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
-NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -501,20 +554,20 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_protocol.obj \
-       $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_sckfile.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_gsocket.obj \
        $(OBJS)\netdll_gsockmsw.obj
-NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -525,23 +578,42 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_ftp.obj \
        $(OBJS)\netlib_http.obj \
        $(OBJS)\netlib_protocol.obj \
-       $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_sckfile.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_gsocket.obj \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) -Hu \
+       -H=$(OBJS)\wxprec_odbcdll.csm
+ODBCDLL_OBJECTS =  \
+       $(OBJS)\odbcdll_dummy.obj \
+       $(OBJS)\odbcdll_db.obj \
+       $(OBJS)\odbcdll_dbtable.obj
+ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
+       -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_odbclib.csm
+ODBCLIB_OBJECTS =  \
+       $(OBJS)\odbclib_dummy.obj \
+       $(OBJS)\odbclib_db.obj \
+       $(OBJS)\odbclib_dbtable.obj
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
-WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -I$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
@@ -590,7 +662,7 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
-WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -I..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
@@ -610,14 +682,14 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
-WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
-WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
@@ -653,7 +725,7 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
-WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM $(CFLAGS)
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
@@ -670,7 +742,7 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infcodes.obj \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj
-XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -678,7 +750,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj
-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
@@ -701,7 +773,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
@@ -713,13 +788,22 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
 !endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
 !endif
-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(USE_GUI)" == "1"
@@ -744,10 +828,10 @@ __RUNTIME_LIBS = -tWR
 __RUNTIME_LIBS = 
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_5 = i
+__RUNTIME_LIBS_9 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_9 = 
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
@@ -795,30 +879,26 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpchm.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_icon.obj \
-       $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
+       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_toplevel.obj \
        $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_wave.obj \
+       $(OBJS)\monolib_uxtheme.obj \
        $(OBJS)\monolib_window.obj \
-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_statusbr.obj \
-       $(OBJS)\monolib_uxtheme.obj \
-       $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
@@ -846,13 +926,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_notebook.obj \
+       $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \
        $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_slider95.obj \
        $(OBJS)\monolib_spinbutt.obj \
@@ -867,40 +947,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_accesscmn.obj \
+       $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
@@ -913,7 +961,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_ctrlcmn.obj \
        $(OBJS)\monolib_ctrlsub.obj \
        $(OBJS)\monolib_datacmn.obj \
-       $(OBJS)\monolib_dbgrid.obj \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dlgcmn.obj \
        $(OBJS)\monolib_dndcmn.obj \
@@ -926,9 +973,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
@@ -938,6 +984,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(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 \
@@ -946,7 +993,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
-       $(OBJS)\monolib_imagfill.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
@@ -964,12 +1010,34 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
+       $(OBJS)\monolib_timercmn.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_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -1000,28 +1068,38 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpchm.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_icon.obj \
-       $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
+       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_toplevel.obj \
        $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_wave.obj \
+       $(OBJS)\monolib_uxtheme.obj \
        $(OBJS)\monolib_window.obj \
-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_textctrl.obj \
+       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_imaglist.obj \
+       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_mdig.obj \
+       $(OBJS)\monolib_msgdlgg.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_tabg.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
@@ -1030,9 +1108,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_colschem.obj \
        $(OBJS)\monolib_combobox.obj \
        $(OBJS)\monolib_control.obj \
+       $(OBJS)\monolib_ctrlrend.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \
-       $(OBJS)\monolib_topluniv.obj \
        $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \
@@ -1041,7 +1119,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_scrthumb.obj \
@@ -1052,58 +1129,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statusbr.obj \
-       $(OBJS)\monolib_toolbar.obj \
        $(OBJS)\monolib_theme.obj \
+       $(OBJS)\monolib_toolbar.obj \
+       $(OBJS)\monolib_topluniv.obj \
        $(OBJS)\monolib_winuniv.obj \
-       $(OBJS)\monolib_mdig.obj \
-       $(OBJS)\monolib_imaglist.obj \
-       $(OBJS)\monolib_colrdlgg.obj \
-       $(OBJS)\monolib_listctrl.obj \
-       $(OBJS)\monolib_filedlgg.obj \
-       $(OBJS)\monolib_dirdlgg.obj \
-       $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_msgdlgg.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
-       $(OBJS)\monolib_fontdlgg.obj \
-       $(OBJS)\monolib_tabg.obj \
        $(OBJS)\monolib_gtk.obj \
-       $(OBJS)\monolib_win32.obj \
        $(OBJS)\monolib_metal.obj \
-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_win32.obj \
        $(OBJS)\monolib_accesscmn.obj \
+       $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
@@ -1116,7 +1150,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_ctrlcmn.obj \
        $(OBJS)\monolib_ctrlsub.obj \
        $(OBJS)\monolib_datacmn.obj \
-       $(OBJS)\monolib_dbgrid.obj \
        $(OBJS)\monolib_dcbase.obj \
        $(OBJS)\monolib_dlgcmn.obj \
        $(OBJS)\monolib_dndcmn.obj \
@@ -1129,9 +1162,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
@@ -1141,6 +1173,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(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 \
@@ -1149,7 +1182,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
-       $(OBJS)\monolib_imagfill.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
@@ -1167,22 +1199,44 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
+       $(OBJS)\monolib_timercmn.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_xpmdecod.obj
-!endif
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-____CORE_SRC_FILENAMES_2_OBJECTS =  \
-       $(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)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj
+!endif
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+____CORE_SRC_FILENAMES_2_OBJECTS =  \
+       $(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 \
@@ -1203,30 +1257,26 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpchm.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_icon.obj \
-       $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
+       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_taskbarcmn.obj \
-       $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_toplevel.obj \
        $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_wave.obj \
+       $(OBJS)\coredll_uxtheme.obj \
        $(OBJS)\coredll_window.obj \
-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_statusbr.obj \
-       $(OBJS)\coredll_uxtheme.obj \
-       $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
@@ -1254,13 +1304,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_notebook.obj \
+       $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \
        $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_slider95.obj \
        $(OBJS)\coredll_spinbutt.obj \
@@ -1275,40 +1325,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_accesscmn.obj \
+       $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
@@ -1321,7 +1339,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_ctrlcmn.obj \
        $(OBJS)\coredll_ctrlsub.obj \
        $(OBJS)\coredll_datacmn.obj \
-       $(OBJS)\coredll_dbgrid.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dlgcmn.obj \
        $(OBJS)\coredll_dndcmn.obj \
@@ -1334,9 +1351,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
@@ -1346,6 +1362,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
+       $(OBJS)\coredll_imagfill.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
@@ -1354,7 +1371,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
-       $(OBJS)\coredll_imagfill.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
@@ -1372,12 +1388,34 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -1408,28 +1446,38 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpchm.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_icon.obj \
-       $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
+       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_taskbarcmn.obj \
-       $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_toplevel.obj \
        $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_wave.obj \
+       $(OBJS)\coredll_uxtheme.obj \
        $(OBJS)\coredll_window.obj \
-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_textctrl.obj \
+       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_filedlgg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_imaglist.obj \
+       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_mdig.obj \
+       $(OBJS)\coredll_msgdlgg.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_tabg.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
@@ -1438,9 +1486,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_colschem.obj \
        $(OBJS)\coredll_combobox.obj \
        $(OBJS)\coredll_control.obj \
+       $(OBJS)\coredll_ctrlrend.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \
-       $(OBJS)\coredll_topluniv.obj \
        $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \
@@ -1449,7 +1497,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_scrthumb.obj \
@@ -1460,58 +1507,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statusbr.obj \
-       $(OBJS)\coredll_toolbar.obj \
        $(OBJS)\coredll_theme.obj \
+       $(OBJS)\coredll_toolbar.obj \
+       $(OBJS)\coredll_topluniv.obj \
        $(OBJS)\coredll_winuniv.obj \
-       $(OBJS)\coredll_mdig.obj \
-       $(OBJS)\coredll_imaglist.obj \
-       $(OBJS)\coredll_colrdlgg.obj \
-       $(OBJS)\coredll_listctrl.obj \
-       $(OBJS)\coredll_filedlgg.obj \
-       $(OBJS)\coredll_dirdlgg.obj \
-       $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_msgdlgg.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
-       $(OBJS)\coredll_fontdlgg.obj \
-       $(OBJS)\coredll_tabg.obj \
        $(OBJS)\coredll_gtk.obj \
-       $(OBJS)\coredll_win32.obj \
        $(OBJS)\coredll_metal.obj \
-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_win32.obj \
        $(OBJS)\coredll_accesscmn.obj \
+       $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
@@ -1524,7 +1528,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_ctrlcmn.obj \
        $(OBJS)\coredll_ctrlsub.obj \
        $(OBJS)\coredll_datacmn.obj \
-       $(OBJS)\coredll_dbgrid.obj \
        $(OBJS)\coredll_dcbase.obj \
        $(OBJS)\coredll_dlgcmn.obj \
        $(OBJS)\coredll_dndcmn.obj \
@@ -1537,9 +1540,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
@@ -1549,6 +1551,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
+       $(OBJS)\coredll_imagfill.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
@@ -1557,7 +1560,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
-       $(OBJS)\coredll_imagfill.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
@@ -1575,12 +1577,34 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -1611,30 +1635,26 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpchm.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_icon.obj \
-       $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
+       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_taskbarcmn.obj \
-       $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_wave.obj \
+       $(OBJS)\corelib_uxtheme.obj \
        $(OBJS)\corelib_window.obj \
-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_statusbr.obj \
-       $(OBJS)\corelib_uxtheme.obj \
-       $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
@@ -1662,13 +1682,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_notebook.obj \
+       $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \
        $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_slider95.obj \
        $(OBJS)\corelib_spinbutt.obj \
@@ -1683,40 +1703,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_accesscmn.obj \
+       $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
@@ -1729,7 +1717,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_ctrlcmn.obj \
        $(OBJS)\corelib_ctrlsub.obj \
        $(OBJS)\corelib_datacmn.obj \
-       $(OBJS)\corelib_dbgrid.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
@@ -1742,9 +1729,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
@@ -1754,6 +1740,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
+       $(OBJS)\corelib_imagfill.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
@@ -1762,7 +1749,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
-       $(OBJS)\corelib_imagfill.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
@@ -1780,12 +1766,34 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -1816,28 +1824,38 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpchm.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_icon.obj \
-       $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
+       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_taskbarcmn.obj \
-       $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_wave.obj \
+       $(OBJS)\corelib_uxtheme.obj \
        $(OBJS)\corelib_window.obj \
-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_textctrl.obj \
+       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_filedlgg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_imaglist.obj \
+       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_mdig.obj \
+       $(OBJS)\corelib_msgdlgg.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_tabg.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
@@ -1846,9 +1864,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_colschem.obj \
        $(OBJS)\corelib_combobox.obj \
        $(OBJS)\corelib_control.obj \
+       $(OBJS)\corelib_ctrlrend.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \
-       $(OBJS)\corelib_topluniv.obj \
        $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \
@@ -1857,7 +1875,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_scrthumb.obj \
@@ -1868,58 +1885,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statusbr.obj \
-       $(OBJS)\corelib_toolbar.obj \
        $(OBJS)\corelib_theme.obj \
+       $(OBJS)\corelib_toolbar.obj \
+       $(OBJS)\corelib_topluniv.obj \
        $(OBJS)\corelib_winuniv.obj \
-       $(OBJS)\corelib_mdig.obj \
-       $(OBJS)\corelib_imaglist.obj \
-       $(OBJS)\corelib_colrdlgg.obj \
-       $(OBJS)\corelib_listctrl.obj \
-       $(OBJS)\corelib_filedlgg.obj \
-       $(OBJS)\corelib_dirdlgg.obj \
-       $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_msgdlgg.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
-       $(OBJS)\corelib_fontdlgg.obj \
-       $(OBJS)\corelib_tabg.obj \
        $(OBJS)\corelib_gtk.obj \
-       $(OBJS)\corelib_win32.obj \
        $(OBJS)\corelib_metal.obj \
-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_win32.obj \
        $(OBJS)\corelib_accesscmn.obj \
+       $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
@@ -1932,7 +1906,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_ctrlcmn.obj \
        $(OBJS)\corelib_ctrlsub.obj \
        $(OBJS)\corelib_datacmn.obj \
-       $(OBJS)\corelib_dbgrid.obj \
        $(OBJS)\corelib_dcbase.obj \
        $(OBJS)\corelib_dlgcmn.obj \
        $(OBJS)\corelib_dndcmn.obj \
@@ -1945,9 +1918,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
@@ -1957,6 +1929,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
+       $(OBJS)\corelib_imagfill.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
@@ -1965,7 +1938,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
-       $(OBJS)\corelib_imagfill.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
@@ -1983,12 +1955,34 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2019,30 +2013,26 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpchm.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_icon.obj \
-       $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
+       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_toplevel.obj \
        $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_wave.obj \
+       $(OBJS)\monodll_uxtheme.obj \
        $(OBJS)\monodll_window.obj \
-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_statusbr.obj \
-       $(OBJS)\monodll_uxtheme.obj \
-       $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
@@ -2070,13 +2060,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_notebook.obj \
+       $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \
        $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_slider95.obj \
        $(OBJS)\monodll_spinbutt.obj \
@@ -2088,43 +2078,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_tabctrl.obj \
        $(OBJS)\monodll_tbar95.obj \
-       $(OBJS)\monodll_textctrl.obj \
-       $(OBJS)\monodll_tglbtn.obj \
-       $(OBJS)\monodll_treectrl.obj \
-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_tglbtn.obj \
+       $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_accesscmn.obj \
+       $(OBJS)\monodll_appcmn.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
@@ -2137,7 +2095,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_ctrlcmn.obj \
        $(OBJS)\monodll_ctrlsub.obj \
        $(OBJS)\monodll_datacmn.obj \
-       $(OBJS)\monodll_dbgrid.obj \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dlgcmn.obj \
        $(OBJS)\monodll_dndcmn.obj \
@@ -2150,9 +2107,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
@@ -2162,6 +2118,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(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 \
@@ -2170,7 +2127,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
-       $(OBJS)\monodll_imagfill.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
@@ -2188,12 +2144,34 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
+       $(OBJS)\monodll_timercmn.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_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2224,28 +2202,38 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpchm.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_icon.obj \
-       $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
+       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_toplevel.obj \
        $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_wave.obj \
+       $(OBJS)\monodll_uxtheme.obj \
        $(OBJS)\monodll_window.obj \
-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_imaglist.obj \
+       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_mdig.obj \
+       $(OBJS)\monodll_msgdlgg.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_tabg.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
@@ -2254,9 +2242,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_colschem.obj \
        $(OBJS)\monodll_combobox.obj \
        $(OBJS)\monodll_control.obj \
+       $(OBJS)\monodll_ctrlrend.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \
-       $(OBJS)\monodll_topluniv.obj \
        $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \
@@ -2265,7 +2253,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_scrthumb.obj \
@@ -2276,58 +2263,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statusbr.obj \
-       $(OBJS)\monodll_toolbar.obj \
        $(OBJS)\monodll_theme.obj \
+       $(OBJS)\monodll_toolbar.obj \
+       $(OBJS)\monodll_topluniv.obj \
        $(OBJS)\monodll_winuniv.obj \
-       $(OBJS)\monodll_mdig.obj \
-       $(OBJS)\monodll_imaglist.obj \
-       $(OBJS)\monodll_colrdlgg.obj \
-       $(OBJS)\monodll_listctrl.obj \
-       $(OBJS)\monodll_filedlgg.obj \
-       $(OBJS)\monodll_dirdlgg.obj \
-       $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_msgdlgg.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
-       $(OBJS)\monodll_fontdlgg.obj \
-       $(OBJS)\monodll_tabg.obj \
        $(OBJS)\monodll_gtk.obj \
-       $(OBJS)\monodll_win32.obj \
        $(OBJS)\monodll_metal.obj \
-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_win32.obj \
        $(OBJS)\monodll_accesscmn.obj \
+       $(OBJS)\monodll_appcmn.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
@@ -2340,7 +2284,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_ctrlcmn.obj \
        $(OBJS)\monodll_ctrlsub.obj \
        $(OBJS)\monodll_datacmn.obj \
-       $(OBJS)\monodll_dbgrid.obj \
        $(OBJS)\monodll_dcbase.obj \
        $(OBJS)\monodll_dlgcmn.obj \
        $(OBJS)\monodll_dndcmn.obj \
@@ -2353,9 +2296,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
@@ -2365,6 +2307,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(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 \
@@ -2373,7 +2316,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
-       $(OBJS)\monodll_imagfill.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
@@ -2391,64 +2333,130 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
+       $(OBJS)\monodll_timercmn.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_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_dcbuffer.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_helpbest.obj \
+       $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpfrm.obj \
-       $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_htmlcell.obj \
        $(OBJS)\monolib_htmlfilt.obj \
        $(OBJS)\monolib_htmlpars.obj \
        $(OBJS)\monolib_htmltag.obj \
        $(OBJS)\monolib_htmlwin.obj \
-       $(OBJS)\monolib_winpars.obj \
+       $(OBJS)\monolib_htmprint.obj \
+       $(OBJS)\monolib_m_dflist.obj \
        $(OBJS)\monolib_m_fonts.obj \
        $(OBJS)\monolib_m_hline.obj \
        $(OBJS)\monolib_m_image.obj \
        $(OBJS)\monolib_m_layout.obj \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \
-       $(OBJS)\monolib_m_dflist.obj \
        $(OBJS)\monolib_m_pre.obj \
-       $(OBJS)\monolib_m_tables.obj \
        $(OBJS)\monolib_m_style.obj \
-       $(OBJS)\monolib_htmprint.obj \
-       $(OBJS)\monolib_htmllbox.obj
+       $(OBJS)\monolib_m_tables.obj \
+       $(OBJS)\monolib_winpars.obj \
+       $(OBJS)\monolib_htmllbox.obj \
+       $(OBJS)\monolib_db.obj \
+       $(OBJS)\monolib_dbtable.obj \
+       $(OBJS)\monolib_dbgrid.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_dcbuffer.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_helpbest.obj \
+       $(OBJS)\monodll_helpctrl.obj \
        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpfrm.obj \
-       $(OBJS)\monodll_helpctrl.obj \
        $(OBJS)\monodll_htmlcell.obj \
        $(OBJS)\monodll_htmlfilt.obj \
        $(OBJS)\monodll_htmlpars.obj \
        $(OBJS)\monodll_htmltag.obj \
        $(OBJS)\monodll_htmlwin.obj \
-       $(OBJS)\monodll_winpars.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_dflist.obj \
        $(OBJS)\monodll_m_pre.obj \
-       $(OBJS)\monodll_m_tables.obj \
        $(OBJS)\monodll_m_style.obj \
-       $(OBJS)\monodll_htmprint.obj \
-       $(OBJS)\monodll_htmllbox.obj
+       $(OBJS)\monodll_m_tables.obj \
+       $(OBJS)\monodll_winpars.obj \
+       $(OBJS)\monodll_htmllbox.obj \
+       $(OBJS)\monodll_db.obj \
+       $(OBJS)\monodll_dbtable.obj \
+       $(OBJS)\monodll_dbgrid.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+__advdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+__advlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
@@ -2466,6 +2474,14 @@ __coredll___depname = \
 __corelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__dbgriddll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__dbgridlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+!endif
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
@@ -2498,6 +2514,14 @@ __netdll___depname = \
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__odbcdll___depname = \
+       $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__odbclib___depname = \
+       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+!endif
 !if "$(USE_GUI)" == "1"
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !endif
@@ -2523,7 +2547,103 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
+all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
+
+$(OBJS)\advdll_calctrl.obj: ..\src\generic\calctrl.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $**
+
+$(OBJS)\advdll_grid.obj: ..\src\generic\grid.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_gridctrl.obj: ..\src\generic\gridctrl.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_joystick.obj: ..\src\msw\joystick.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_taskbar.obj: ..\src\msw\taskbar.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_wave.obj: ..\src\msw\wave.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advlib_calctrl.obj: ..\src\generic\calctrl.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $**
+
+$(OBJS)\advlib_grid.obj: ..\src\generic\grid.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_gridctrl.obj: ..\src\generic\gridctrl.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_joystick.obj: ..\src\msw\joystick.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_taskbar.obj: ..\src\msw\taskbar.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_wave.obj: ..\src\msw\wave.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
 $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -2549,12 +2669,6 @@ $(OBJS)\basedll_datetime.obj: ..\src\common\datetime.cpp
 $(OBJS)\basedll_datstrm.obj: ..\src\common\datstrm.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_db.obj: ..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
-$(OBJS)\basedll_dbtable.obj: ..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_dde.obj: ..\src\msw\dde.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -2762,12 +2876,6 @@ $(OBJS)\baselib_datetime.obj: ..\src\common\datetime.cpp
 $(OBJS)\baselib_datstrm.obj: ..\src\common\datstrm.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_db.obj: ..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
-$(OBJS)\baselib_dbtable.obj: ..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_dde.obj: ..\src\msw\dde.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -3034,11 +3142,6 @@ $(OBJS)\coredll_button.obj: ..\src\msw\button.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_calctrl.obj: ..\src\generic\calctrl.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_caret.obj: ..\src\msw\caret.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3153,6 +3256,9 @@ $(OBJS)\coredll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\coredll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_ctrlsub.obj: ..\src\common\ctrlsub.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3179,22 +3285,12 @@ $(OBJS)\coredll_dataobj.obj: ..\src\msw\ole\dataobj.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dbgrid.obj: ..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dc.obj: ..\src\msw\dc.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp
+$(OBJS)\coredll_dc.obj: ..\src\msw\dc.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
+$(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
@@ -3442,21 +3538,6 @@ $(OBJS)\coredll_gifdecod.obj: ..\src\common\gifdecod.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_grid.obj: ..\src\generic\grid.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gridctrl.obj: ..\src\generic\gridctrl.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gridsel.obj: ..\src\generic\gridsel.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 $(OBJS)\coredll_gtk.obj: ..\src\univ\themes\gtk.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -3470,11 +3551,6 @@ $(OBJS)\coredll_helpchm.obj: ..\src\msw\helpchm.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpext.obj: ..\src\generic\helpext.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_helpwin.obj: ..\src\msw\helpwin.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3569,21 +3645,11 @@ $(OBJS)\coredll_inpcons.obj: ..\src\univ\inpcons.cpp
 $(OBJS)\coredll_inphand.obj: ..\src\univ\inphand.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_joystick.obj: ..\src\msw\joystick.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_laywin.obj: ..\src\generic\laywin.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_lboxcmn.obj: ..\src\common\lboxcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3792,12 +3858,7 @@ $(OBJS)\coredll_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
@@ -3812,11 +3873,6 @@ $(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_sashwin.obj: ..\src\generic\sashwin.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 $(OBJS)\coredll_scrarrow.obj: ..\src\univ\scrarrow.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -3882,11 +3938,6 @@ $(OBJS)\coredll_spinctlg.obj: ..\src\generic\spinctlg.cpp
 $(OBJS)\coredll_spinctrl.obj: ..\src\msw\spinctrl.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_splash.obj: ..\src\generic\splash.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_splitter.obj: ..\src\generic\splitter.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3956,16 +4007,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tabg.obj: ..\src\generic\tabg.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_taskbar.obj: ..\src\msw\taskbar.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 $(OBJS)\coredll_tbar95.obj: ..\src\msw\tbar95.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -4015,11 +4056,6 @@ $(OBJS)\coredll_timercmn.obj: ..\src\common\timercmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tipdlg.obj: ..\src\generic\tipdlg.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\src\generic\tipwin.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4072,8 +4108,10 @@ $(OBJS)\coredll_uuid.obj: ..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_uxtheme.obj: ..\src\msw\uxtheme.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_valgen.obj: ..\src\common\valgen.cpp
@@ -4103,11 +4141,6 @@ $(OBJS)\coredll_vscroll.obj: ..\src\generic\vscroll.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_wave.obj: ..\src\msw\wave.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 $(OBJS)\coredll_win32.obj: ..\src\univ\themes\win32.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -4124,11 +4157,6 @@ $(OBJS)\coredll_window.obj: ..\src\msw\window.cpp
 $(OBJS)\coredll_winuniv.obj: ..\src\univ\winuniv.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_wizard.obj: ..\src\generic\wizard.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\src\common\xpmdecod.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4217,11 +4245,6 @@ $(OBJS)\corelib_button.obj: ..\src\msw\button.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_calctrl.obj: ..\src\generic\calctrl.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_caret.obj: ..\src\msw\caret.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4336,6 +4359,9 @@ $(OBJS)\corelib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\corelib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_ctrlsub.obj: ..\src\common\ctrlsub.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4361,11 +4387,6 @@ $(OBJS)\corelib_dataobj.obj: ..\src\msw\ole\dataobj.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dbgrid.obj: ..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dc.obj: ..\src\msw\dc.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4376,11 +4397,6 @@ $(OBJS)\corelib_dcbase.obj: ..\src\common\dcbase.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcclient.obj: ..\src\msw\dcclient.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4625,21 +4641,6 @@ $(OBJS)\corelib_gifdecod.obj: ..\src\common\gifdecod.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_grid.obj: ..\src\generic\grid.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gridctrl.obj: ..\src\generic\gridctrl.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gridsel.obj: ..\src\generic\gridsel.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 $(OBJS)\corelib_gtk.obj: ..\src\univ\themes\gtk.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -4653,11 +4654,6 @@ $(OBJS)\corelib_helpchm.obj: ..\src\msw\helpchm.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpext.obj: ..\src\generic\helpext.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_helpwin.obj: ..\src\msw\helpwin.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4752,21 +4748,11 @@ $(OBJS)\corelib_inpcons.obj: ..\src\univ\inpcons.cpp
 $(OBJS)\corelib_inphand.obj: ..\src\univ\inphand.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_joystick.obj: ..\src\msw\joystick.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_laywin.obj: ..\src\generic\laywin.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_lboxcmn.obj: ..\src\common\lboxcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4975,12 +4961,7 @@ $(OBJS)\corelib_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
@@ -4995,11 +4976,6 @@ $(OBJS)\corelib_rgncmn.obj: ..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_sashwin.obj: ..\src\generic\sashwin.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 $(OBJS)\corelib_scrarrow.obj: ..\src\univ\scrarrow.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -5065,11 +5041,6 @@ $(OBJS)\corelib_spinctlg.obj: ..\src\generic\spinctlg.cpp
 $(OBJS)\corelib_spinctrl.obj: ..\src\msw\spinctrl.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_splash.obj: ..\src\generic\splash.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_splitter.obj: ..\src\generic\splitter.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -5139,16 +5110,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tabg.obj: ..\src\generic\tabg.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_taskbar.obj: ..\src\msw\taskbar.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 $(OBJS)\corelib_tbar95.obj: ..\src\msw\tbar95.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -5198,11 +5159,6 @@ $(OBJS)\corelib_timercmn.obj: ..\src\common\timercmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tipdlg.obj: ..\src\generic\tipdlg.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\src\generic\tipwin.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -5255,8 +5211,10 @@ $(OBJS)\corelib_uuid.obj: ..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_uxtheme.obj: ..\src\msw\uxtheme.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_valgen.obj: ..\src\common\valgen.cpp
@@ -5286,11 +5244,6 @@ $(OBJS)\corelib_vscroll.obj: ..\src\generic\vscroll.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_wave.obj: ..\src\msw\wave.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 $(OBJS)\corelib_win32.obj: ..\src\univ\themes\win32.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -5307,16 +5260,23 @@ $(OBJS)\corelib_window.obj: ..\src\msw\window.cpp
 $(OBJS)\corelib_winuniv.obj: ..\src\univ\winuniv.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_wizard.obj: ..\src\generic\wizard.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\dbgriddll_dbgrid.obj: ..\src\common\dbgrid.cpp
+       $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $**
+
+$(OBJS)\dbgriddll_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $**
+
+$(OBJS)\dbgridlib_dbgrid.obj: ..\src\common\dbgrid.cpp
+       $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $**
+
+$(OBJS)\dbgridlib_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $**
+
 $(OBJS)\gldll_dummy.obj: ..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**
 
@@ -5556,10 +5516,8 @@ $(OBJS)\monodll_button.obj: ..\src\msw\button.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_calctrl.obj: ..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_caret.obj: ..\src\msw\caret.cpp
@@ -5687,6 +5645,9 @@ $(OBJS)\monodll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monodll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_ctrlsub.obj: ..\src\common\ctrlsub.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5721,10 +5682,8 @@ $(OBJS)\monodll_datstrm.obj: ..\src\common\datstrm.cpp
 $(OBJS)\monodll_db.obj: ..\src\common\db.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dbgrid.obj: ..\src\common\dbgrid.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_dbtable.obj: ..\src\common\dbtable.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5739,10 +5698,8 @@ $(OBJS)\monodll_dcbase.obj: ..\src\common\dcbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcclient.obj: ..\src\msw\dcclient.cpp
@@ -6042,20 +5999,14 @@ $(OBJS)\monodll_gifdecod.obj: ..\src\common\gifdecod.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_grid.obj: ..\src\generic\grid.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridctrl.obj: ..\src\generic\gridctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gridsel.obj: ..\src\generic\gridsel.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_gsocket.obj: ..\src\msw\gsocket.c
        $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
@@ -6091,10 +6042,8 @@ $(OBJS)\monodll_helpctrl.obj: ..\src\html\helpctrl.cpp
 $(OBJS)\monodll_helpdata.obj: ..\src\html\helpdata.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_helpext.obj: ..\src\generic\helpext.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_helpfrm.obj: ..\src\html\helpfrm.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6226,20 +6175,16 @@ $(OBJS)\monodll_intl.obj: ..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj: ..\src\common\ipcbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_joystick.obj: ..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\src\generic\laywin.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_lboxcmn.obj: ..\src\common\lboxcmn.cpp
@@ -6521,12 +6466,7 @@ $(OBJS)\monodll_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
@@ -6541,10 +6481,8 @@ $(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_sckaddr.obj: ..\src\common\sckaddr.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6629,10 +6567,8 @@ $(OBJS)\monodll_spinctlg.obj: ..\src\generic\spinctlg.cpp
 $(OBJS)\monodll_spinctrl.obj: ..\src\msw\spinctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splash.obj: ..\src\generic\splash.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_splitter.obj: ..\src\generic\splitter.cpp
@@ -6718,15 +6654,11 @@ $(OBJS)\monodll_tabctrl.obj: ..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tabg.obj: ..\src\generic\tabg.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbar.obj: ..\src\msw\taskbar.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_tbar95.obj: ..\src\msw\tbar95.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6786,10 +6718,8 @@ $(OBJS)\monodll_timercmn.obj: ..\src\common\timercmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipdlg.obj: ..\src\generic\tipdlg.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\src\generic\tipwin.cpp
@@ -6861,8 +6791,10 @@ $(OBJS)\monodll_uuid.obj: ..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_uxtheme.obj: ..\src\msw\uxtheme.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_valgen.obj: ..\src\common\valgen.cpp
@@ -6895,10 +6827,8 @@ $(OBJS)\monodll_vscroll.obj: ..\src\generic\vscroll.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wave.obj: ..\src\msw\wave.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_wfstream.obj: ..\src\common\wfstream.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6922,10 +6852,8 @@ $(OBJS)\monodll_winpars.obj: ..\src\html\winpars.cpp
 $(OBJS)\monodll_winuniv.obj: ..\src\univ\winuniv.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wizard.obj: ..\src\generic\wizard.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monodll_wxchar.obj: ..\src\common\wxchar.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7033,10 +6961,8 @@ $(OBJS)\monolib_button.obj: ..\src\msw\button.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_calctrl.obj: ..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_caret.obj: ..\src\msw\caret.cpp
@@ -7164,6 +7090,9 @@ $(OBJS)\monolib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monolib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_ctrlsub.obj: ..\src\common\ctrlsub.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7198,10 +7127,8 @@ $(OBJS)\monolib_datstrm.obj: ..\src\common\datstrm.cpp
 $(OBJS)\monolib_db.obj: ..\src\common\db.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dbgrid.obj: ..\src\common\dbgrid.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_dbtable.obj: ..\src\common\dbtable.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7216,10 +7143,8 @@ $(OBJS)\monolib_dcbase.obj: ..\src\common\dcbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcclient.obj: ..\src\msw\dcclient.cpp
@@ -7519,20 +7444,14 @@ $(OBJS)\monolib_gifdecod.obj: ..\src\common\gifdecod.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_grid.obj: ..\src\generic\grid.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridctrl.obj: ..\src\generic\gridctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gridsel.obj: ..\src\generic\gridsel.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_gsocket.obj: ..\src\msw\gsocket.c
        $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
@@ -7568,10 +7487,8 @@ $(OBJS)\monolib_helpctrl.obj: ..\src\html\helpctrl.cpp
 $(OBJS)\monolib_helpdata.obj: ..\src\html\helpdata.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_helpext.obj: ..\src\generic\helpext.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_helpfrm.obj: ..\src\html\helpfrm.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7703,20 +7620,16 @@ $(OBJS)\monolib_intl.obj: ..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj: ..\src\common\ipcbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_joystick.obj: ..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\src\generic\laywin.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_lboxcmn.obj: ..\src\common\lboxcmn.cpp
@@ -7998,12 +7911,7 @@ $(OBJS)\monolib_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
@@ -8018,10 +7926,8 @@ $(OBJS)\monolib_rgncmn.obj: ..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_sckaddr.obj: ..\src\common\sckaddr.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8106,10 +8012,8 @@ $(OBJS)\monolib_spinctlg.obj: ..\src\generic\spinctlg.cpp
 $(OBJS)\monolib_spinctrl.obj: ..\src\msw\spinctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splash.obj: ..\src\generic\splash.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_splitter.obj: ..\src\generic\splitter.cpp
@@ -8195,15 +8099,11 @@ $(OBJS)\monolib_tabctrl.obj: ..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tabg.obj: ..\src\generic\tabg.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbar.obj: ..\src\msw\taskbar.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_tbar95.obj: ..\src\msw\tbar95.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8263,10 +8163,8 @@ $(OBJS)\monolib_timercmn.obj: ..\src\common\timercmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipdlg.obj: ..\src\generic\tipdlg.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\src\generic\tipwin.cpp
@@ -8338,8 +8236,10 @@ $(OBJS)\monolib_uuid.obj: ..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_uxtheme.obj: ..\src\msw\uxtheme.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_valgen.obj: ..\src\common\valgen.cpp
@@ -8372,10 +8272,8 @@ $(OBJS)\monolib_vscroll.obj: ..\src\generic\vscroll.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wave.obj: ..\src\msw\wave.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_wfstream.obj: ..\src\common\wfstream.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8399,10 +8297,8 @@ $(OBJS)\monolib_winpars.obj: ..\src\html\winpars.cpp
 $(OBJS)\monolib_winuniv.obj: ..\src\univ\winuniv.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wizard.obj: ..\src\generic\wizard.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
 
 $(OBJS)\monolib_wxchar.obj: ..\src\common\wxchar.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8499,6 +8395,24 @@ $(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj: ..\src\common\url.cpp
        $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
 
+$(OBJS)\odbcdll_db.obj: ..\src\common\db.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
+
+$(OBJS)\odbcdll_dbtable.obj: ..\src\common\dbtable.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
+
+$(OBJS)\odbcdll_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**
+
+$(OBJS)\odbclib_db.obj: ..\src\common\db.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
+
+$(OBJS)\odbclib_dbtable.obj: ..\src\common\dbtable.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
+
+$(OBJS)\odbclib_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $**
+
 $(OBJS)\wxexpat_xmlparse.obj: ..\src\expat\lib\xmlparse.c
        $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $**
 
@@ -8862,10 +8776,26 @@ $(OBJS)\xmllib_dummy.obj: ..\src\msw\dummy.cpp
 $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp
        $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $**
 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+|
+       implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj
+       if exist $@ del $@
+       tlib /a /p2048 $@ @&&|
+       $(ADVLIB_OBJECTS)
+|
+!endif
+
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
@@ -8899,6 +8829,15 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
@@ -8911,8 +8850,8 @@ clean:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
 !endif
@@ -8925,10 +8864,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 |
 !endif
 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+|
+       implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj
+       if exist $@ del $@
+       tlib /a /p2048 $@ @&&|
+       $(DBGRIDLIB_OBJECTS)
+|
+!endif
+
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
 !endif
@@ -8943,8 +8898,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
 !endif
@@ -8965,8 +8920,8 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib   cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib    import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
@@ -8984,8 +8939,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@
 !endif
@@ -8998,6 +8953,22 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS)
 |
 !endif
 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+|
+       implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj
+       if exist $@ del $@
+       tlib /a /p2048 $@ @&&|
+       $(ODBCLIB_OBJECTS)
+|
+!endif
+
 $(LIBDIRNAME)\wx\setup.h: 
        if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
@@ -9047,8 +9018,8 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  cw32mt$(__RUNTIME_LIBS_5).lib,,
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@
 !endif