X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/feaed9410aa9825fb3ac27cdd1f57f548f9176bc..653eafdf4f51116c8c0aecd02c6ba20eaf44a8bb:/build/makefile.bcc

diff --git a/build/makefile.bcc b/build/makefile.bcc
index f3e0c511f6..9c3c6138fa 100644
--- a/build/makefile.bcc
+++ b/build/makefile.bcc
@@ -8,6 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
+<<<<<<< makefile.bcc
 # -------------------------------------------------------------------------
 # These are configurable options:
 # -------------------------------------------------------------------------
@@ -44,7 +45,7 @@ CXXFLAGS =
 !endif
 # Standard linker flags 
 !ifndef LDFLAGS
-LDFLAGS = -L$(BCCDIR)\lib
+LDFLAGS = -L"D:\Borland C++ 5.5\Lib"
 !endif
 # Multiple libraries or single huge monolithic one? [0,1]
 !ifndef MONOLITHIC
@@ -88,118 +89,766 @@ VENDOR = custom
 !ifndef WXUNIV
 WXUNIV = 0
 !endif
+=======
+!include config.bcc
+>>>>>>> 1.15
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
+<<<<<<< makefile.bcc
+!ifndef MAKEDIR
+=======
 !if "$(BCCDIR)" == "\.."
+>>>>>>> 1.5
 !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
 !endif
 
+!ifndef BCCDIR
+BCCDIR=$(MAKEDIR)\..
+!endif
+
 ### 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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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 $(CXXFLAGS) -Hu \
 	-H=$(OBJS)\wxprec_basedll.csm
-BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+BASEDLL_OBJECTS =  \
+	$(OBJS)\basedll_dummy.obj \
+	$(OBJS)\basedll_appbase.obj \
+	$(OBJS)\basedll_clntdata.obj \
+	$(OBJS)\basedll_cmdline.obj \
+	$(OBJS)\basedll_config.obj \
+	$(OBJS)\basedll_datetime.obj \
+	$(OBJS)\basedll_datstrm.obj \
+	$(OBJS)\basedll_dircmn.obj \
+	$(OBJS)\basedll_dynarray.obj \
+	$(OBJS)\basedll_dynlib.obj \
+	$(OBJS)\basedll_dynload.obj \
+	$(OBJS)\basedll_encconv.obj \
+	$(OBJS)\basedll_extended.obj \
+	$(OBJS)\basedll_ffile.obj \
+	$(OBJS)\basedll_file.obj \
+	$(OBJS)\basedll_fileconf.obj \
+	$(OBJS)\basedll_filefn.obj \
+	$(OBJS)\basedll_filename.obj \
+	$(OBJS)\basedll_filesys.obj \
+	$(OBJS)\basedll_fmapbase.obj \
+	$(OBJS)\basedll_fs_zip.obj \
+	$(OBJS)\basedll_hash.obj \
+	$(OBJS)\basedll_hashmap.obj \
+	$(OBJS)\basedll_init.obj \
+	$(OBJS)\basedll_intl.obj \
+	$(OBJS)\basedll_ipcbase.obj \
+	$(OBJS)\basedll_list.obj \
+	$(OBJS)\basedll_log.obj \
+	$(OBJS)\basedll_longlong.obj \
+	$(OBJS)\basedll_memory.obj \
+	$(OBJS)\basedll_mimecmn.obj \
+	$(OBJS)\basedll_module.obj \
+	$(OBJS)\basedll_mstream.obj \
+	$(OBJS)\basedll_object.obj \
+	$(OBJS)\basedll_process.obj \
+	$(OBJS)\basedll_regex.obj \
+	$(OBJS)\basedll_stopwatch.obj \
+	$(OBJS)\basedll_strconv.obj \
+	$(OBJS)\basedll_stream.obj \
+	$(OBJS)\basedll_string.obj \
+	$(OBJS)\basedll_sysopt.obj \
+	$(OBJS)\basedll_textbuf.obj \
+	$(OBJS)\basedll_textfile.obj \
+	$(OBJS)\basedll_tokenzr.obj \
+	$(OBJS)\basedll_txtstrm.obj \
+	$(OBJS)\basedll_unzip.obj \
+	$(OBJS)\basedll_variant.obj \
+	$(OBJS)\basedll_wfstream.obj \
+	$(OBJS)\basedll_wxchar.obj \
+	$(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 \
+	$(OBJS)\basedll_regconf.obj \
+	$(OBJS)\basedll_registry.obj \
+	$(OBJS)\basedll_snglinst.obj \
+	$(OBJS)\basedll_thread.obj \
+	$(OBJS)\basedll_utils.obj \
+	$(OBJS)\basedll_utilsexc.obj \
+	$(OBJS)\basedll_event.obj \
+	$(OBJS)\basedll_fs_mem.obj \
+	$(OBJS)\basedll_msgout.obj \
+	$(OBJS)\basedll_utilscmn.obj \
+	$(OBJS)\basedll_main.obj \
+	$(OBJS)\basedll_mslu.obj \
+	$(OBJS)\basedll_volume.obj
+BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_baselib.csm
-COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+BASELIB_OBJECTS =  \
+	$(OBJS)\baselib_dummy.obj \
+	$(OBJS)\baselib_appbase.obj \
+	$(OBJS)\baselib_clntdata.obj \
+	$(OBJS)\baselib_cmdline.obj \
+	$(OBJS)\baselib_config.obj \
+	$(OBJS)\baselib_datetime.obj \
+	$(OBJS)\baselib_datstrm.obj \
+	$(OBJS)\baselib_dircmn.obj \
+	$(OBJS)\baselib_dynarray.obj \
+	$(OBJS)\baselib_dynlib.obj \
+	$(OBJS)\baselib_dynload.obj \
+	$(OBJS)\baselib_encconv.obj \
+	$(OBJS)\baselib_extended.obj \
+	$(OBJS)\baselib_ffile.obj \
+	$(OBJS)\baselib_file.obj \
+	$(OBJS)\baselib_fileconf.obj \
+	$(OBJS)\baselib_filefn.obj \
+	$(OBJS)\baselib_filename.obj \
+	$(OBJS)\baselib_filesys.obj \
+	$(OBJS)\baselib_fmapbase.obj \
+	$(OBJS)\baselib_fs_zip.obj \
+	$(OBJS)\baselib_hash.obj \
+	$(OBJS)\baselib_hashmap.obj \
+	$(OBJS)\baselib_init.obj \
+	$(OBJS)\baselib_intl.obj \
+	$(OBJS)\baselib_ipcbase.obj \
+	$(OBJS)\baselib_list.obj \
+	$(OBJS)\baselib_log.obj \
+	$(OBJS)\baselib_longlong.obj \
+	$(OBJS)\baselib_memory.obj \
+	$(OBJS)\baselib_mimecmn.obj \
+	$(OBJS)\baselib_module.obj \
+	$(OBJS)\baselib_mstream.obj \
+	$(OBJS)\baselib_object.obj \
+	$(OBJS)\baselib_process.obj \
+	$(OBJS)\baselib_regex.obj \
+	$(OBJS)\baselib_stopwatch.obj \
+	$(OBJS)\baselib_strconv.obj \
+	$(OBJS)\baselib_stream.obj \
+	$(OBJS)\baselib_string.obj \
+	$(OBJS)\baselib_sysopt.obj \
+	$(OBJS)\baselib_textbuf.obj \
+	$(OBJS)\baselib_textfile.obj \
+	$(OBJS)\baselib_tokenzr.obj \
+	$(OBJS)\baselib_txtstrm.obj \
+	$(OBJS)\baselib_unzip.obj \
+	$(OBJS)\baselib_variant.obj \
+	$(OBJS)\baselib_wfstream.obj \
+	$(OBJS)\baselib_wxchar.obj \
+	$(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 \
+	$(OBJS)\baselib_regconf.obj \
+	$(OBJS)\baselib_registry.obj \
+	$(OBJS)\baselib_snglinst.obj \
+	$(OBJS)\baselib_thread.obj \
+	$(OBJS)\baselib_utils.obj \
+	$(OBJS)\baselib_utilsexc.obj \
+	$(OBJS)\baselib_event.obj \
+	$(OBJS)\baselib_fs_mem.obj \
+	$(OBJS)\baselib_msgout.obj \
+	$(OBJS)\baselib_utilscmn.obj \
+	$(OBJS)\baselib_main.obj \
+	$(OBJS)\baselib_mslu.obj \
+	$(OBJS)\baselib_volume.obj
+COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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_CORE -DwxUSE_BASE=0 $(CXXFLAGS) -Hu \
 	-H=$(OBJS)\wxprec_coredll.csm
-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+COREDLL_OBJECTS =  \
+	$(OBJS)\coredll_dummy.obj \
+	$(OBJS)\coredll_event.obj \
+	$(OBJS)\coredll_fs_mem.obj \
+	$(OBJS)\coredll_msgout.obj \
+	$(OBJS)\coredll_utilscmn.obj \
+	$(OBJS)\coredll_main.obj \
+	$(OBJS)\coredll_mslu.obj \
+	$(OBJS)\coredll_volume.obj \
+	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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=0 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_corelib.csm
-GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+CORELIB_OBJECTS =  \
+	$(OBJS)\corelib_dummy.obj \
+	$(OBJS)\corelib_event.obj \
+	$(OBJS)\corelib_fs_mem.obj \
+	$(OBJS)\corelib_msgout.obj \
+	$(OBJS)\corelib_utilscmn.obj \
+	$(OBJS)\corelib_main.obj \
+	$(OBJS)\corelib_mslu.obj \
+	$(OBJS)\corelib_volume.obj \
+	$(____CORE_SRC_FILENAMES_3_OBJECTS)
+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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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_GL $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gldll.csm
-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+GLDLL_OBJECTS =  \
+	$(OBJS)\gldll_dummy.obj \
+	$(OBJS)\gldll_glcanvas.obj
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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_gllib.csm
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+GLLIB_OBJECTS =  \
+	$(OBJS)\gllib_dummy.obj \
+	$(OBJS)\gllib_glcanvas.obj
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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_HTML $(CXXFLAGS) -Hu \
 	-H=$(OBJS)\wxprec_htmldll.csm
-HTMLLIB_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_htmlcell.obj \
+	$(OBJS)\htmldll_htmlfilt.obj \
+	$(OBJS)\htmldll_htmlpars.obj \
+	$(OBJS)\htmldll_htmltag.obj \
+	$(OBJS)\htmldll_htmlwin.obj \
+	$(OBJS)\htmldll_htmprint.obj \
+	$(OBJS)\htmldll_m_dflist.obj \
+	$(OBJS)\htmldll_m_fonts.obj \
+	$(OBJS)\htmldll_m_hline.obj \
+	$(OBJS)\htmldll_m_image.obj \
+	$(OBJS)\htmldll_m_layout.obj \
+	$(OBJS)\htmldll_m_links.obj \
+	$(OBJS)\htmldll_m_list.obj \
+	$(OBJS)\htmldll_m_pre.obj \
+	$(OBJS)\htmldll_m_style.obj \
+	$(OBJS)\htmldll_m_tables.obj \
+	$(OBJS)\htmldll_winpars.obj \
+	$(OBJS)\htmldll_htmllbox.obj
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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_htmllib.csm
-MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+HTMLLIB_OBJECTS =  \
+	$(OBJS)\htmllib_dummy.obj \
+	$(OBJS)\htmllib_helpbest.obj \
+	$(OBJS)\htmllib_helpctrl.obj \
+	$(OBJS)\htmllib_helpdata.obj \
+	$(OBJS)\htmllib_helpfrm.obj \
+	$(OBJS)\htmllib_htmlcell.obj \
+	$(OBJS)\htmllib_htmlfilt.obj \
+	$(OBJS)\htmllib_htmlpars.obj \
+	$(OBJS)\htmllib_htmltag.obj \
+	$(OBJS)\htmllib_htmlwin.obj \
+	$(OBJS)\htmllib_htmprint.obj \
+	$(OBJS)\htmllib_m_dflist.obj \
+	$(OBJS)\htmllib_m_fonts.obj \
+	$(OBJS)\htmllib_m_hline.obj \
+	$(OBJS)\htmllib_m_image.obj \
+	$(OBJS)\htmllib_m_layout.obj \
+	$(OBJS)\htmllib_m_links.obj \
+	$(OBJS)\htmllib_m_list.obj \
+	$(OBJS)\htmllib_m_pre.obj \
+	$(OBJS)\htmllib_m_style.obj \
+	$(OBJS)\htmllib_m_tables.obj \
+	$(OBJS)\htmllib_winpars.obj \
+	$(OBJS)\htmllib_htmllbox.obj
+LIBDIRNAME = \
+	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_monodll.csm
-MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+MONODLL_OBJECTS =  \
+	$(OBJS)\monodll_dummy.obj \
+	$(OBJS)\monodll_appbase.obj \
+	$(OBJS)\monodll_clntdata.obj \
+	$(OBJS)\monodll_cmdline.obj \
+	$(OBJS)\monodll_config.obj \
+	$(OBJS)\monodll_datetime.obj \
+	$(OBJS)\monodll_datstrm.obj \
+	$(OBJS)\monodll_dircmn.obj \
+	$(OBJS)\monodll_dynarray.obj \
+	$(OBJS)\monodll_dynlib.obj \
+	$(OBJS)\monodll_dynload.obj \
+	$(OBJS)\monodll_encconv.obj \
+	$(OBJS)\monodll_extended.obj \
+	$(OBJS)\monodll_ffile.obj \
+	$(OBJS)\monodll_file.obj \
+	$(OBJS)\monodll_fileconf.obj \
+	$(OBJS)\monodll_filefn.obj \
+	$(OBJS)\monodll_filename.obj \
+	$(OBJS)\monodll_filesys.obj \
+	$(OBJS)\monodll_fmapbase.obj \
+	$(OBJS)\monodll_fs_zip.obj \
+	$(OBJS)\monodll_hash.obj \
+	$(OBJS)\monodll_hashmap.obj \
+	$(OBJS)\monodll_init.obj \
+	$(OBJS)\monodll_intl.obj \
+	$(OBJS)\monodll_ipcbase.obj \
+	$(OBJS)\monodll_list.obj \
+	$(OBJS)\monodll_log.obj \
+	$(OBJS)\monodll_longlong.obj \
+	$(OBJS)\monodll_memory.obj \
+	$(OBJS)\monodll_mimecmn.obj \
+	$(OBJS)\monodll_module.obj \
+	$(OBJS)\monodll_mstream.obj \
+	$(OBJS)\monodll_object.obj \
+	$(OBJS)\monodll_process.obj \
+	$(OBJS)\monodll_regex.obj \
+	$(OBJS)\monodll_stopwatch.obj \
+	$(OBJS)\monodll_strconv.obj \
+	$(OBJS)\monodll_stream.obj \
+	$(OBJS)\monodll_string.obj \
+	$(OBJS)\monodll_sysopt.obj \
+	$(OBJS)\monodll_textbuf.obj \
+	$(OBJS)\monodll_textfile.obj \
+	$(OBJS)\monodll_tokenzr.obj \
+	$(OBJS)\monodll_txtstrm.obj \
+	$(OBJS)\monodll_unzip.obj \
+	$(OBJS)\monodll_variant.obj \
+	$(OBJS)\monodll_wfstream.obj \
+	$(OBJS)\monodll_wxchar.obj \
+	$(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 \
+	$(OBJS)\monodll_regconf.obj \
+	$(OBJS)\monodll_registry.obj \
+	$(OBJS)\monodll_snglinst.obj \
+	$(OBJS)\monodll_thread.obj \
+	$(OBJS)\monodll_utils.obj \
+	$(OBJS)\monodll_utilsexc.obj \
+	$(OBJS)\monodll_event.obj \
+	$(OBJS)\monodll_fs_mem.obj \
+	$(OBJS)\monodll_msgout.obj \
+	$(OBJS)\monodll_utilscmn.obj \
+	$(OBJS)\monodll_main.obj \
+	$(OBJS)\monodll_mslu.obj \
+	$(OBJS)\monodll_volume.obj \
+	$(OBJS)\monodll_fs_inet.obj \
+	$(OBJS)\monodll_ftp.obj \
+	$(OBJS)\monodll_http.obj \
+	$(OBJS)\monodll_protocol.obj \
+	$(OBJS)\monodll_sckaddr.obj \
+	$(OBJS)\monodll_sckfile.obj \
+	$(OBJS)\monodll_sckipc.obj \
+	$(OBJS)\monodll_sckstrm.obj \
+	$(OBJS)\monodll_socket.obj \
+	$(OBJS)\monodll_url.obj \
+	$(OBJS)\monodll_gsocket.obj \
+	$(OBJS)\monodll_gsockmsw.obj \
+	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
+	$(OBJS)\monodll_xml.obj
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\include \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	-I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex \
+	$(__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 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_monolib.csm
+MONOLIB_OBJECTS =  \
+	$(OBJS)\monolib_dummy.obj \
+	$(OBJS)\monolib_appbase.obj \
+	$(OBJS)\monolib_clntdata.obj \
+	$(OBJS)\monolib_cmdline.obj \
+	$(OBJS)\monolib_config.obj \
+	$(OBJS)\monolib_datetime.obj \
+	$(OBJS)\monolib_datstrm.obj \
+	$(OBJS)\monolib_dircmn.obj \
+	$(OBJS)\monolib_dynarray.obj \
+	$(OBJS)\monolib_dynlib.obj \
+	$(OBJS)\monolib_dynload.obj \
+	$(OBJS)\monolib_encconv.obj \
+	$(OBJS)\monolib_extended.obj \
+	$(OBJS)\monolib_ffile.obj \
+	$(OBJS)\monolib_file.obj \
+	$(OBJS)\monolib_fileconf.obj \
+	$(OBJS)\monolib_filefn.obj \
+	$(OBJS)\monolib_filename.obj \
+	$(OBJS)\monolib_filesys.obj \
+	$(OBJS)\monolib_fmapbase.obj \
+	$(OBJS)\monolib_fs_zip.obj \
+	$(OBJS)\monolib_hash.obj \
+	$(OBJS)\monolib_hashmap.obj \
+	$(OBJS)\monolib_init.obj \
+	$(OBJS)\monolib_intl.obj \
+	$(OBJS)\monolib_ipcbase.obj \
+	$(OBJS)\monolib_list.obj \
+	$(OBJS)\monolib_log.obj \
+	$(OBJS)\monolib_longlong.obj \
+	$(OBJS)\monolib_memory.obj \
+	$(OBJS)\monolib_mimecmn.obj \
+	$(OBJS)\monolib_module.obj \
+	$(OBJS)\monolib_mstream.obj \
+	$(OBJS)\monolib_object.obj \
+	$(OBJS)\monolib_process.obj \
+	$(OBJS)\monolib_regex.obj \
+	$(OBJS)\monolib_stopwatch.obj \
+	$(OBJS)\monolib_strconv.obj \
+	$(OBJS)\monolib_stream.obj \
+	$(OBJS)\monolib_string.obj \
+	$(OBJS)\monolib_sysopt.obj \
+	$(OBJS)\monolib_textbuf.obj \
+	$(OBJS)\monolib_textfile.obj \
+	$(OBJS)\monolib_tokenzr.obj \
+	$(OBJS)\monolib_txtstrm.obj \
+	$(OBJS)\monolib_unzip.obj \
+	$(OBJS)\monolib_variant.obj \
+	$(OBJS)\monolib_wfstream.obj \
+	$(OBJS)\monolib_wxchar.obj \
+	$(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 \
+	$(OBJS)\monolib_regconf.obj \
+	$(OBJS)\monolib_registry.obj \
+	$(OBJS)\monolib_snglinst.obj \
+	$(OBJS)\monolib_thread.obj \
+	$(OBJS)\monolib_utils.obj \
+	$(OBJS)\monolib_utilsexc.obj \
+	$(OBJS)\monolib_event.obj \
+	$(OBJS)\monolib_fs_mem.obj \
+	$(OBJS)\monolib_msgout.obj \
+	$(OBJS)\monolib_utilscmn.obj \
+	$(OBJS)\monolib_main.obj \
+	$(OBJS)\monolib_mslu.obj \
+	$(OBJS)\monolib_volume.obj \
+	$(OBJS)\monolib_fs_inet.obj \
+	$(OBJS)\monolib_ftp.obj \
+	$(OBJS)\monolib_http.obj \
+	$(OBJS)\monolib_protocol.obj \
+	$(OBJS)\monolib_sckaddr.obj \
+	$(OBJS)\monolib_sckfile.obj \
+	$(OBJS)\monolib_sckipc.obj \
+	$(OBJS)\monolib_sckstrm.obj \
+	$(OBJS)\monolib_socket.obj \
+	$(OBJS)\monolib_url.obj \
+	$(OBJS)\monolib_gsocket.obj \
+	$(OBJS)\monolib_gsockmsw.obj \
+	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
+	$(OBJS)\monolib_xml.obj
+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) $(__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 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netdll.csm
+NETDLL_OBJECTS =  \
+	$(OBJS)\netdll_dummy.obj \
+	$(OBJS)\netdll_fs_inet.obj \
+	$(OBJS)\netdll_ftp.obj \
+	$(OBJS)\netdll_http.obj \
+	$(OBJS)\netdll_protocol.obj \
+	$(OBJS)\netdll_sckaddr.obj \
+	$(OBJS)\netdll_sckfile.obj \
+	$(OBJS)\netdll_sckipc.obj \
+	$(OBJS)\netdll_sckstrm.obj \
+	$(OBJS)\netdll_socket.obj \
+	$(OBJS)\netdll_url.obj \
+	$(OBJS)\netdll_gsocket.obj \
+	$(OBJS)\netdll_gsockmsw.obj
+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) $(__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 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netlib.csm
+NETLIB_OBJECTS =  \
+	$(OBJS)\netlib_dummy.obj \
+	$(OBJS)\netlib_fs_inet.obj \
+	$(OBJS)\netlib_ftp.obj \
+	$(OBJS)\netlib_http.obj \
+	$(OBJS)\netlib_protocol.obj \
+	$(OBJS)\netlib_sckaddr.obj \
+	$(OBJS)\netlib_sckfile.obj \
+	$(OBJS)\netlib_sckipc.obj \
+	$(OBJS)\netlib_sckstrm.obj \
+	$(OBJS)\netlib_socket.obj \
+	$(OBJS)\netlib_url.obj \
+	$(OBJS)\netlib_gsocket.obj \
+	$(OBJS)\netlib_gsockmsw.obj
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
-	-tWM \
-	-I..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-	$(CFLAGS)
-WXPNG_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) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
+	-tWM -I$(LIBDIRNAME) $(CFLAGS)
+WXJPEG_OBJECTS =  \
+	$(OBJS)\wxjpeg_jcomapi.obj \
+	$(OBJS)\wxjpeg_jutils.obj \
+	$(OBJS)\wxjpeg_jerror.obj \
+	$(OBJS)\wxjpeg_jmemmgr.obj \
+	$(OBJS)\wxjpeg_jmemnobs.obj \
+	$(OBJS)\wxjpeg_jcapimin.obj \
+	$(OBJS)\wxjpeg_jcapistd.obj \
+	$(OBJS)\wxjpeg_jctrans.obj \
+	$(OBJS)\wxjpeg_jcparam.obj \
+	$(OBJS)\wxjpeg_jdatadst.obj \
+	$(OBJS)\wxjpeg_jcinit.obj \
+	$(OBJS)\wxjpeg_jcmaster.obj \
+	$(OBJS)\wxjpeg_jcmarker.obj \
+	$(OBJS)\wxjpeg_jcmainct.obj \
+	$(OBJS)\wxjpeg_jcprepct.obj \
+	$(OBJS)\wxjpeg_jccoefct.obj \
+	$(OBJS)\wxjpeg_jccolor.obj \
+	$(OBJS)\wxjpeg_jcsample.obj \
+	$(OBJS)\wxjpeg_jchuff.obj \
+	$(OBJS)\wxjpeg_jcphuff.obj \
+	$(OBJS)\wxjpeg_jcdctmgr.obj \
+	$(OBJS)\wxjpeg_jfdctfst.obj \
+	$(OBJS)\wxjpeg_jfdctflt.obj \
+	$(OBJS)\wxjpeg_jfdctint.obj \
+	$(OBJS)\wxjpeg_jdapimin.obj \
+	$(OBJS)\wxjpeg_jdapistd.obj \
+	$(OBJS)\wxjpeg_jdtrans.obj \
+	$(OBJS)\wxjpeg_jdatasrc.obj \
+	$(OBJS)\wxjpeg_jdmaster.obj \
+	$(OBJS)\wxjpeg_jdinput.obj \
+	$(OBJS)\wxjpeg_jdmarker.obj \
+	$(OBJS)\wxjpeg_jdhuff.obj \
+	$(OBJS)\wxjpeg_jdphuff.obj \
+	$(OBJS)\wxjpeg_jdmainct.obj \
+	$(OBJS)\wxjpeg_jdcoefct.obj \
+	$(OBJS)\wxjpeg_jdpostct.obj \
+	$(OBJS)\wxjpeg_jddctmgr.obj \
+	$(OBJS)\wxjpeg_jidctfst.obj \
+	$(OBJS)\wxjpeg_jidctflt.obj \
+	$(OBJS)\wxjpeg_jidctint.obj \
+	$(OBJS)\wxjpeg_jidctred.obj \
+	$(OBJS)\wxjpeg_jdsample.obj \
+	$(OBJS)\wxjpeg_jdcolor.obj \
+	$(OBJS)\wxjpeg_jquant1.obj \
+	$(OBJS)\wxjpeg_jquant2.obj \
+	$(OBJS)\wxjpeg_jdmerge.obj
+WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -I..\src\zlib $(CFLAGS)
-WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXPNG_OBJECTS =  \
+	$(OBJS)\wxpng_png.obj \
+	$(OBJS)\wxpng_pngerror.obj \
+	$(OBJS)\wxpng_pnggccrd.obj \
+	$(OBJS)\wxpng_pngget.obj \
+	$(OBJS)\wxpng_pngmem.obj \
+	$(OBJS)\wxpng_pngpread.obj \
+	$(OBJS)\wxpng_pngread.obj \
+	$(OBJS)\wxpng_pngrio.obj \
+	$(OBJS)\wxpng_pngrtran.obj \
+	$(OBJS)\wxpng_pngrutil.obj \
+	$(OBJS)\wxpng_pngset.obj \
+	$(OBJS)\wxpng_pngtrans.obj \
+	$(OBJS)\wxpng_pngvcrd.obj \
+	$(OBJS)\wxpng_pngwio.obj \
+	$(OBJS)\wxpng_pngwrite.obj \
+	$(OBJS)\wxpng_pngwtran.obj \
+	$(OBJS)\wxpng_pngwutil.obj
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM $(CFLAGS)
-WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXREGEX_OBJECTS =  \
+	$(OBJS)\wxregex_regcomp.obj \
+	$(OBJS)\wxregex_regexec.obj \
+	$(OBJS)\wxregex_regerror.obj \
+	$(OBJS)\wxregex_regfree.obj
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM $(CFLAGS)
-WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXTIFF_OBJECTS =  \
+	$(OBJS)\wxtiff_tif_win32.obj \
+	$(OBJS)\wxtiff_tif_aux.obj \
+	$(OBJS)\wxtiff_tif_close.obj \
+	$(OBJS)\wxtiff_tif_codec.obj \
+	$(OBJS)\wxtiff_tif_compress.obj \
+	$(OBJS)\wxtiff_tif_dir.obj \
+	$(OBJS)\wxtiff_tif_dirinfo.obj \
+	$(OBJS)\wxtiff_tif_dirread.obj \
+	$(OBJS)\wxtiff_tif_dirwrite.obj \
+	$(OBJS)\wxtiff_tif_dumpmode.obj \
+	$(OBJS)\wxtiff_tif_error.obj \
+	$(OBJS)\wxtiff_tif_fax3.obj \
+	$(OBJS)\wxtiff_tif_fax3sm.obj \
+	$(OBJS)\wxtiff_tif_getimage.obj \
+	$(OBJS)\wxtiff_tif_jpeg.obj \
+	$(OBJS)\wxtiff_tif_flush.obj \
+	$(OBJS)\wxtiff_tif_lzw.obj \
+	$(OBJS)\wxtiff_tif_luv.obj \
+	$(OBJS)\wxtiff_tif_next.obj \
+	$(OBJS)\wxtiff_tif_open.obj \
+	$(OBJS)\wxtiff_tif_packbits.obj \
+	$(OBJS)\wxtiff_tif_pixarlog.obj \
+	$(OBJS)\wxtiff_tif_predict.obj \
+	$(OBJS)\wxtiff_tif_print.obj \
+	$(OBJS)\wxtiff_tif_read.obj \
+	$(OBJS)\wxtiff_tif_swab.obj \
+	$(OBJS)\wxtiff_tif_strip.obj \
+	$(OBJS)\wxtiff_tif_thunder.obj \
+	$(OBJS)\wxtiff_tif_tile.obj \
+	$(OBJS)\wxtiff_tif_version.obj \
+	$(OBJS)\wxtiff_tif_warning.obj \
+	$(OBJS)\wxtiff_tif_write.obj \
+	$(OBJS)\wxtiff_tif_zip.obj
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM $(CFLAGS)
+WXZLIB_OBJECTS =  \
+	$(OBJS)\wxzlib_adler32.obj \
+	$(OBJS)\wxzlib_compress.obj \
+	$(OBJS)\wxzlib_crc32.obj \
+	$(OBJS)\wxzlib_gzio.obj \
+	$(OBJS)\wxzlib_uncompr.obj \
+	$(OBJS)\wxzlib_deflate.obj \
+	$(OBJS)\wxzlib_trees.obj \
+	$(OBJS)\wxzlib_zutil.obj \
+	$(OBJS)\wxzlib_inflate.obj \
+	$(OBJS)\wxzlib_infblock.obj \
+	$(OBJS)\wxzlib_inftrees.obj \
+	$(OBJS)\wxzlib_infcodes.obj \
+	$(OBJS)\wxzlib_infutil.obj \
+	$(OBJS)\wxzlib_inffast.obj
+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 \
+	-DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmldll.csm
+XMLDLL_OBJECTS =  \
+	$(OBJS)\xmldll_dummy.obj \
+	$(OBJS)\xmldll_xml.obj
+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 \
+	$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmllib.csm
+XMLLIB_OBJECTS =  \
+	$(OBJS)\xmllib_dummy.obj \
+	$(OBJS)\xmllib_xml.obj
 
 ### Conditionally set variables: ###
 
@@ -215,7 +864,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"
@@ -227,35 +879,111 @@ 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"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif
 !if "$(BUILD)" == "release"
 __OPTIMIZEFLAG = -O2
 !endif
+<<<<<<< makefile.bcc
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+=======
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS = -tWR
+>>>>>>> 1.8
 !endif
+<<<<<<< makefile.bcc
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+=======
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = 
+>>>>>>> 1.8
 !endif
+<<<<<<< makefile.bcc
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj $(OBJS)\monolib_bitmap.obj $(OBJS)\monolib_brush.obj $(OBJS)\monolib_caret.obj $(OBJS)\monolib_clipbrd.obj $(OBJS)\monolib_colour.obj $(OBJS)\monolib_cursor.obj $(OBJS)\monolib_data.obj $(OBJS)\monolib_dc.obj $(OBJS)\monolib_dcclient.obj $(OBJS)\monolib_dcmemory.obj $(OBJS)\monolib_dcprint.obj $(OBJS)\monolib_dcscreen.obj $(OBJS)\monolib_dialup.obj $(OBJS)\monolib_dib.obj $(OBJS)\monolib_dirdlg.obj $(OBJS)\monolib_display.obj $(OBJS)\monolib_enhmeta.obj $(OBJS)\monolib_evtloop.obj $(OBJS)\monolib_font.obj $(OBJS)\monolib_fontenum.obj $(OBJS)\monolib_fontutil.obj $(OBJS)\monolib_gdiimage.obj $(OBJS)\monolib_gdiobj.obj $(OBJS)\monolib_glcanvas.obj $(OBJS)\monolib_helpchm.obj $(OBJS)\monolib_helpwin.obj $(OBJS)\monolib_icon.obj $(OBJS)\monolib_joystick.obj $(OBJS)\monolib_minifram.obj $(OBJS)\monolib_palette.obj $(OBJS)\monolib_pen.obj $(OBJS)\monolib_popupwin.obj $(OBJS)\monolib_region.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_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 $(OBJS)\monolib_checkbox.obj $(OBJS)\monolib_checklst.obj $(OBJS)\monolib_choice.obj $(OBJS)\monolib_colordlg.obj $(OBJS)\monolib_combobox.obj $(OBJS)\monolib_control.obj $(OBJS)\monolib_dialog.obj $(OBJS)\monolib_dragimag.obj $(OBJS)\monolib_fdrepdlg.obj $(OBJS)\monolib_filedlg.obj $(OBJS)\monolib_fontdlg.obj $(OBJS)\monolib_frame.obj $(OBJS)\monolib_gauge95.obj $(OBJS)\monolib_imaglist.obj $(OBJS)\monolib_iniconf.obj $(OBJS)\monolib_listbox.obj $(OBJS)\monolib_listctrl.obj $(OBJS)\monolib_mdi.obj $(OBJS)\monolib_menu.obj $(OBJS)\monolib_menuitem.obj $(OBJS)\monolib_metafile.obj $(OBJS)\monolib_msgdlg.obj $(OBJS)\monolib_nativdlg.obj $(OBJS)\monolib_notebook.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_scrolbar.obj $(OBJS)\monolib_slider95.obj $(OBJS)\monolib_spinbutt.obj $(OBJS)\monolib_spinctrl.obj $(OBJS)\monolib_statbmp.obj $(OBJS)\monolib_statbox.obj $(OBJS)\monolib_statbr95.obj $(OBJS)\monolib_statline.obj $(OBJS)\monolib_stattext.obj $(OBJS)\monolib_tabctrl.obj $(OBJS)\monolib_tbar95.obj $(OBJS)\monolib_textctrl.obj $(OBJS)\monolib_tglbtn.obj $(OBJS)\monolib_treectrl.obj $(OBJS)\monolib_selstore.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_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.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_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.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 $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.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
+=======
 !if "$(RUNTIME_LIBS)" == "dynamic"
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
 __RUNTIME_LIBS_2 = i
+>>>>>>> 1.8
+=======
+__RUNTIME_LIBS_5 = i
+>>>>>>> 1.18
+=======
+__RUNTIME_LIBS_8 = i
+>>>>>>> 1.30
+!endif
+<<<<<<< makefile.bcc
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj $(OBJS)\monolib_bitmap.obj $(OBJS)\monolib_brush.obj $(OBJS)\monolib_caret.obj $(OBJS)\monolib_clipbrd.obj $(OBJS)\monolib_colour.obj $(OBJS)\monolib_cursor.obj $(OBJS)\monolib_data.obj $(OBJS)\monolib_dc.obj $(OBJS)\monolib_dcclient.obj $(OBJS)\monolib_dcmemory.obj $(OBJS)\monolib_dcprint.obj $(OBJS)\monolib_dcscreen.obj $(OBJS)\monolib_dialup.obj $(OBJS)\monolib_dib.obj $(OBJS)\monolib_dirdlg.obj $(OBJS)\monolib_display.obj $(OBJS)\monolib_enhmeta.obj $(OBJS)\monolib_evtloop.obj $(OBJS)\monolib_font.obj $(OBJS)\monolib_fontenum.obj $(OBJS)\monolib_fontutil.obj $(OBJS)\monolib_gdiimage.obj $(OBJS)\monolib_gdiobj.obj $(OBJS)\monolib_glcanvas.obj $(OBJS)\monolib_helpchm.obj $(OBJS)\monolib_helpwin.obj $(OBJS)\monolib_icon.obj $(OBJS)\monolib_joystick.obj $(OBJS)\monolib_minifram.obj $(OBJS)\monolib_palette.obj $(OBJS)\monolib_pen.obj $(OBJS)\monolib_popupwin.obj $(OBJS)\monolib_region.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_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_bmpbuttn.obj $(OBJS)\monolib_button.obj $(OBJS)\monolib_checkbox.obj $(OBJS)\monolib_checklst.obj $(OBJS)\monolib_choice.obj $(OBJS)\monolib_colschem.obj $(OBJS)\monolib_combobox.obj $(OBJS)\monolib_control.obj $(OBJS)\monolib_dialog.obj $(OBJS)\monolib_framuniv.obj $(OBJS)\monolib_topluniv.obj $(OBJS)\monolib_gauge.obj $(OBJS)\monolib_inpcons.obj $(OBJS)\monolib_inphand.obj $(OBJS)\monolib_listbox.obj $(OBJS)\monolib_menu.obj $(OBJS)\monolib_notebook.obj $(OBJS)\monolib_radiobox.obj $(OBJS)\monolib_radiobut.obj $(OBJS)\monolib_renderer.obj $(OBJS)\monolib_scrarrow.obj $(OBJS)\monolib_scrolbar.obj $(OBJS)\monolib_scrthumb.obj $(OBJS)\monolib_slider.obj $(OBJS)\monolib_spinbutt.obj $(OBJS)\monolib_statbmp.obj $(OBJS)\monolib_statbox.obj $(OBJS)\monolib_statline.obj $(OBJS)\monolib_stattext.obj $(OBJS)\monolib_statusbr.obj $(OBJS)\monolib_toolbar.obj $(OBJS)\monolib_theme.obj $(OBJS)\monolib_winuniv.obj $(OBJS)\monolib_caret.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_selstore.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_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.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_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.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 $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.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
+=======
+__RUNTIME_LIBS_9 = i
+>>>>>>> 1.31
 !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 $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_glcanvas.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.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_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 $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colordlg.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_dragimag.obj $(OBJS)\coredll_fdrepdlg.obj $(OBJS)\coredll_filedlg.obj $(OBJS)\coredll_fontdlg.obj $(OBJS)\coredll_frame.obj $(OBJS)\coredll_gauge95.obj $(OBJS)\coredll_imaglist.obj $(OBJS)\coredll_iniconf.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_listctrl.obj $(OBJS)\coredll_mdi.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_menuitem.obj $(OBJS)\coredll_metafile.obj $(OBJS)\coredll_msgdlg.obj $(OBJS)\coredll_nativdlg.obj $(OBJS)\coredll_notebook.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_scrolbar.obj $(OBJS)\coredll_slider95.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_spinctrl.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statbr95.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_tabctrl.obj $(OBJS)\coredll_tbar95.obj $(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_tglbtn.obj $(OBJS)\coredll_treectrl.obj $(OBJS)\coredll_selstore.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_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.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_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(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 $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.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 $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(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 $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.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
+=======
 !if "$(RUNTIME_LIBS)" == "static"
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
 __RUNTIME_LIBS_2 = 
+>>>>>>> 1.8
+=======
+__RUNTIME_LIBS_5 = 
+>>>>>>> 1.18
+=======
+__RUNTIME_LIBS_8 = 
+>>>>>>> 1.30
+!endif
+<<<<<<< makefile.bcc
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+____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 $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_glcanvas.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.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_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_bmpbuttn.obj $(OBJS)\coredll_button.obj $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj $(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj $(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj $(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj $(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj $(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.obj $(OBJS)\coredll_winuniv.obj $(OBJS)\coredll_caret.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_selstore.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_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.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_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(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 $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.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 $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(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 $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.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
+=======
+__RUNTIME_LIBS_9 = 
+>>>>>>> 1.31
 !endif
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_glcanvas.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.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_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 $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj $(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj $(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj $(OBJS)\corelib_notebook.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_scrolbar.obj $(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj $(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.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_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.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_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(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 $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.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 $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(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 $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.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
+=======
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+<<<<<<< makefile.bcc
+>>>>>>> 1.8
+!endif
+=======
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
@@ -268,10 +996,214 @@ __WXLIBGLDEP_CORE_p = \
 __WXLIB_MONO_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
+>>>>>>> 1.12
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_glcanvas.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.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_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 $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj $(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj $(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj $(OBJS)\monodll_notebook.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_scrolbar.obj $(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj $(OBJS)\monodll_statline.obj $(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_selstore.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_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.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_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.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 $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.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
+=======
+____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_app.obj \
+	$(OBJS)\monolib_bitmap.obj \
+	$(OBJS)\monolib_brush.obj \
+	$(OBJS)\monolib_caret.obj \
+	$(OBJS)\monolib_clipbrd.obj \
+	$(OBJS)\monolib_colour.obj \
+	$(OBJS)\monolib_cursor.obj \
+	$(OBJS)\monolib_data.obj \
+	$(OBJS)\monolib_dc.obj \
+	$(OBJS)\monolib_dcclient.obj \
+	$(OBJS)\monolib_dcmemory.obj \
+	$(OBJS)\monolib_dcprint.obj \
+	$(OBJS)\monolib_dcscreen.obj \
+	$(OBJS)\monolib_dialup.obj \
+	$(OBJS)\monolib_dib.obj \
+	$(OBJS)\monolib_dirdlg.obj \
+	$(OBJS)\monolib_display.obj \
+	$(OBJS)\monolib_enhmeta.obj \
+	$(OBJS)\monolib_evtloop.obj \
+	$(OBJS)\monolib_font.obj \
+	$(OBJS)\monolib_fontenum.obj \
+	$(OBJS)\monolib_fontutil.obj \
+	$(OBJS)\monolib_gdiimage.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_helpchm.obj \
+	$(OBJS)\monolib_helpwin.obj \
+	$(OBJS)\monolib_icon.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_timer.obj \
+	$(OBJS)\monolib_tooltip.obj \
+	$(OBJS)\monolib_toplevel.obj \
+	$(OBJS)\monolib_utilsgui.obj \
+	$(OBJS)\monolib_uxtheme.obj \
+	$(OBJS)\monolib_window.obj \
+	$(OBJS)\monolib_statusbr.obj \
+	$(OBJS)\monolib_accel.obj \
+	$(OBJS)\monolib_bmpbuttn.obj \
+	$(OBJS)\monolib_button.obj \
+	$(OBJS)\monolib_checkbox.obj \
+	$(OBJS)\monolib_checklst.obj \
+	$(OBJS)\monolib_choice.obj \
+	$(OBJS)\monolib_colordlg.obj \
+	$(OBJS)\monolib_combobox.obj \
+	$(OBJS)\monolib_control.obj \
+	$(OBJS)\monolib_dialog.obj \
+	$(OBJS)\monolib_dragimag.obj \
+	$(OBJS)\monolib_fdrepdlg.obj \
+	$(OBJS)\monolib_filedlg.obj \
+	$(OBJS)\monolib_fontdlg.obj \
+	$(OBJS)\monolib_frame.obj \
+	$(OBJS)\monolib_gauge95.obj \
+	$(OBJS)\monolib_imaglist.obj \
+	$(OBJS)\monolib_iniconf.obj \
+	$(OBJS)\monolib_listbox.obj \
+	$(OBJS)\monolib_listctrl.obj \
+	$(OBJS)\monolib_mdi.obj \
+	$(OBJS)\monolib_menu.obj \
+	$(OBJS)\monolib_menuitem.obj \
+	$(OBJS)\monolib_metafile.obj \
+	$(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_scrolbar.obj \
+	$(OBJS)\monolib_slider95.obj \
+	$(OBJS)\monolib_spinbutt.obj \
+	$(OBJS)\monolib_spinctrl.obj \
+	$(OBJS)\monolib_statbmp.obj \
+	$(OBJS)\monolib_statbox.obj \
+	$(OBJS)\monolib_statbr95.obj \
+	$(OBJS)\monolib_statline.obj \
+	$(OBJS)\monolib_stattext.obj \
+	$(OBJS)\monolib_tabctrl.obj \
+	$(OBJS)\monolib_tbar95.obj \
+	$(OBJS)\monolib_textctrl.obj \
+	$(OBJS)\monolib_tglbtn.obj \
+	$(OBJS)\monolib_treectrl.obj \
+	$(OBJS)\monolib_accesscmn.obj \
+	$(OBJS)\monolib_appcmn.obj \
+	$(OBJS)\monolib_artprov.obj \
+	$(OBJS)\monolib_artstd.obj \
+	$(OBJS)\monolib_bmpbase.obj \
+	$(OBJS)\monolib_choiccmn.obj \
+	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_cmdproc.obj \
+	$(OBJS)\monolib_cmndata.obj \
+	$(OBJS)\monolib_containr.obj \
+	$(OBJS)\monolib_cshelp.obj \
+	$(OBJS)\monolib_ctrlcmn.obj \
+	$(OBJS)\monolib_ctrlsub.obj \
+	$(OBJS)\monolib_datacmn.obj \
+	$(OBJS)\monolib_dcbase.obj \
+	$(OBJS)\monolib_dlgcmn.obj \
+	$(OBJS)\monolib_dndcmn.obj \
+	$(OBJS)\monolib_dobjcmn.obj \
+	$(OBJS)\monolib_docmdi.obj \
+	$(OBJS)\monolib_docview.obj \
+	$(OBJS)\monolib_dpycmn.obj \
+	$(OBJS)\monolib_dseldlg.obj \
+	$(OBJS)\monolib_effects.obj \
+	$(OBJS)\monolib_fddlgcmn.obj \
+	$(OBJS)\monolib_fldlgcmn.obj \
+	$(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_framecmn.obj \
+	$(OBJS)\monolib_gaugecmn.obj \
+	$(OBJS)\monolib_gdicmn.obj \
+	$(OBJS)\monolib_geometry.obj \
+	$(OBJS)\monolib_gifdecod.obj \
+	$(OBJS)\monolib_helpbase.obj \
+	$(OBJS)\monolib_iconbndl.obj \
+	$(OBJS)\monolib_imagall.obj \
+	$(OBJS)\monolib_imagbmp.obj \
+	$(OBJS)\monolib_image.obj \
+	$(OBJS)\monolib_imagfill.obj \
+	$(OBJS)\monolib_imaggif.obj \
+	$(OBJS)\monolib_imagiff.obj \
+	$(OBJS)\monolib_imagjpeg.obj \
+	$(OBJS)\monolib_imagpcx.obj \
+	$(OBJS)\monolib_imagpng.obj \
+	$(OBJS)\monolib_imagpnm.obj \
+	$(OBJS)\monolib_imagtiff.obj \
+	$(OBJS)\monolib_imagxpm.obj \
+	$(OBJS)\monolib_layout.obj \
+	$(OBJS)\monolib_lboxcmn.obj \
+	$(OBJS)\monolib_matrix.obj \
+	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_paper.obj \
+	$(OBJS)\monolib_popupcmn.obj \
+	$(OBJS)\monolib_prntbase.obj \
+	$(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiocmn.obj \
+	$(OBJS)\monolib_rendcmn.obj \
+	$(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_settcmn.obj \
+	$(OBJS)\monolib_sizer.obj \
+	$(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 \
+<<<<<<< makefile.bcc
+	$(OBJS)\monolib_xpmdecod.obj
+>>>>>>> 1.24
+=======
+	$(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 \
+<<<<<<< makefile.bcc
+	$(OBJS)\monolib_vscroll.obj \
+	$(OBJS)\monolib_wizard.obj
+>>>>>>> 1.26
+!endif
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+<<<<<<< makefile.bcc
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_glcanvas.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.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_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_bmpbuttn.obj $(OBJS)\monodll_button.obj $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colschem.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_framuniv.obj $(OBJS)\monodll_topluniv.obj $(OBJS)\monodll_gauge.obj $(OBJS)\monodll_inpcons.obj $(OBJS)\monodll_inphand.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_notebook.obj $(OBJS)\monodll_radiobox.obj $(OBJS)\monodll_radiobut.obj $(OBJS)\monodll_renderer.obj $(OBJS)\monodll_scrarrow.obj $(OBJS)\monodll_scrolbar.obj $(OBJS)\monodll_scrthumb.obj $(OBJS)\monodll_slider.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statline.obj $(OBJS)\monodll_stattext.obj $(OBJS)\monodll_statusbr.obj $(OBJS)\monodll_toolbar.obj $(OBJS)\monodll_theme.obj $(OBJS)\monodll_winuniv.obj $(OBJS)\monodll_caret.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_selstore.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_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.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_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.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 $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.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
+=======
 ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_bitmap.obj $(OBJS)\monolib_brush.obj \
 	$(OBJS)\monolib_caret.obj $(OBJS)\monolib_clipbrd.obj \
@@ -314,14 +1246,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_notebook.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_scrolbar.obj \
-	$(OBJS)\monolib_slider95.obj $(OBJS)\monolib_spinbutt.obj \
-	$(OBJS)\monolib_spinctrl.obj $(OBJS)\monolib_statbmp.obj \
-	$(OBJS)\monolib_statbox.obj $(OBJS)\monolib_statbr95.obj \
-	$(OBJS)\monolib_statline.obj $(OBJS)\monolib_stattext.obj \
-	$(OBJS)\monolib_tabctrl.obj $(OBJS)\monolib_tbar95.obj \
-	$(OBJS)\monolib_textctrl.obj $(OBJS)\monolib_tglbtn.obj \
-	$(OBJS)\monolib_treectrl.obj $(OBJS)\monolib_selstore.obj \
+	$(OBJS)\monolib_radiobut.obj $(OBJS)\monolib_renderer.obj \
+	$(OBJS)\monolib_scrolbar.obj $(OBJS)\monolib_slider95.obj \
+	$(OBJS)\monolib_spinbutt.obj $(OBJS)\monolib_spinctrl.obj \
+	$(OBJS)\monolib_statbmp.obj $(OBJS)\monolib_statbox.obj \
+	$(OBJS)\monolib_statbr95.obj $(OBJS)\monolib_statline.obj \
+	$(OBJS)\monolib_stattext.obj $(OBJS)\monolib_tabctrl.obj \
+	$(OBJS)\monolib_tbar95.obj $(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 \
@@ -329,8 +1261,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj \
 	$(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
-	$(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.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 \
@@ -422,57 +1355,57 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.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_selstore.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_laywin.obj $(OBJS)\monolib_logg.obj \
-	$(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
-	$(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_scrlwing.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_artprov.obj \
-	$(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj \
-	$(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj \
-	$(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj \
-	$(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj \
-	$(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj \
-	$(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj \
-	$(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj \
-	$(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj \
-	$(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj \
-	$(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj \
-	$(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.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 \
-	$(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj \
-	$(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj \
-	$(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj \
-	$(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj \
-	$(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj \
-	$(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj \
-	$(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj \
-	$(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj \
-	$(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj \
-	$(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj \
-	$(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj \
-	$(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj \
-	$(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj \
-	$(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj \
-	$(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj \
-	$(OBJS)\monolib_textcmn.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_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_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_artprov.obj $(OBJS)\monolib_artstd.obj \
+	$(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj \
+	$(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj \
+	$(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj \
+	$(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj \
+	$(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj \
+	$(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj \
+	$(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj \
+	$(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj \
+	$(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj \
+	$(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj \
+	$(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj \
+	$(OBJS)\monolib_fontcmn.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 $(OBJS)\monolib_gifdecod.obj \
+	$(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj \
+	$(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj \
+	$(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj \
+	$(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj \
+	$(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj \
+	$(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj \
+	$(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj \
+	$(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj \
+	$(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj \
+	$(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj \
+	$(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj \
+	$(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj \
+	$(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj \
+	$(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.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 \
@@ -517,14 +1450,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_notebook.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_scrolbar.obj \
-	$(OBJS)\coredll_slider95.obj $(OBJS)\coredll_spinbutt.obj \
-	$(OBJS)\coredll_spinctrl.obj $(OBJS)\coredll_statbmp.obj \
-	$(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statbr95.obj \
-	$(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj \
-	$(OBJS)\coredll_tabctrl.obj $(OBJS)\coredll_tbar95.obj \
-	$(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_tglbtn.obj \
-	$(OBJS)\coredll_treectrl.obj $(OBJS)\coredll_selstore.obj \
+	$(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj \
+	$(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_slider95.obj \
+	$(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_spinctrl.obj \
+	$(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj \
+	$(OBJS)\coredll_statbr95.obj $(OBJS)\coredll_statline.obj \
+	$(OBJS)\coredll_stattext.obj $(OBJS)\coredll_tabctrl.obj \
+	$(OBJS)\coredll_tbar95.obj $(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 \
@@ -532,8 +1465,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj \
 	$(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
-	$(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
-	$(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.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 \
@@ -574,415 +1508,1157 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_textcmn.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)\monolib_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-____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 $(OBJS)\coredll_dcmemory.obj \
-	$(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj \
-	$(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj \
-	$(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj \
-	$(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj \
-	$(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj \
-	$(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj \
-	$(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_helpchm.obj \
-	$(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj \
-	$(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj \
-	$(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj \
-	$(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.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_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_bmpbuttn.obj $(OBJS)\coredll_button.obj \
-	$(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj \
-	$(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj \
-	$(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj \
-	$(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj \
-	$(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj \
-	$(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj \
-	$(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj \
-	$(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj \
-	$(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj \
-	$(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj \
-	$(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj \
-	$(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj \
-	$(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj \
-	$(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj \
-	$(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.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_selstore.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_laywin.obj $(OBJS)\coredll_logg.obj \
-	$(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
-	$(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
-	$(OBJS)\coredll_scrlwing.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_artprov.obj \
-	$(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj \
-	$(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj \
-	$(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj \
-	$(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj \
-	$(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 $(OBJS)\coredll_dobjcmn.obj \
-	$(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj \
-	$(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj \
-	$(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj \
-	$(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.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 \
-	$(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj \
-	$(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj \
-	$(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj \
-	$(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj \
-	$(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj \
-	$(OBJS)\coredll_imagpng.obj $(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 \
-	$(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj \
-	$(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj \
-	$(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj \
-	$(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj \
-	$(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj \
-	$(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj \
-	$(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj \
-	$(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj \
-	$(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj \
+>>>>>>> 1.28
+____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_app.obj \
+	$(OBJS)\monolib_bitmap.obj \
+	$(OBJS)\monolib_brush.obj \
+	$(OBJS)\monolib_caret.obj \
+	$(OBJS)\monolib_clipbrd.obj \
+	$(OBJS)\monolib_colour.obj \
+	$(OBJS)\monolib_cursor.obj \
+	$(OBJS)\monolib_data.obj \
+	$(OBJS)\monolib_dc.obj \
+	$(OBJS)\monolib_dcclient.obj \
+	$(OBJS)\monolib_dcmemory.obj \
+	$(OBJS)\monolib_dcprint.obj \
+	$(OBJS)\monolib_dcscreen.obj \
+	$(OBJS)\monolib_dialup.obj \
+	$(OBJS)\monolib_dib.obj \
+	$(OBJS)\monolib_dirdlg.obj \
+	$(OBJS)\monolib_display.obj \
+	$(OBJS)\monolib_enhmeta.obj \
+	$(OBJS)\monolib_evtloop.obj \
+	$(OBJS)\monolib_font.obj \
+	$(OBJS)\monolib_fontenum.obj \
+	$(OBJS)\monolib_fontutil.obj \
+	$(OBJS)\monolib_gdiimage.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_helpchm.obj \
+	$(OBJS)\monolib_helpwin.obj \
+	$(OBJS)\monolib_icon.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_timer.obj \
+	$(OBJS)\monolib_tooltip.obj \
+	$(OBJS)\monolib_toplevel.obj \
+	$(OBJS)\monolib_utilsgui.obj \
+	$(OBJS)\monolib_uxtheme.obj \
+	$(OBJS)\monolib_window.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 \
+	$(OBJS)\monolib_checklst.obj \
+	$(OBJS)\monolib_choice.obj \
+	$(OBJS)\monolib_colschem.obj \
+	$(OBJS)\monolib_combobox.obj \
+	$(OBJS)\monolib_control.obj \
+	$(OBJS)\monolib_ctrlrend.obj \
+	$(OBJS)\monolib_dialog.obj \
+	$(OBJS)\monolib_framuniv.obj \
+	$(OBJS)\monolib_gauge.obj \
+	$(OBJS)\monolib_inpcons.obj \
+	$(OBJS)\monolib_inphand.obj \
+	$(OBJS)\monolib_listbox.obj \
+	$(OBJS)\monolib_menu.obj \
+	$(OBJS)\monolib_notebook.obj \
+	$(OBJS)\monolib_radiobox.obj \
+	$(OBJS)\monolib_radiobut.obj \
+	$(OBJS)\monolib_scrarrow.obj \
+	$(OBJS)\monolib_scrolbar.obj \
+	$(OBJS)\monolib_scrthumb.obj \
+	$(OBJS)\monolib_slider.obj \
+	$(OBJS)\monolib_spinbutt.obj \
+	$(OBJS)\monolib_statbmp.obj \
+	$(OBJS)\monolib_statbox.obj \
+	$(OBJS)\monolib_statline.obj \
+	$(OBJS)\monolib_stattext.obj \
+	$(OBJS)\monolib_statusbr.obj \
+	$(OBJS)\monolib_theme.obj \
+	$(OBJS)\monolib_toolbar.obj \
+	$(OBJS)\monolib_topluniv.obj \
+	$(OBJS)\monolib_winuniv.obj \
+	$(OBJS)\monolib_gtk.obj \
+	$(OBJS)\monolib_metal.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 \
+	$(OBJS)\monolib_choiccmn.obj \
+	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_cmdproc.obj \
+	$(OBJS)\monolib_cmndata.obj \
+	$(OBJS)\monolib_containr.obj \
+	$(OBJS)\monolib_cshelp.obj \
+	$(OBJS)\monolib_ctrlcmn.obj \
+	$(OBJS)\monolib_ctrlsub.obj \
+	$(OBJS)\monolib_datacmn.obj \
+	$(OBJS)\monolib_dcbase.obj \
+	$(OBJS)\monolib_dlgcmn.obj \
+	$(OBJS)\monolib_dndcmn.obj \
+	$(OBJS)\monolib_dobjcmn.obj \
+	$(OBJS)\monolib_docmdi.obj \
+	$(OBJS)\monolib_docview.obj \
+	$(OBJS)\monolib_dpycmn.obj \
+	$(OBJS)\monolib_dseldlg.obj \
+	$(OBJS)\monolib_effects.obj \
+	$(OBJS)\monolib_fddlgcmn.obj \
+	$(OBJS)\monolib_fldlgcmn.obj \
+	$(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_framecmn.obj \
+	$(OBJS)\monolib_gaugecmn.obj \
+	$(OBJS)\monolib_gdicmn.obj \
+	$(OBJS)\monolib_geometry.obj \
+	$(OBJS)\monolib_gifdecod.obj \
+	$(OBJS)\monolib_helpbase.obj \
+	$(OBJS)\monolib_iconbndl.obj \
+	$(OBJS)\monolib_imagall.obj \
+	$(OBJS)\monolib_imagbmp.obj \
+	$(OBJS)\monolib_image.obj \
+	$(OBJS)\monolib_imagfill.obj \
+	$(OBJS)\monolib_imaggif.obj \
+	$(OBJS)\monolib_imagiff.obj \
+	$(OBJS)\monolib_imagjpeg.obj \
+	$(OBJS)\monolib_imagpcx.obj \
+	$(OBJS)\monolib_imagpng.obj \
+	$(OBJS)\monolib_imagpnm.obj \
+	$(OBJS)\monolib_imagtiff.obj \
+	$(OBJS)\monolib_imagxpm.obj \
+	$(OBJS)\monolib_layout.obj \
+	$(OBJS)\monolib_lboxcmn.obj \
+	$(OBJS)\monolib_matrix.obj \
+	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_paper.obj \
+	$(OBJS)\monolib_popupcmn.obj \
+	$(OBJS)\monolib_prntbase.obj \
+	$(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiocmn.obj \
+	$(OBJS)\monolib_rendcmn.obj \
+	$(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_settcmn.obj \
+	$(OBJS)\monolib_sizer.obj \
+	$(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_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 \
+	$(OBJS)\coredll_dcmemory.obj \
+	$(OBJS)\coredll_dcprint.obj \
+	$(OBJS)\coredll_dcscreen.obj \
+	$(OBJS)\coredll_dialup.obj \
+	$(OBJS)\coredll_dib.obj \
+	$(OBJS)\coredll_dirdlg.obj \
+	$(OBJS)\coredll_display.obj \
+	$(OBJS)\coredll_enhmeta.obj \
+	$(OBJS)\coredll_evtloop.obj \
+	$(OBJS)\coredll_font.obj \
+	$(OBJS)\coredll_fontenum.obj \
+	$(OBJS)\coredll_fontutil.obj \
+	$(OBJS)\coredll_gdiimage.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_helpchm.obj \
+	$(OBJS)\coredll_helpwin.obj \
+	$(OBJS)\coredll_icon.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_timer.obj \
+	$(OBJS)\coredll_tooltip.obj \
+	$(OBJS)\coredll_toplevel.obj \
+	$(OBJS)\coredll_utilsgui.obj \
+	$(OBJS)\coredll_uxtheme.obj \
+	$(OBJS)\coredll_window.obj \
+	$(OBJS)\coredll_statusbr.obj \
+	$(OBJS)\coredll_accel.obj \
+	$(OBJS)\coredll_bmpbuttn.obj \
+	$(OBJS)\coredll_button.obj \
+	$(OBJS)\coredll_checkbox.obj \
+	$(OBJS)\coredll_checklst.obj \
+	$(OBJS)\coredll_choice.obj \
+	$(OBJS)\coredll_colordlg.obj \
+	$(OBJS)\coredll_combobox.obj \
+	$(OBJS)\coredll_control.obj \
+	$(OBJS)\coredll_dialog.obj \
+	$(OBJS)\coredll_dragimag.obj \
+	$(OBJS)\coredll_fdrepdlg.obj \
+	$(OBJS)\coredll_filedlg.obj \
+	$(OBJS)\coredll_fontdlg.obj \
+	$(OBJS)\coredll_frame.obj \
+	$(OBJS)\coredll_gauge95.obj \
+	$(OBJS)\coredll_imaglist.obj \
+	$(OBJS)\coredll_iniconf.obj \
+	$(OBJS)\coredll_listbox.obj \
+	$(OBJS)\coredll_listctrl.obj \
+	$(OBJS)\coredll_mdi.obj \
+	$(OBJS)\coredll_menu.obj \
+	$(OBJS)\coredll_menuitem.obj \
+	$(OBJS)\coredll_metafile.obj \
+	$(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_scrolbar.obj \
+	$(OBJS)\coredll_slider95.obj \
+	$(OBJS)\coredll_spinbutt.obj \
+	$(OBJS)\coredll_spinctrl.obj \
+	$(OBJS)\coredll_statbmp.obj \
+	$(OBJS)\coredll_statbox.obj \
+	$(OBJS)\coredll_statbr95.obj \
+	$(OBJS)\coredll_statline.obj \
+	$(OBJS)\coredll_stattext.obj \
+	$(OBJS)\coredll_tabctrl.obj \
+	$(OBJS)\coredll_tbar95.obj \
+	$(OBJS)\coredll_textctrl.obj \
+	$(OBJS)\coredll_tglbtn.obj \
+	$(OBJS)\coredll_treectrl.obj \
+	$(OBJS)\coredll_accesscmn.obj \
+	$(OBJS)\coredll_appcmn.obj \
+	$(OBJS)\coredll_artprov.obj \
+	$(OBJS)\coredll_artstd.obj \
+	$(OBJS)\coredll_bmpbase.obj \
+	$(OBJS)\coredll_choiccmn.obj \
+	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_cmdproc.obj \
+	$(OBJS)\coredll_cmndata.obj \
+	$(OBJS)\coredll_containr.obj \
+	$(OBJS)\coredll_cshelp.obj \
+	$(OBJS)\coredll_ctrlcmn.obj \
+	$(OBJS)\coredll_ctrlsub.obj \
+	$(OBJS)\coredll_datacmn.obj \
+	$(OBJS)\coredll_dcbase.obj \
+	$(OBJS)\coredll_dlgcmn.obj \
+	$(OBJS)\coredll_dndcmn.obj \
+	$(OBJS)\coredll_dobjcmn.obj \
+	$(OBJS)\coredll_docmdi.obj \
+	$(OBJS)\coredll_docview.obj \
+	$(OBJS)\coredll_dpycmn.obj \
+	$(OBJS)\coredll_dseldlg.obj \
+	$(OBJS)\coredll_effects.obj \
+	$(OBJS)\coredll_fddlgcmn.obj \
+	$(OBJS)\coredll_fldlgcmn.obj \
+	$(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_framecmn.obj \
+	$(OBJS)\coredll_gaugecmn.obj \
+	$(OBJS)\coredll_gdicmn.obj \
+	$(OBJS)\coredll_geometry.obj \
+	$(OBJS)\coredll_gifdecod.obj \
+	$(OBJS)\coredll_helpbase.obj \
+	$(OBJS)\coredll_iconbndl.obj \
+	$(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 \
+	$(OBJS)\coredll_imagpcx.obj \
+	$(OBJS)\coredll_imagpng.obj \
+	$(OBJS)\coredll_imagpnm.obj \
+	$(OBJS)\coredll_imagtiff.obj \
+	$(OBJS)\coredll_imagxpm.obj \
+	$(OBJS)\coredll_layout.obj \
+	$(OBJS)\coredll_lboxcmn.obj \
+	$(OBJS)\coredll_matrix.obj \
+	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_paper.obj \
+	$(OBJS)\coredll_popupcmn.obj \
+	$(OBJS)\coredll_prntbase.obj \
+	$(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiocmn.obj \
+	$(OBJS)\coredll_rendcmn.obj \
+	$(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_settcmn.obj \
+	$(OBJS)\coredll_sizer.obj \
+	$(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 \
+<<<<<<< makefile.bcc
+>>>>>>> 1.24
 	$(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 \
+<<<<<<< makefile.bcc
+	$(OBJS)\coredll_vscroll.obj \
+	$(OBJS)\coredll_wizard.obj
+>>>>>>> 1.26
+=======
+	$(OBJS)\coredll_vscroll.obj
+>>>>>>> 1.28
+!endif
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+____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 \
+	$(OBJS)\coredll_dcmemory.obj \
+	$(OBJS)\coredll_dcprint.obj \
+	$(OBJS)\coredll_dcscreen.obj \
+	$(OBJS)\coredll_dialup.obj \
+	$(OBJS)\coredll_dib.obj \
+	$(OBJS)\coredll_dirdlg.obj \
+	$(OBJS)\coredll_display.obj \
+	$(OBJS)\coredll_enhmeta.obj \
+	$(OBJS)\coredll_evtloop.obj \
+	$(OBJS)\coredll_font.obj \
+	$(OBJS)\coredll_fontenum.obj \
+	$(OBJS)\coredll_fontutil.obj \
+	$(OBJS)\coredll_gdiimage.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_helpchm.obj \
+	$(OBJS)\coredll_helpwin.obj \
+	$(OBJS)\coredll_icon.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_timer.obj \
+	$(OBJS)\coredll_tooltip.obj \
+	$(OBJS)\coredll_toplevel.obj \
+	$(OBJS)\coredll_utilsgui.obj \
+	$(OBJS)\coredll_uxtheme.obj \
+	$(OBJS)\coredll_window.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 \
+	$(OBJS)\coredll_checklst.obj \
+	$(OBJS)\coredll_choice.obj \
+	$(OBJS)\coredll_colschem.obj \
+	$(OBJS)\coredll_combobox.obj \
+	$(OBJS)\coredll_control.obj \
+	$(OBJS)\coredll_ctrlrend.obj \
+	$(OBJS)\coredll_dialog.obj \
+	$(OBJS)\coredll_framuniv.obj \
+	$(OBJS)\coredll_gauge.obj \
+	$(OBJS)\coredll_inpcons.obj \
+	$(OBJS)\coredll_inphand.obj \
+	$(OBJS)\coredll_listbox.obj \
+	$(OBJS)\coredll_menu.obj \
+	$(OBJS)\coredll_notebook.obj \
+	$(OBJS)\coredll_radiobox.obj \
+	$(OBJS)\coredll_radiobut.obj \
+	$(OBJS)\coredll_scrarrow.obj \
+	$(OBJS)\coredll_scrolbar.obj \
+	$(OBJS)\coredll_scrthumb.obj \
+	$(OBJS)\coredll_slider.obj \
+	$(OBJS)\coredll_spinbutt.obj \
+	$(OBJS)\coredll_statbmp.obj \
+	$(OBJS)\coredll_statbox.obj \
+	$(OBJS)\coredll_statline.obj \
+	$(OBJS)\coredll_stattext.obj \
+	$(OBJS)\coredll_statusbr.obj \
+	$(OBJS)\coredll_theme.obj \
+	$(OBJS)\coredll_toolbar.obj \
+	$(OBJS)\coredll_topluniv.obj \
+	$(OBJS)\coredll_winuniv.obj \
+	$(OBJS)\coredll_gtk.obj \
+	$(OBJS)\coredll_metal.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 \
+	$(OBJS)\coredll_choiccmn.obj \
+	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_cmdproc.obj \
+	$(OBJS)\coredll_cmndata.obj \
+	$(OBJS)\coredll_containr.obj \
+	$(OBJS)\coredll_cshelp.obj \
+	$(OBJS)\coredll_ctrlcmn.obj \
+	$(OBJS)\coredll_ctrlsub.obj \
+	$(OBJS)\coredll_datacmn.obj \
+	$(OBJS)\coredll_dcbase.obj \
+	$(OBJS)\coredll_dlgcmn.obj \
+	$(OBJS)\coredll_dndcmn.obj \
+	$(OBJS)\coredll_dobjcmn.obj \
+	$(OBJS)\coredll_docmdi.obj \
+	$(OBJS)\coredll_docview.obj \
+	$(OBJS)\coredll_dpycmn.obj \
+	$(OBJS)\coredll_dseldlg.obj \
+	$(OBJS)\coredll_effects.obj \
+	$(OBJS)\coredll_fddlgcmn.obj \
+	$(OBJS)\coredll_fldlgcmn.obj \
+	$(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_framecmn.obj \
+	$(OBJS)\coredll_gaugecmn.obj \
+	$(OBJS)\coredll_gdicmn.obj \
+	$(OBJS)\coredll_geometry.obj \
+	$(OBJS)\coredll_gifdecod.obj \
+	$(OBJS)\coredll_helpbase.obj \
+	$(OBJS)\coredll_iconbndl.obj \
+	$(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 \
+	$(OBJS)\coredll_imagpcx.obj \
+	$(OBJS)\coredll_imagpng.obj \
+	$(OBJS)\coredll_imagpnm.obj \
+	$(OBJS)\coredll_imagtiff.obj \
+	$(OBJS)\coredll_imagxpm.obj \
+	$(OBJS)\coredll_layout.obj \
+	$(OBJS)\coredll_lboxcmn.obj \
+	$(OBJS)\coredll_matrix.obj \
+	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_paper.obj \
+	$(OBJS)\coredll_popupcmn.obj \
+	$(OBJS)\coredll_prntbase.obj \
+	$(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiocmn.obj \
+	$(OBJS)\coredll_rendcmn.obj \
+	$(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_settcmn.obj \
+	$(OBJS)\coredll_sizer.obj \
+	$(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_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 = $(OBJS)\corelib_app.obj \
-	$(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj \
-	$(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj \
-	$(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj \
-	$(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj \
-	$(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj \
-	$(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj \
-	$(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj \
-	$(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj \
-	$(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj \
-	$(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj \
-	$(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj \
-	$(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj \
-	$(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.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_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 $(OBJS)\corelib_checkbox.obj \
-	$(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj \
-	$(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj \
-	$(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj \
-	$(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj \
-	$(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj \
-	$(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj \
-	$(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj \
-	$(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj \
-	$(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj \
-	$(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj \
-	$(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj \
-	$(OBJS)\corelib_notebook.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_scrolbar.obj \
-	$(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj \
-	$(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj \
-	$(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj \
-	$(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj \
-	$(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj \
-	$(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj \
-	$(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.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_laywin.obj $(OBJS)\corelib_logg.obj \
-	$(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
-	$(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
-	$(OBJS)\corelib_scrlwing.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_artprov.obj \
-	$(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
-	$(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
-	$(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
-	$(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 $(OBJS)\corelib_dobjcmn.obj \
-	$(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
-	$(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
-	$(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
-	$(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.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 \
-	$(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
-	$(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
-	$(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
-	$(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
-	$(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
-	$(OBJS)\corelib_imagpng.obj $(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 \
-	$(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
-	$(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
-	$(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
-	$(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
-	$(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
-	$(OBJS)\corelib_textcmn.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
+____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_app.obj \
+	$(OBJS)\corelib_bitmap.obj \
+	$(OBJS)\corelib_brush.obj \
+	$(OBJS)\corelib_caret.obj \
+	$(OBJS)\corelib_clipbrd.obj \
+	$(OBJS)\corelib_colour.obj \
+	$(OBJS)\corelib_cursor.obj \
+	$(OBJS)\corelib_data.obj \
+	$(OBJS)\corelib_dc.obj \
+	$(OBJS)\corelib_dcclient.obj \
+	$(OBJS)\corelib_dcmemory.obj \
+	$(OBJS)\corelib_dcprint.obj \
+	$(OBJS)\corelib_dcscreen.obj \
+	$(OBJS)\corelib_dialup.obj \
+	$(OBJS)\corelib_dib.obj \
+	$(OBJS)\corelib_dirdlg.obj \
+	$(OBJS)\corelib_display.obj \
+	$(OBJS)\corelib_enhmeta.obj \
+	$(OBJS)\corelib_evtloop.obj \
+	$(OBJS)\corelib_font.obj \
+	$(OBJS)\corelib_fontenum.obj \
+	$(OBJS)\corelib_fontutil.obj \
+	$(OBJS)\corelib_gdiimage.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_helpchm.obj \
+	$(OBJS)\corelib_helpwin.obj \
+	$(OBJS)\corelib_icon.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_timer.obj \
+	$(OBJS)\corelib_tooltip.obj \
+	$(OBJS)\corelib_toplevel.obj \
+	$(OBJS)\corelib_utilsgui.obj \
+	$(OBJS)\corelib_uxtheme.obj \
+	$(OBJS)\corelib_window.obj \
+	$(OBJS)\corelib_statusbr.obj \
+	$(OBJS)\corelib_accel.obj \
+	$(OBJS)\corelib_bmpbuttn.obj \
+	$(OBJS)\corelib_button.obj \
+	$(OBJS)\corelib_checkbox.obj \
+	$(OBJS)\corelib_checklst.obj \
+	$(OBJS)\corelib_choice.obj \
+	$(OBJS)\corelib_colordlg.obj \
+	$(OBJS)\corelib_combobox.obj \
+	$(OBJS)\corelib_control.obj \
+	$(OBJS)\corelib_dialog.obj \
+	$(OBJS)\corelib_dragimag.obj \
+	$(OBJS)\corelib_fdrepdlg.obj \
+	$(OBJS)\corelib_filedlg.obj \
+	$(OBJS)\corelib_fontdlg.obj \
+	$(OBJS)\corelib_frame.obj \
+	$(OBJS)\corelib_gauge95.obj \
+	$(OBJS)\corelib_imaglist.obj \
+	$(OBJS)\corelib_iniconf.obj \
+	$(OBJS)\corelib_listbox.obj \
+	$(OBJS)\corelib_listctrl.obj \
+	$(OBJS)\corelib_mdi.obj \
+	$(OBJS)\corelib_menu.obj \
+	$(OBJS)\corelib_menuitem.obj \
+	$(OBJS)\corelib_metafile.obj \
+	$(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_scrolbar.obj \
+	$(OBJS)\corelib_slider95.obj \
+	$(OBJS)\corelib_spinbutt.obj \
+	$(OBJS)\corelib_spinctrl.obj \
+	$(OBJS)\corelib_statbmp.obj \
+	$(OBJS)\corelib_statbox.obj \
+	$(OBJS)\corelib_statbr95.obj \
+	$(OBJS)\corelib_statline.obj \
+	$(OBJS)\corelib_stattext.obj \
+	$(OBJS)\corelib_tabctrl.obj \
+	$(OBJS)\corelib_tbar95.obj \
+	$(OBJS)\corelib_textctrl.obj \
+	$(OBJS)\corelib_tglbtn.obj \
+	$(OBJS)\corelib_treectrl.obj \
+	$(OBJS)\corelib_accesscmn.obj \
+	$(OBJS)\corelib_appcmn.obj \
+	$(OBJS)\corelib_artprov.obj \
+	$(OBJS)\corelib_artstd.obj \
+	$(OBJS)\corelib_bmpbase.obj \
+	$(OBJS)\corelib_choiccmn.obj \
+	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_cmdproc.obj \
+	$(OBJS)\corelib_cmndata.obj \
+	$(OBJS)\corelib_containr.obj \
+	$(OBJS)\corelib_cshelp.obj \
+	$(OBJS)\corelib_ctrlcmn.obj \
+	$(OBJS)\corelib_ctrlsub.obj \
+	$(OBJS)\corelib_datacmn.obj \
+	$(OBJS)\corelib_dcbase.obj \
+	$(OBJS)\corelib_dlgcmn.obj \
+	$(OBJS)\corelib_dndcmn.obj \
+	$(OBJS)\corelib_dobjcmn.obj \
+	$(OBJS)\corelib_docmdi.obj \
+	$(OBJS)\corelib_docview.obj \
+	$(OBJS)\corelib_dpycmn.obj \
+	$(OBJS)\corelib_dseldlg.obj \
+	$(OBJS)\corelib_effects.obj \
+	$(OBJS)\corelib_fddlgcmn.obj \
+	$(OBJS)\corelib_fldlgcmn.obj \
+	$(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_framecmn.obj \
+	$(OBJS)\corelib_gaugecmn.obj \
+	$(OBJS)\corelib_gdicmn.obj \
+	$(OBJS)\corelib_geometry.obj \
+	$(OBJS)\corelib_gifdecod.obj \
+	$(OBJS)\corelib_helpbase.obj \
+	$(OBJS)\corelib_iconbndl.obj \
+	$(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 \
+	$(OBJS)\corelib_imagpcx.obj \
+	$(OBJS)\corelib_imagpng.obj \
+	$(OBJS)\corelib_imagpnm.obj \
+	$(OBJS)\corelib_imagtiff.obj \
+	$(OBJS)\corelib_imagxpm.obj \
+	$(OBJS)\corelib_layout.obj \
+	$(OBJS)\corelib_lboxcmn.obj \
+	$(OBJS)\corelib_matrix.obj \
+	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_paper.obj \
+	$(OBJS)\corelib_popupcmn.obj \
+	$(OBJS)\corelib_prntbase.obj \
+	$(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiocmn.obj \
+	$(OBJS)\corelib_rendcmn.obj \
+	$(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_settcmn.obj \
+	$(OBJS)\corelib_sizer.obj \
+	$(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_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 = $(OBJS)\corelib_app.obj \
-	$(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj \
-	$(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj \
-	$(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj \
-	$(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj \
-	$(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj \
-	$(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj \
-	$(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj \
-	$(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj \
-	$(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj \
-	$(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj \
-	$(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj \
-	$(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj \
-	$(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.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_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_bmpbuttn.obj $(OBJS)\corelib_button.obj \
-	$(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj \
-	$(OBJS)\corelib_choice.obj $(OBJS)\corelib_colschem.obj \
-	$(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj \
-	$(OBJS)\corelib_dialog.obj $(OBJS)\corelib_framuniv.obj \
-	$(OBJS)\corelib_topluniv.obj $(OBJS)\corelib_gauge.obj \
-	$(OBJS)\corelib_inpcons.obj $(OBJS)\corelib_inphand.obj \
-	$(OBJS)\corelib_listbox.obj $(OBJS)\corelib_menu.obj \
-	$(OBJS)\corelib_notebook.obj $(OBJS)\corelib_radiobox.obj \
-	$(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_renderer.obj \
-	$(OBJS)\corelib_scrarrow.obj $(OBJS)\corelib_scrolbar.obj \
-	$(OBJS)\corelib_scrthumb.obj $(OBJS)\corelib_slider.obj \
-	$(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_statbmp.obj \
-	$(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statline.obj \
-	$(OBJS)\corelib_stattext.obj $(OBJS)\corelib_statusbr.obj \
-	$(OBJS)\corelib_toolbar.obj $(OBJS)\corelib_theme.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_selstore.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_laywin.obj $(OBJS)\corelib_logg.obj \
-	$(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
-	$(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
-	$(OBJS)\corelib_scrlwing.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_artprov.obj \
-	$(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
-	$(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
-	$(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
-	$(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 $(OBJS)\corelib_dobjcmn.obj \
-	$(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
-	$(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
-	$(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
-	$(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.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 \
-	$(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
-	$(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
-	$(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
-	$(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
-	$(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
-	$(OBJS)\corelib_imagpng.obj $(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 \
-	$(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
-	$(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
-	$(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
-	$(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
-	$(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
-	$(OBJS)\corelib_textcmn.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
+____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_app.obj \
+	$(OBJS)\corelib_bitmap.obj \
+	$(OBJS)\corelib_brush.obj \
+	$(OBJS)\corelib_caret.obj \
+	$(OBJS)\corelib_clipbrd.obj \
+	$(OBJS)\corelib_colour.obj \
+	$(OBJS)\corelib_cursor.obj \
+	$(OBJS)\corelib_data.obj \
+	$(OBJS)\corelib_dc.obj \
+	$(OBJS)\corelib_dcclient.obj \
+	$(OBJS)\corelib_dcmemory.obj \
+	$(OBJS)\corelib_dcprint.obj \
+	$(OBJS)\corelib_dcscreen.obj \
+	$(OBJS)\corelib_dialup.obj \
+	$(OBJS)\corelib_dib.obj \
+	$(OBJS)\corelib_dirdlg.obj \
+	$(OBJS)\corelib_display.obj \
+	$(OBJS)\corelib_enhmeta.obj \
+	$(OBJS)\corelib_evtloop.obj \
+	$(OBJS)\corelib_font.obj \
+	$(OBJS)\corelib_fontenum.obj \
+	$(OBJS)\corelib_fontutil.obj \
+	$(OBJS)\corelib_gdiimage.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_helpchm.obj \
+	$(OBJS)\corelib_helpwin.obj \
+	$(OBJS)\corelib_icon.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_timer.obj \
+	$(OBJS)\corelib_tooltip.obj \
+	$(OBJS)\corelib_toplevel.obj \
+	$(OBJS)\corelib_utilsgui.obj \
+	$(OBJS)\corelib_uxtheme.obj \
+	$(OBJS)\corelib_window.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 \
+	$(OBJS)\corelib_checklst.obj \
+	$(OBJS)\corelib_choice.obj \
+	$(OBJS)\corelib_colschem.obj \
+	$(OBJS)\corelib_combobox.obj \
+	$(OBJS)\corelib_control.obj \
+	$(OBJS)\corelib_ctrlrend.obj \
+	$(OBJS)\corelib_dialog.obj \
+	$(OBJS)\corelib_framuniv.obj \
+	$(OBJS)\corelib_gauge.obj \
+	$(OBJS)\corelib_inpcons.obj \
+	$(OBJS)\corelib_inphand.obj \
+	$(OBJS)\corelib_listbox.obj \
+	$(OBJS)\corelib_menu.obj \
+	$(OBJS)\corelib_notebook.obj \
+	$(OBJS)\corelib_radiobox.obj \
+	$(OBJS)\corelib_radiobut.obj \
+	$(OBJS)\corelib_scrarrow.obj \
+	$(OBJS)\corelib_scrolbar.obj \
+	$(OBJS)\corelib_scrthumb.obj \
+	$(OBJS)\corelib_slider.obj \
+	$(OBJS)\corelib_spinbutt.obj \
+	$(OBJS)\corelib_statbmp.obj \
+	$(OBJS)\corelib_statbox.obj \
+	$(OBJS)\corelib_statline.obj \
+	$(OBJS)\corelib_stattext.obj \
+	$(OBJS)\corelib_statusbr.obj \
+	$(OBJS)\corelib_theme.obj \
+	$(OBJS)\corelib_toolbar.obj \
+	$(OBJS)\corelib_topluniv.obj \
+	$(OBJS)\corelib_winuniv.obj \
+	$(OBJS)\corelib_gtk.obj \
+	$(OBJS)\corelib_metal.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 \
+	$(OBJS)\corelib_choiccmn.obj \
+	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_cmdproc.obj \
+	$(OBJS)\corelib_cmndata.obj \
+	$(OBJS)\corelib_containr.obj \
+	$(OBJS)\corelib_cshelp.obj \
+	$(OBJS)\corelib_ctrlcmn.obj \
+	$(OBJS)\corelib_ctrlsub.obj \
+	$(OBJS)\corelib_datacmn.obj \
+	$(OBJS)\corelib_dcbase.obj \
+	$(OBJS)\corelib_dlgcmn.obj \
+	$(OBJS)\corelib_dndcmn.obj \
+	$(OBJS)\corelib_dobjcmn.obj \
+	$(OBJS)\corelib_docmdi.obj \
+	$(OBJS)\corelib_docview.obj \
+	$(OBJS)\corelib_dpycmn.obj \
+	$(OBJS)\corelib_dseldlg.obj \
+	$(OBJS)\corelib_effects.obj \
+	$(OBJS)\corelib_fddlgcmn.obj \
+	$(OBJS)\corelib_fldlgcmn.obj \
+	$(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_framecmn.obj \
+	$(OBJS)\corelib_gaugecmn.obj \
+	$(OBJS)\corelib_gdicmn.obj \
+	$(OBJS)\corelib_geometry.obj \
+	$(OBJS)\corelib_gifdecod.obj \
+	$(OBJS)\corelib_helpbase.obj \
+	$(OBJS)\corelib_iconbndl.obj \
+	$(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 \
+	$(OBJS)\corelib_imagpcx.obj \
+	$(OBJS)\corelib_imagpng.obj \
+	$(OBJS)\corelib_imagpnm.obj \
+	$(OBJS)\corelib_imagtiff.obj \
+	$(OBJS)\corelib_imagxpm.obj \
+	$(OBJS)\corelib_layout.obj \
+	$(OBJS)\corelib_lboxcmn.obj \
+	$(OBJS)\corelib_matrix.obj \
+	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_paper.obj \
+	$(OBJS)\corelib_popupcmn.obj \
+	$(OBJS)\corelib_prntbase.obj \
+	$(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiocmn.obj \
+	$(OBJS)\corelib_rendcmn.obj \
+	$(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_settcmn.obj \
+	$(OBJS)\corelib_sizer.obj \
+	$(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_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 = $(OBJS)\monodll_app.obj \
-	$(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj \
-	$(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj \
-	$(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj \
-	$(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj \
-	$(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj \
-	$(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj \
-	$(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj \
-	$(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj \
-	$(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj \
-	$(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj \
-	$(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj \
-	$(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_helpchm.obj \
-	$(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj \
-	$(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj \
-	$(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj \
-	$(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.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_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 $(OBJS)\monodll_checkbox.obj \
-	$(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj \
-	$(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj \
-	$(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj \
-	$(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj \
-	$(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj \
-	$(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj \
-	$(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj \
-	$(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj \
-	$(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj \
-	$(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj \
-	$(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj \
-	$(OBJS)\monodll_notebook.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_scrolbar.obj \
-	$(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj \
-	$(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj \
-	$(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj \
-	$(OBJS)\monodll_statline.obj $(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_selstore.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_laywin.obj $(OBJS)\monodll_logg.obj \
-	$(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
-	$(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_scrlwing.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_accesscmn.obj $(OBJS)\monodll_artprov.obj \
-	$(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
-	$(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
-	$(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
-	$(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
-	$(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
-	$(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
-	$(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
-	$(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
-	$(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
-	$(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.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 \
-	$(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
-	$(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
-	$(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
-	$(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
-	$(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
-	$(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
-	$(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
-	$(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
-	$(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
-	$(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
-	$(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
-	$(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
-	$(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
-	$(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
-	$(OBJS)\monodll_textcmn.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
+____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_app.obj \
+	$(OBJS)\monodll_bitmap.obj \
+	$(OBJS)\monodll_brush.obj \
+	$(OBJS)\monodll_caret.obj \
+	$(OBJS)\monodll_clipbrd.obj \
+	$(OBJS)\monodll_colour.obj \
+	$(OBJS)\monodll_cursor.obj \
+	$(OBJS)\monodll_data.obj \
+	$(OBJS)\monodll_dc.obj \
+	$(OBJS)\monodll_dcclient.obj \
+	$(OBJS)\monodll_dcmemory.obj \
+	$(OBJS)\monodll_dcprint.obj \
+	$(OBJS)\monodll_dcscreen.obj \
+	$(OBJS)\monodll_dialup.obj \
+	$(OBJS)\monodll_dib.obj \
+	$(OBJS)\monodll_dirdlg.obj \
+	$(OBJS)\monodll_display.obj \
+	$(OBJS)\monodll_enhmeta.obj \
+	$(OBJS)\monodll_evtloop.obj \
+	$(OBJS)\monodll_font.obj \
+	$(OBJS)\monodll_fontenum.obj \
+	$(OBJS)\monodll_fontutil.obj \
+	$(OBJS)\monodll_gdiimage.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_helpchm.obj \
+	$(OBJS)\monodll_helpwin.obj \
+	$(OBJS)\monodll_icon.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_timer.obj \
+	$(OBJS)\monodll_tooltip.obj \
+	$(OBJS)\monodll_toplevel.obj \
+	$(OBJS)\monodll_utilsgui.obj \
+	$(OBJS)\monodll_uxtheme.obj \
+	$(OBJS)\monodll_window.obj \
+	$(OBJS)\monodll_statusbr.obj \
+	$(OBJS)\monodll_accel.obj \
+	$(OBJS)\monodll_bmpbuttn.obj \
+	$(OBJS)\monodll_button.obj \
+	$(OBJS)\monodll_checkbox.obj \
+	$(OBJS)\monodll_checklst.obj \
+	$(OBJS)\monodll_choice.obj \
+	$(OBJS)\monodll_colordlg.obj \
+	$(OBJS)\monodll_combobox.obj \
+	$(OBJS)\monodll_control.obj \
+	$(OBJS)\monodll_dialog.obj \
+	$(OBJS)\monodll_dragimag.obj \
+	$(OBJS)\monodll_fdrepdlg.obj \
+	$(OBJS)\monodll_filedlg.obj \
+	$(OBJS)\monodll_fontdlg.obj \
+	$(OBJS)\monodll_frame.obj \
+	$(OBJS)\monodll_gauge95.obj \
+	$(OBJS)\monodll_imaglist.obj \
+	$(OBJS)\monodll_iniconf.obj \
+	$(OBJS)\monodll_listbox.obj \
+	$(OBJS)\monodll_listctrl.obj \
+	$(OBJS)\monodll_mdi.obj \
+	$(OBJS)\monodll_menu.obj \
+	$(OBJS)\monodll_menuitem.obj \
+	$(OBJS)\monodll_metafile.obj \
+	$(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_scrolbar.obj \
+	$(OBJS)\monodll_slider95.obj \
+	$(OBJS)\monodll_spinbutt.obj \
+	$(OBJS)\monodll_spinctrl.obj \
+	$(OBJS)\monodll_statbmp.obj \
+	$(OBJS)\monodll_statbox.obj \
+	$(OBJS)\monodll_statbr95.obj \
+	$(OBJS)\monodll_statline.obj \
+	$(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_accesscmn.obj \
+	$(OBJS)\monodll_appcmn.obj \
+	$(OBJS)\monodll_artprov.obj \
+	$(OBJS)\monodll_artstd.obj \
+	$(OBJS)\monodll_bmpbase.obj \
+	$(OBJS)\monodll_choiccmn.obj \
+	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_cmdproc.obj \
+	$(OBJS)\monodll_cmndata.obj \
+	$(OBJS)\monodll_containr.obj \
+	$(OBJS)\monodll_cshelp.obj \
+	$(OBJS)\monodll_ctrlcmn.obj \
+	$(OBJS)\monodll_ctrlsub.obj \
+	$(OBJS)\monodll_datacmn.obj \
+	$(OBJS)\monodll_dcbase.obj \
+	$(OBJS)\monodll_dlgcmn.obj \
+	$(OBJS)\monodll_dndcmn.obj \
+	$(OBJS)\monodll_dobjcmn.obj \
+	$(OBJS)\monodll_docmdi.obj \
+	$(OBJS)\monodll_docview.obj \
+	$(OBJS)\monodll_dpycmn.obj \
+	$(OBJS)\monodll_dseldlg.obj \
+	$(OBJS)\monodll_effects.obj \
+	$(OBJS)\monodll_fddlgcmn.obj \
+	$(OBJS)\monodll_fldlgcmn.obj \
+	$(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_framecmn.obj \
+	$(OBJS)\monodll_gaugecmn.obj \
+	$(OBJS)\monodll_gdicmn.obj \
+	$(OBJS)\monodll_geometry.obj \
+	$(OBJS)\monodll_gifdecod.obj \
+	$(OBJS)\monodll_helpbase.obj \
+	$(OBJS)\monodll_iconbndl.obj \
+	$(OBJS)\monodll_imagall.obj \
+	$(OBJS)\monodll_imagbmp.obj \
+	$(OBJS)\monodll_image.obj \
+	$(OBJS)\monodll_imagfill.obj \
+	$(OBJS)\monodll_imaggif.obj \
+	$(OBJS)\monodll_imagiff.obj \
+	$(OBJS)\monodll_imagjpeg.obj \
+	$(OBJS)\monodll_imagpcx.obj \
+	$(OBJS)\monodll_imagpng.obj \
+	$(OBJS)\monodll_imagpnm.obj \
+	$(OBJS)\monodll_imagtiff.obj \
+	$(OBJS)\monodll_imagxpm.obj \
+	$(OBJS)\monodll_layout.obj \
+	$(OBJS)\monodll_lboxcmn.obj \
+	$(OBJS)\monodll_matrix.obj \
+	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_paper.obj \
+	$(OBJS)\monodll_popupcmn.obj \
+	$(OBJS)\monodll_prntbase.obj \
+	$(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiocmn.obj \
+	$(OBJS)\monodll_rendcmn.obj \
+	$(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_settcmn.obj \
+	$(OBJS)\monodll_sizer.obj \
+	$(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_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"
+<<<<<<< makefile.bcc
 ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj \
 	$(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj \
 	$(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj \
@@ -1031,60 +2707,94 @@ ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.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_selstore.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_laywin.obj $(OBJS)\monodll_logg.obj \
-	$(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
-	$(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_scrlwing.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_accesscmn.obj $(OBJS)\monodll_artprov.obj \
-	$(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
-	$(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
-	$(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
-	$(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
-	$(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
-	$(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
-	$(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
-	$(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
-	$(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
-	$(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.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 \
-	$(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
-	$(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
-	$(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
-	$(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
-	$(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
-	$(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
-	$(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
-	$(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
-	$(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
-	$(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
-	$(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
-	$(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
-	$(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
-	$(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
-	$(OBJS)\monodll_textcmn.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_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_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_accesscmn.obj \
+	$(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj \
+	$(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj \
+	$(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj \
+	$(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj \
+	$(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj \
+	$(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj \
+	$(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj \
+	$(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj \
+	$(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj \
+	$(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj \
+	$(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj \
+	$(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj \
+	$(OBJS)\monodll_fontcmn.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 $(OBJS)\monodll_gifdecod.obj \
+	$(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj \
+	$(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj \
+	$(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj \
+	$(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj \
+	$(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj \
+	$(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj \
+	$(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj \
+	$(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj \
+	$(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj \
+	$(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj \
+	$(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj \
+	$(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj \
+	$(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj \
+	$(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.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
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
+<<<<<<< makefile.bcc
+	 $(____CORE_SRC_FILENAMES_1_OBJECTS) $(OBJS)\monolib_helpbest.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_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
+!endif
+!if "$(USE_GUI)" == "1"
+____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
+	 $(____CORE_SRC_FILENAMES_OBJECTS) $(OBJS)\monodll_helpbest.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_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
+>>>>>>> 1.8
+!endif
+<<<<<<< makefile.bcc
+!if "$(USE_GUI)" == "1"
+____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = $(____CORE_SRC_FILENAMES_1_OBJECTS) $(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_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_helpbest.obj $(OBJS)\monolib_htmllbox.obj
+=======
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) $(OBJS)\monolib_helpbest.obj \
 	$(OBJS)\monolib_helpdata.obj $(OBJS)\monolib_helpfrm.obj \
 	$(OBJS)\monolib_helpctrl.obj $(OBJS)\monolib_htmlcell.obj \
@@ -1111,46 +2821,426 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = $(____CORE_SRC_FILENAMES_OBJECTS) \
 	$(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
+>>>>>>> 1.9
+=======
+____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_app.obj \
+	$(OBJS)\monodll_bitmap.obj \
+	$(OBJS)\monodll_brush.obj \
+	$(OBJS)\monodll_caret.obj \
+	$(OBJS)\monodll_clipbrd.obj \
+	$(OBJS)\monodll_colour.obj \
+	$(OBJS)\monodll_cursor.obj \
+	$(OBJS)\monodll_data.obj \
+	$(OBJS)\monodll_dc.obj \
+	$(OBJS)\monodll_dcclient.obj \
+	$(OBJS)\monodll_dcmemory.obj \
+	$(OBJS)\monodll_dcprint.obj \
+	$(OBJS)\monodll_dcscreen.obj \
+	$(OBJS)\monodll_dialup.obj \
+	$(OBJS)\monodll_dib.obj \
+	$(OBJS)\monodll_dirdlg.obj \
+	$(OBJS)\monodll_display.obj \
+	$(OBJS)\monodll_enhmeta.obj \
+	$(OBJS)\monodll_evtloop.obj \
+	$(OBJS)\monodll_font.obj \
+	$(OBJS)\monodll_fontenum.obj \
+	$(OBJS)\monodll_fontutil.obj \
+	$(OBJS)\monodll_gdiimage.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_helpchm.obj \
+	$(OBJS)\monodll_helpwin.obj \
+	$(OBJS)\monodll_icon.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_timer.obj \
+	$(OBJS)\monodll_tooltip.obj \
+	$(OBJS)\monodll_toplevel.obj \
+	$(OBJS)\monodll_utilsgui.obj \
+	$(OBJS)\monodll_uxtheme.obj \
+	$(OBJS)\monodll_window.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 \
+	$(OBJS)\monodll_checklst.obj \
+	$(OBJS)\monodll_choice.obj \
+	$(OBJS)\monodll_colschem.obj \
+	$(OBJS)\monodll_combobox.obj \
+	$(OBJS)\monodll_control.obj \
+	$(OBJS)\monodll_ctrlrend.obj \
+	$(OBJS)\monodll_dialog.obj \
+	$(OBJS)\monodll_framuniv.obj \
+	$(OBJS)\monodll_gauge.obj \
+	$(OBJS)\monodll_inpcons.obj \
+	$(OBJS)\monodll_inphand.obj \
+	$(OBJS)\monodll_listbox.obj \
+	$(OBJS)\monodll_menu.obj \
+	$(OBJS)\monodll_notebook.obj \
+	$(OBJS)\monodll_radiobox.obj \
+	$(OBJS)\monodll_radiobut.obj \
+	$(OBJS)\monodll_scrarrow.obj \
+	$(OBJS)\monodll_scrolbar.obj \
+	$(OBJS)\monodll_scrthumb.obj \
+	$(OBJS)\monodll_slider.obj \
+	$(OBJS)\monodll_spinbutt.obj \
+	$(OBJS)\monodll_statbmp.obj \
+	$(OBJS)\monodll_statbox.obj \
+	$(OBJS)\monodll_statline.obj \
+	$(OBJS)\monodll_stattext.obj \
+	$(OBJS)\monodll_statusbr.obj \
+	$(OBJS)\monodll_theme.obj \
+	$(OBJS)\monodll_toolbar.obj \
+	$(OBJS)\monodll_topluniv.obj \
+	$(OBJS)\monodll_winuniv.obj \
+	$(OBJS)\monodll_gtk.obj \
+	$(OBJS)\monodll_metal.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 \
+	$(OBJS)\monodll_choiccmn.obj \
+	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_cmdproc.obj \
+	$(OBJS)\monodll_cmndata.obj \
+	$(OBJS)\monodll_containr.obj \
+	$(OBJS)\monodll_cshelp.obj \
+	$(OBJS)\monodll_ctrlcmn.obj \
+	$(OBJS)\monodll_ctrlsub.obj \
+	$(OBJS)\monodll_datacmn.obj \
+	$(OBJS)\monodll_dcbase.obj \
+	$(OBJS)\monodll_dlgcmn.obj \
+	$(OBJS)\monodll_dndcmn.obj \
+	$(OBJS)\monodll_dobjcmn.obj \
+	$(OBJS)\monodll_docmdi.obj \
+	$(OBJS)\monodll_docview.obj \
+	$(OBJS)\monodll_dpycmn.obj \
+	$(OBJS)\monodll_dseldlg.obj \
+	$(OBJS)\monodll_effects.obj \
+	$(OBJS)\monodll_fddlgcmn.obj \
+	$(OBJS)\monodll_fldlgcmn.obj \
+	$(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_framecmn.obj \
+	$(OBJS)\monodll_gaugecmn.obj \
+	$(OBJS)\monodll_gdicmn.obj \
+	$(OBJS)\monodll_geometry.obj \
+	$(OBJS)\monodll_gifdecod.obj \
+	$(OBJS)\monodll_helpbase.obj \
+	$(OBJS)\monodll_iconbndl.obj \
+	$(OBJS)\monodll_imagall.obj \
+	$(OBJS)\monodll_imagbmp.obj \
+	$(OBJS)\monodll_image.obj \
+	$(OBJS)\monodll_imagfill.obj \
+	$(OBJS)\monodll_imaggif.obj \
+	$(OBJS)\monodll_imagiff.obj \
+	$(OBJS)\monodll_imagjpeg.obj \
+	$(OBJS)\monodll_imagpcx.obj \
+	$(OBJS)\monodll_imagpng.obj \
+	$(OBJS)\monodll_imagpnm.obj \
+	$(OBJS)\monodll_imagtiff.obj \
+	$(OBJS)\monodll_imagxpm.obj \
+	$(OBJS)\monodll_layout.obj \
+	$(OBJS)\monodll_lboxcmn.obj \
+	$(OBJS)\monodll_matrix.obj \
+	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_paper.obj \
+	$(OBJS)\monodll_popupcmn.obj \
+	$(OBJS)\monodll_prntbase.obj \
+	$(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiocmn.obj \
+	$(OBJS)\monodll_rendcmn.obj \
+	$(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_settcmn.obj \
+	$(OBJS)\monodll_sizer.obj \
+	$(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_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_htmlcell.obj \
+	$(OBJS)\monolib_htmlfilt.obj \
+	$(OBJS)\monolib_htmlpars.obj \
+	$(OBJS)\monolib_htmltag.obj \
+	$(OBJS)\monolib_htmlwin.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_pre.obj \
+	$(OBJS)\monolib_m_style.obj \
+	$(OBJS)\monolib_m_tables.obj \
+	$(OBJS)\monolib_winpars.obj \
+<<<<<<< makefile.bcc
+	$(OBJS)\monolib_htmllbox.obj
+>>>>>>> 1.24
+=======
+	$(OBJS)\monolib_htmllbox.obj \
+	$(OBJS)\monolib_db.obj \
+<<<<<<< makefile.bcc
+	$(OBJS)\monolib_dbgrid.obj \
+	$(OBJS)\monolib_dbtable.obj
+>>>>>>> 1.30
+=======
+	$(OBJS)\monolib_dbtable.obj \
+	$(OBJS)\monolib_dbgrid.obj
+>>>>>>> 1.31
+!endif
+!if "$(USE_GUI)" == "1"
+<<<<<<< makefile.bcc
+____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = $(____CORE_SRC_FILENAMES_OBJECTS) $(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_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_helpbest.obj $(OBJS)\monodll_htmllbox.obj
+=======
+____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_htmlcell.obj \
+	$(OBJS)\monodll_htmlfilt.obj \
+	$(OBJS)\monodll_htmlpars.obj \
+	$(OBJS)\monodll_htmltag.obj \
+	$(OBJS)\monodll_htmlwin.obj \
+	$(OBJS)\monodll_htmprint.obj \
+	$(OBJS)\monodll_m_dflist.obj \
+	$(OBJS)\monodll_m_fonts.obj \
+	$(OBJS)\monodll_m_hline.obj \
+	$(OBJS)\monodll_m_image.obj \
+	$(OBJS)\monodll_m_layout.obj \
+	$(OBJS)\monodll_m_links.obj \
+	$(OBJS)\monodll_m_list.obj \
+	$(OBJS)\monodll_m_pre.obj \
+	$(OBJS)\monodll_m_style.obj \
+	$(OBJS)\monodll_m_tables.obj \
+	$(OBJS)\monodll_winpars.obj \
+<<<<<<< makefile.bcc
+	$(OBJS)\monodll_htmllbox.obj
+<<<<<<< makefile.bcc
+>>>>>>> 1.24
+!endif
+=======
+>>>>>>> 1.8
+=======
+=======
+	$(OBJS)\monodll_htmllbox.obj \
+	$(OBJS)\monodll_db.obj \
+<<<<<<< makefile.bcc
+	$(OBJS)\monodll_dbgrid.obj \
+	$(OBJS)\monodll_dbtable.obj
+>>>>>>> 1.30
+=======
+	$(OBJS)\monodll_dbtable.obj \
+	$(OBJS)\monodll_dbgrid.obj
+>>>>>>> 1.31
 !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
+>>>>>>> 1.28
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __baselib___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __coredll___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __corelib___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+	$(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 = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
+!endif
+<<<<<<< makefile.bcc
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+__install_htmldll___depname = install_htmldll
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+__install_htmllib___depname = install_htmllib
+=======
 !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 __gllib___depname = \
+<<<<<<< makefile.bcc
 	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+>>>>>>> 1.9
+=======
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+>>>>>>> 1.24
 !endif
+<<<<<<< makefile.bcc
+!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
+__install_monodll___depname = install_monodll
+=======
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 __htmldll___depname = \
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
 	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll
+>>>>>>> 1.9
+=======
+	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll
+>>>>>>> 1.22
+=======
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll
+>>>>>>> 1.24
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
 __htmllib___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 __monodll___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
 __monolib___depname = \
-	..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+__netdll___depname = \
+	$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
+__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
+!if "$(USE_GUI)" == "1"
+__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+__xmldll___depname = \
+	$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
+__xmllib___depname = \
+	$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 !endif
 
 
@@ -1160,7 +3250,103 @@ $(OBJS):
 
 ### Targets: ###
 
-all: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___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) $**
@@ -1186,12 +3372,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) $**
 
@@ -1243,33 +3423,18 @@ $(OBJS)\basedll_filesys.obj: ..\src\common\filesys.cpp
 $(OBJS)\basedll_fmapbase.obj: ..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_fs_inet.obj: ..\src\common\fs_inet.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_fs_mem.obj: ..\src\common\fs_mem.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_fs_zip.obj: ..\src\common\fs_zip.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_ftp.obj: ..\src\common\ftp.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
-$(OBJS)\basedll_gsocket.obj: ..\src\msw\gsocket.c
-	$(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $**
-
-$(OBJS)\basedll_gsockmsw.obj: ..\src\msw\gsockmsw.c
-	$(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $**
-
 $(OBJS)\basedll_hash.obj: ..\src\common\hash.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_hashmap.obj: ..\src\common\hashmap.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_http.obj: ..\src\common\http.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_init.obj: ..\src\common\init.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -1318,9 +3483,6 @@ $(OBJS)\basedll_object.obj: ..\src\common\object.cpp
 $(OBJS)\basedll_process.obj: ..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_protocol.obj: ..\src\common\protocol.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_regconf.obj: ..\src\msw\regconf.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -1330,24 +3492,9 @@ $(OBJS)\basedll_regex.obj: ..\src\common\regex.cpp
 $(OBJS)\basedll_registry.obj: ..\src\msw\registry.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_sckaddr.obj: ..\src\common\sckaddr.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
-$(OBJS)\basedll_sckfile.obj: ..\src\common\sckfile.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
-$(OBJS)\basedll_sckipc.obj: ..\src\common\sckipc.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
-$(OBJS)\basedll_sckstrm.obj: ..\src\common\sckstrm.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_snglinst.obj: ..\src\msw\snglinst.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_socket.obj: ..\src\common\socket.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_stopwatch.obj: ..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -1381,9 +3528,6 @@ $(OBJS)\basedll_txtstrm.obj: ..\src\common\txtstrm.cpp
 $(OBJS)\basedll_unzip.obj: ..\src\common\unzip.c
 	$(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $**
 
-$(OBJS)\basedll_url.obj: ..\src\common\url.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_utils.obj: ..\src\msw\utils.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -1435,12 +3579,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) $**
 
@@ -1492,33 +3630,18 @@ $(OBJS)\baselib_filesys.obj: ..\src\common\filesys.cpp
 $(OBJS)\baselib_fmapbase.obj: ..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_fs_inet.obj: ..\src\common\fs_inet.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_fs_mem.obj: ..\src\common\fs_mem.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_fs_zip.obj: ..\src\common\fs_zip.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_ftp.obj: ..\src\common\ftp.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
-$(OBJS)\baselib_gsocket.obj: ..\src\msw\gsocket.c
-	$(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $**
-
-$(OBJS)\baselib_gsockmsw.obj: ..\src\msw\gsockmsw.c
-	$(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $**
-
 $(OBJS)\baselib_hash.obj: ..\src\common\hash.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_hashmap.obj: ..\src\common\hashmap.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_http.obj: ..\src\common\http.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_init.obj: ..\src\common\init.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -1567,9 +3690,6 @@ $(OBJS)\baselib_object.obj: ..\src\common\object.cpp
 $(OBJS)\baselib_process.obj: ..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_protocol.obj: ..\src\common\protocol.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_regconf.obj: ..\src\msw\regconf.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -1579,24 +3699,9 @@ $(OBJS)\baselib_regex.obj: ..\src\common\regex.cpp
 $(OBJS)\baselib_registry.obj: ..\src\msw\registry.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_sckaddr.obj: ..\src\common\sckaddr.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
-$(OBJS)\baselib_sckfile.obj: ..\src\common\sckfile.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
-$(OBJS)\baselib_sckipc.obj: ..\src\common\sckipc.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
-$(OBJS)\baselib_sckstrm.obj: ..\src\common\sckstrm.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_snglinst.obj: ..\src\msw\snglinst.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_socket.obj: ..\src\common\socket.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_stopwatch.obj: ..\src\common\stopwatch.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -1630,9 +3735,6 @@ $(OBJS)\baselib_txtstrm.obj: ..\src\common\txtstrm.cpp
 $(OBJS)\baselib_unzip.obj: ..\src\common\unzip.c
 	$(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $**
 
-$(OBJS)\baselib_url.obj: ..\src\common\url.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_utils.obj: ..\src\msw\utils.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -1743,11 +3845,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) $**
@@ -1862,6 +3959,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) $**
@@ -1887,11 +3987,6 @@ $(OBJS)\coredll_dataobj.obj: ..\src\msw\ole\dataobj.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !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) $**
@@ -1902,11 +3997,6 @@ $(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcclient.obj: ..\src\msw\dcclient.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -2151,21 +4241,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) $**
 
@@ -2273,21 +4348,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) $**
@@ -2491,16 +4556,23 @@ $(OBJS)\coredll_region.obj: ..\src\msw\region.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\coredll_renderer.obj: ..\src\univ\renderer.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_rendcmn.obj: ..\src\common\rendcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp
+$(OBJS)\coredll_renderer.obj: ..\src\msw\renderer.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_sashwin.obj: ..\src\generic\sashwin.cpp
+$(OBJS)\coredll_renderg.obj: ..\src\generic\renderg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
@@ -2569,11 +4641,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) $**
@@ -2643,16 +4710,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) $**
 
@@ -2702,11 +4759,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) $**
@@ -2759,8 +4811,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
@@ -2790,11 +4844,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) $**
 
@@ -2811,11 +4860,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) $**
@@ -2904,11 +4948,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) $**
@@ -3023,6 +5062,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) $**
@@ -3048,23 +5090,13 @@ $(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) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(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
+$(OBJS)\corelib_dcbase.obj: ..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
@@ -3312,21 +5344,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) $**
 
@@ -3434,21 +5451,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) $**
@@ -3652,16 +5659,32 @@ $(OBJS)\corelib_region.obj: ..\src\msw\region.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_rendcmn.obj: ..\src\common\rendcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+<<<<<<< makefile.bcc
+!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_rgncmn.obj: ..\src\common\rgncmn.cpp
+>>>>>>> 1.28
+$(OBJS)\corelib_renderer.obj: ..\src\msw\renderer.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_renderg.obj: ..\src\generic\renderg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_sashwin.obj: ..\src\generic\sashwin.cpp
+$(OBJS)\corelib_rgncmn.obj: ..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
@@ -3730,11 +5753,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) $**
@@ -3804,16 +5822,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) $**
 
@@ -3863,11 +5871,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) $**
@@ -3920,8 +5923,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
@@ -3951,11 +5956,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) $**
 
@@ -3972,16 +5972,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 $**
 
@@ -4221,10 +6228,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
@@ -4352,6 +6357,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) $**
@@ -4386,10 +6394,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) $**
@@ -4404,10 +6410,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
@@ -4707,20 +6711,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) $**
@@ -4756,6 +6754,9 @@ $(OBJS)\monodll_helpctrl.obj: ..\src\html\helpctrl.cpp
 $(OBJS)\monodll_helpdata.obj: ..\src\html\helpdata.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_helpext.obj: ..\src\generic\helpext.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_helpfrm.obj: ..\src\html\helpfrm.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4886,20 +6887,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
@@ -5176,19 +7173,29 @@ $(OBJS)\monodll_region.obj: ..\src\msw\region.cpp
 $(OBJS)\monodll_registry.obj: ..\src\msw\registry.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_renderer.obj: ..\src\univ\renderer.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rendcmn.obj: ..\src\common\rendcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp
+$(OBJS)\monodll_renderer.obj: ..\src\msw\renderer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp
+$(OBJS)\monodll_renderg.obj: ..\src\generic\renderg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+$(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_sckaddr.obj: ..\src\common\sckaddr.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5272,10 +7279,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
@@ -5361,15 +7366,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) $**
@@ -5429,10 +7430,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
@@ -5504,8 +7503,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
@@ -5538,10 +7539,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) $**
@@ -5565,14 +7564,15 @@ $(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) $**
 
+$(OBJS)\monodll_xml.obj: ..\src\xml\xml.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5673,10 +7673,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
@@ -5804,6 +7802,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) $**
@@ -5838,10 +7839,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) $**
@@ -5856,10 +7855,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
@@ -6159,20 +8156,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) $**
@@ -6208,6 +8199,9 @@ $(OBJS)\monolib_helpctrl.obj: ..\src\html\helpctrl.cpp
 $(OBJS)\monolib_helpdata.obj: ..\src\html\helpdata.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_helpext.obj: ..\src\generic\helpext.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_helpfrm.obj: ..\src\html\helpfrm.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6338,20 +8332,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
@@ -6628,19 +8618,38 @@ $(OBJS)\monolib_region.obj: ..\src\msw\region.cpp
 $(OBJS)\monolib_registry.obj: ..\src\msw\registry.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rendcmn.obj: ..\src\common\rendcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+<<<<<<< makefile.bcc
+!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_rgncmn.obj: ..\src\common\rgncmn.cpp
+>>>>>>> 1.28
+$(OBJS)\monolib_renderer.obj: ..\src\msw\renderer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp
+$(OBJS)\monolib_renderg.obj: ..\src\generic\renderg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rgncmn.obj: ..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_sckaddr.obj: ..\src\common\sckaddr.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6724,10 +8733,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
@@ -6813,15 +8820,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) $**
@@ -6881,10 +8884,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
@@ -6956,8 +8957,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
@@ -6990,10 +8993,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) $**
@@ -7017,14 +9018,15 @@ $(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) $**
 
+$(OBJS)\monolib_xml.obj: ..\src\xml\xml.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7036,6 +9038,111 @@ $(OBJS)\monolib_zipstrm.obj: ..\src\common\zipstrm.cpp
 $(OBJS)\monolib_zstream.obj: ..\src\common\zstream.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\netdll_dummy.obj: ..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $**
+
+$(OBJS)\netdll_fs_inet.obj: ..\src\common\fs_inet.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_ftp.obj: ..\src\common\ftp.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_gsocket.obj: ..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $**
+
+$(OBJS)\netdll_gsockmsw.obj: ..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $**
+
+$(OBJS)\netdll_http.obj: ..\src\common\http.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_protocol.obj: ..\src\common\protocol.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_sckaddr.obj: ..\src\common\sckaddr.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_sckfile.obj: ..\src\common\sckfile.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_sckipc.obj: ..\src\common\sckipc.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_sckstrm.obj: ..\src\common\sckstrm.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_socket.obj: ..\src\common\socket.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netdll_url.obj: ..\src\common\url.cpp
+	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+
+$(OBJS)\netlib_dummy.obj: ..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) -H $**
+
+$(OBJS)\netlib_fs_inet.obj: ..\src\common\fs_inet.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_ftp.obj: ..\src\common\ftp.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_gsocket.obj: ..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $**
+
+$(OBJS)\netlib_gsockmsw.obj: ..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $**
+
+$(OBJS)\netlib_http.obj: ..\src\common\http.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_protocol.obj: ..\src\common\protocol.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_sckaddr.obj: ..\src\common\sckaddr.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_sckfile.obj: ..\src\common\sckfile.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_sckipc.obj: ..\src\common\sckipc.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_sckstrm.obj: ..\src\common\sckstrm.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp
+	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+
+$(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) $**
+
+$(OBJS)\wxexpat_xmlrole.obj: ..\src\expat\lib\xmlrole.c
+	$(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $**
+
+$(OBJS)\wxexpat_xmltok.obj: ..\src\expat\lib\xmltok.c
+	$(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $**
+
 $(OBJS)\wxjpeg_jcapimin.obj: ..\src\jpeg\jcapimin.c
 	$(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) $**
 
@@ -7378,150 +9485,285 @@ $(OBJS)\wxzlib_uncompr.obj: ..\src\zlib\uncompr.c
 $(OBJS)\wxzlib_zutil.obj: ..\src\zlib\zutil.c
 	$(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $**
 
+$(OBJS)\xmldll_dummy.obj: ..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $**
+
+$(OBJS)\xmldll_xml.obj: ..\src\xml\xml.cpp
+	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $**
+
+$(OBJS)\xmllib_dummy.obj: ..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) -H $**
+
+$(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 $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(ADVLIB_OBJECTS)
+|
+!endif
+
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\basedll_dummy.obj $(OBJS)\basedll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\basedll_appbase.obj $(OBJS)\basedll_clntdata.obj $(OBJS)\basedll_cmdline.obj $(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 $(OBJS)\basedll_dynload.obj $(OBJS)\basedll_encconv.obj $(OBJS)\basedll_extended.obj $(OBJS)\basedll_ffile.obj $(OBJS)\basedll_file.obj $(OBJS)\basedll_fileconf.obj $(OBJS)\basedll_filefn.obj $(OBJS)\basedll_filename.obj $(OBJS)\basedll_filesys.obj $(OBJS)\basedll_fmapbase.obj $(OBJS)\basedll_fs_inet.obj $(OBJS)\basedll_fs_zip.obj $(OBJS)\basedll_ftp.obj $(OBJS)\basedll_hash.obj $(OBJS)\basedll_hashmap.obj $(OBJS)\basedll_http.obj $(OBJS)\basedll_init.obj $(OBJS)\basedll_intl.obj $(OBJS)\basedll_ipcbase.obj $(OBJS)\basedll_list.obj $(OBJS)\basedll_log.obj $(OBJS)\basedll_longlong.obj $(OBJS)\basedll_memory.obj $(OBJS)\basedll_mimecmn.obj $(OBJS)\basedll_module.obj $(OBJS)\basedll_mstream.obj $(OBJS)\basedll_object.obj $(OBJS)\basedll_process.obj $(OBJS)\basedll_protocol.obj $(OBJS)\basedll_regex.obj $(OBJS)\basedll_sckaddr.obj $(OBJS)\basedll_sckfile.obj $(OBJS)\basedll_sckipc.obj $(OBJS)\basedll_sckstrm.obj $(OBJS)\basedll_socket.obj $(OBJS)\basedll_stopwatch.obj $(OBJS)\basedll_strconv.obj $(OBJS)\basedll_stream.obj $(OBJS)\basedll_string.obj $(OBJS)\basedll_sysopt.obj $(OBJS)\basedll_textbuf.obj $(OBJS)\basedll_textfile.obj $(OBJS)\basedll_tokenzr.obj $(OBJS)\basedll_txtstrm.obj $(OBJS)\basedll_unzip.obj $(OBJS)\basedll_url.obj $(OBJS)\basedll_variant.obj $(OBJS)\basedll_wfstream.obj $(OBJS)\basedll_wxchar.obj $(OBJS)\basedll_zipstrm.obj $(OBJS)\basedll_zstream.obj $(OBJS)\basedll_gsocket.obj $(OBJS)\basedll_gsockmsw.obj $(OBJS)\basedll_basemsw.obj $(OBJS)\basedll_dde.obj $(OBJS)\basedll_dir.obj $(OBJS)\basedll_mimetype.obj $(OBJS)\basedll_regconf.obj $(OBJS)\basedll_registry.obj $(OBJS)\basedll_snglinst.obj $(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 $(OBJS)\basedll_utilscmn.obj $(OBJS)\basedll_main.obj $(OBJS)\basedll_mslu.obj $(OBJS)\basedll_volume.obj
-	ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG)  -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\basedll_dummy.obj $(OBJS)\basedll_appbase.obj $(OBJS)\basedll_clntdata.obj $(OBJS)\basedll_cmdline.obj $(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 $(OBJS)\basedll_dynload.obj $(OBJS)\basedll_encconv.obj $(OBJS)\basedll_extended.obj $(OBJS)\basedll_ffile.obj $(OBJS)\basedll_file.obj $(OBJS)\basedll_fileconf.obj $(OBJS)\basedll_filefn.obj $(OBJS)\basedll_filename.obj $(OBJS)\basedll_filesys.obj $(OBJS)\basedll_fmapbase.obj $(OBJS)\basedll_fs_inet.obj $(OBJS)\basedll_fs_zip.obj $(OBJS)\basedll_ftp.obj $(OBJS)\basedll_hash.obj $(OBJS)\basedll_hashmap.obj $(OBJS)\basedll_http.obj $(OBJS)\basedll_init.obj $(OBJS)\basedll_intl.obj $(OBJS)\basedll_ipcbase.obj $(OBJS)\basedll_list.obj $(OBJS)\basedll_log.obj $(OBJS)\basedll_longlong.obj $(OBJS)\basedll_memory.obj $(OBJS)\basedll_mimecmn.obj $(OBJS)\basedll_module.obj $(OBJS)\basedll_mstream.obj $(OBJS)\basedll_object.obj $(OBJS)\basedll_process.obj $(OBJS)\basedll_protocol.obj $(OBJS)\basedll_regex.obj $(OBJS)\basedll_sckaddr.obj $(OBJS)\basedll_sckfile.obj $(OBJS)\basedll_sckipc.obj $(OBJS)\basedll_sckstrm.obj $(OBJS)\basedll_socket.obj $(OBJS)\basedll_stopwatch.obj $(OBJS)\basedll_strconv.obj $(OBJS)\basedll_stream.obj $(OBJS)\basedll_string.obj $(OBJS)\basedll_sysopt.obj $(OBJS)\basedll_textbuf.obj $(OBJS)\basedll_textfile.obj $(OBJS)\basedll_tokenzr.obj $(OBJS)\basedll_txtstrm.obj $(OBJS)\basedll_unzip.obj $(OBJS)\basedll_url.obj $(OBJS)\basedll_variant.obj $(OBJS)\basedll_wfstream.obj $(OBJS)\basedll_wxchar.obj $(OBJS)\basedll_zipstrm.obj $(OBJS)\basedll_zstream.obj $(OBJS)\basedll_gsocket.obj $(OBJS)\basedll_gsockmsw.obj $(OBJS)\basedll_basemsw.obj $(OBJS)\basedll_dde.obj $(OBJS)\basedll_dir.obj $(OBJS)\basedll_mimetype.obj $(OBJS)\basedll_regconf.obj $(OBJS)\basedll_registry.obj $(OBJS)\basedll_snglinst.obj $(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 $(OBJS)\basedll_utilscmn.obj $(OBJS)\basedll_main.obj $(OBJS)\basedll_mslu.obj $(OBJS)\basedll_volume.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_2).lib,,
+$(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) $(__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 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
+	implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\baselib_dummy.obj $(OBJS)\baselib_dummy.obj $(OBJS)\baselib_appbase.obj $(OBJS)\baselib_clntdata.obj $(OBJS)\baselib_cmdline.obj $(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 $(OBJS)\baselib_dynload.obj $(OBJS)\baselib_encconv.obj $(OBJS)\baselib_extended.obj $(OBJS)\baselib_ffile.obj $(OBJS)\baselib_file.obj $(OBJS)\baselib_fileconf.obj $(OBJS)\baselib_filefn.obj $(OBJS)\baselib_filename.obj $(OBJS)\baselib_filesys.obj $(OBJS)\baselib_fmapbase.obj $(OBJS)\baselib_fs_inet.obj $(OBJS)\baselib_fs_zip.obj $(OBJS)\baselib_ftp.obj $(OBJS)\baselib_hash.obj $(OBJS)\baselib_hashmap.obj $(OBJS)\baselib_http.obj $(OBJS)\baselib_init.obj $(OBJS)\baselib_intl.obj $(OBJS)\baselib_ipcbase.obj $(OBJS)\baselib_list.obj $(OBJS)\baselib_log.obj $(OBJS)\baselib_longlong.obj $(OBJS)\baselib_memory.obj $(OBJS)\baselib_mimecmn.obj $(OBJS)\baselib_module.obj $(OBJS)\baselib_mstream.obj $(OBJS)\baselib_object.obj $(OBJS)\baselib_process.obj $(OBJS)\baselib_protocol.obj $(OBJS)\baselib_regex.obj $(OBJS)\baselib_sckaddr.obj $(OBJS)\baselib_sckfile.obj $(OBJS)\baselib_sckipc.obj $(OBJS)\baselib_sckstrm.obj $(OBJS)\baselib_socket.obj $(OBJS)\baselib_stopwatch.obj $(OBJS)\baselib_strconv.obj $(OBJS)\baselib_stream.obj $(OBJS)\baselib_string.obj $(OBJS)\baselib_sysopt.obj $(OBJS)\baselib_textbuf.obj $(OBJS)\baselib_textfile.obj $(OBJS)\baselib_tokenzr.obj $(OBJS)\baselib_txtstrm.obj $(OBJS)\baselib_unzip.obj $(OBJS)\baselib_url.obj $(OBJS)\baselib_variant.obj $(OBJS)\baselib_wfstream.obj $(OBJS)\baselib_wxchar.obj $(OBJS)\baselib_zipstrm.obj $(OBJS)\baselib_zstream.obj $(OBJS)\baselib_gsocket.obj $(OBJS)\baselib_gsockmsw.obj $(OBJS)\baselib_basemsw.obj $(OBJS)\baselib_dde.obj $(OBJS)\baselib_dir.obj $(OBJS)\baselib_mimetype.obj $(OBJS)\baselib_regconf.obj $(OBJS)\baselib_registry.obj $(OBJS)\baselib_snglinst.obj $(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 $(OBJS)\baselib_utilscmn.obj $(OBJS)\baselib_main.obj $(OBJS)\baselib_mslu.obj $(OBJS)\baselib_volume.obj
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\baselib_dummy.obj $(OBJS)\baselib_appbase.obj $(OBJS)\baselib_clntdata.obj $(OBJS)\baselib_cmdline.obj $(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 $(OBJS)\baselib_dynload.obj $(OBJS)\baselib_encconv.obj $(OBJS)\baselib_extended.obj $(OBJS)\baselib_ffile.obj $(OBJS)\baselib_file.obj $(OBJS)\baselib_fileconf.obj $(OBJS)\baselib_filefn.obj $(OBJS)\baselib_filename.obj $(OBJS)\baselib_filesys.obj $(OBJS)\baselib_fmapbase.obj $(OBJS)\baselib_fs_inet.obj $(OBJS)\baselib_fs_zip.obj $(OBJS)\baselib_ftp.obj $(OBJS)\baselib_hash.obj $(OBJS)\baselib_hashmap.obj $(OBJS)\baselib_http.obj $(OBJS)\baselib_init.obj $(OBJS)\baselib_intl.obj $(OBJS)\baselib_ipcbase.obj $(OBJS)\baselib_list.obj $(OBJS)\baselib_log.obj $(OBJS)\baselib_longlong.obj $(OBJS)\baselib_memory.obj $(OBJS)\baselib_mimecmn.obj $(OBJS)\baselib_module.obj $(OBJS)\baselib_mstream.obj $(OBJS)\baselib_object.obj $(OBJS)\baselib_process.obj $(OBJS)\baselib_protocol.obj $(OBJS)\baselib_regex.obj $(OBJS)\baselib_sckaddr.obj $(OBJS)\baselib_sckfile.obj $(OBJS)\baselib_sckipc.obj $(OBJS)\baselib_sckstrm.obj $(OBJS)\baselib_socket.obj $(OBJS)\baselib_stopwatch.obj $(OBJS)\baselib_strconv.obj $(OBJS)\baselib_stream.obj $(OBJS)\baselib_string.obj $(OBJS)\baselib_sysopt.obj $(OBJS)\baselib_textbuf.obj $(OBJS)\baselib_textfile.obj $(OBJS)\baselib_tokenzr.obj $(OBJS)\baselib_txtstrm.obj $(OBJS)\baselib_unzip.obj $(OBJS)\baselib_url.obj $(OBJS)\baselib_variant.obj $(OBJS)\baselib_wfstream.obj $(OBJS)\baselib_wxchar.obj $(OBJS)\baselib_zipstrm.obj $(OBJS)\baselib_zstream.obj $(OBJS)\baselib_gsocket.obj $(OBJS)\baselib_gsockmsw.obj $(OBJS)\baselib_basemsw.obj $(OBJS)\baselib_dde.obj $(OBJS)\baselib_dir.obj $(OBJS)\baselib_mimetype.obj $(OBJS)\baselib_regconf.obj $(OBJS)\baselib_registry.obj $(OBJS)\baselib_snglinst.obj $(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 $(OBJS)\baselib_utilscmn.obj $(OBJS)\baselib_main.obj $(OBJS)\baselib_mslu.obj $(OBJS)\baselib_volume.obj
+	tlib /a /p2048 $@ @&&|
+	$(BASELIB_OBJECTS)
 |
 !endif
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
-	-if exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+	-if exist $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	-if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+	-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
+	-if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\coredll_dummy.obj $(OBJS)\coredll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\coredll_event.obj $(OBJS)\coredll_fs_mem.obj $(OBJS)\coredll_msgout.obj $(OBJS)\coredll_utilscmn.obj $(OBJS)\coredll_main.obj $(OBJS)\coredll_mslu.obj $(OBJS)\coredll_volume.obj $(____CORE_SRC_FILENAMES_2_OBJECTS) $(__basedll___depname)
-	ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG)  -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\coredll_dummy.obj $(OBJS)\coredll_event.obj $(OBJS)\coredll_fs_mem.obj $(OBJS)\coredll_msgout.obj $(OBJS)\coredll_utilscmn.obj $(OBJS)\coredll_main.obj $(OBJS)\coredll_mslu.obj $(OBJS)\coredll_volume.obj $(____CORE_SRC_FILENAMES_2_OBJECTS),$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_2).lib,,
+$(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) $(__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 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\corelib_dummy.obj $(OBJS)\corelib_dummy.obj $(OBJS)\corelib_event.obj $(OBJS)\corelib_fs_mem.obj $(OBJS)\corelib_msgout.obj $(OBJS)\corelib_utilscmn.obj $(OBJS)\corelib_main.obj $(OBJS)\corelib_mslu.obj $(OBJS)\corelib_volume.obj $(____CORE_SRC_FILENAMES_3_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(CORELIB_OBJECTS)
+|
+!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 $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\corelib_dummy.obj $(OBJS)\corelib_event.obj $(OBJS)\corelib_fs_mem.obj $(OBJS)\corelib_msgout.obj $(OBJS)\corelib_utilscmn.obj $(OBJS)\corelib_main.obj $(OBJS)\corelib_mslu.obj $(OBJS)\corelib_volume.obj $(____CORE_SRC_FILENAMES_3_OBJECTS)
+	tlib /a /p2048 $@ @&&|
+	$(DBGRIDLIB_OBJECTS)
 |
 !endif
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\gldll_dummy.obj $(OBJS)\gldll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\gldll_glcanvas.obj
-	ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG)  -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\gldll_dummy.obj $(OBJS)\gldll_glcanvas.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_2).lib,,
+$(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) $(__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 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
 !endif
 
 !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\gllib_dummy.obj $(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj
+	tlib /a /p2048 $@ @&&|
+	$(GLLIB_OBJECTS)
 |
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\htmldll_dummy.obj $(OBJS)\htmldll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\htmldll_helpbest.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_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_htmllbox.obj $(__coredll___depname) $(__basedll___depname)
-	ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG)  -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\htmldll_dummy.obj $(OBJS)\htmldll_helpbest.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_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_htmllbox.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_2).lib,,
+$(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) $(__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 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_helpbest.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_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_htmllbox.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_helpbest.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_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_htmllbox.obj
+	tlib /a /p2048 $@ @&&|
+	$(HTMLLIB_OBJECTS)
 |
 !endif
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG): 
-	if not exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) mkdir ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+$(LIBDIRNAME): 
+	if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-	if not exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx mkdir ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx
+$(LIBDIRNAME)\wx: $(LIBDIRNAME)
+	if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\monodll_dummy.obj $(OBJS)\monodll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\monodll_appbase.obj $(OBJS)\monodll_clntdata.obj $(OBJS)\monodll_cmdline.obj $(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 $(OBJS)\monodll_dynload.obj $(OBJS)\monodll_encconv.obj $(OBJS)\monodll_extended.obj $(OBJS)\monodll_ffile.obj $(OBJS)\monodll_file.obj $(OBJS)\monodll_fileconf.obj $(OBJS)\monodll_filefn.obj $(OBJS)\monodll_filename.obj $(OBJS)\monodll_filesys.obj $(OBJS)\monodll_fmapbase.obj $(OBJS)\monodll_fs_inet.obj $(OBJS)\monodll_fs_zip.obj $(OBJS)\monodll_ftp.obj $(OBJS)\monodll_hash.obj $(OBJS)\monodll_hashmap.obj $(OBJS)\monodll_http.obj $(OBJS)\monodll_init.obj $(OBJS)\monodll_intl.obj $(OBJS)\monodll_ipcbase.obj $(OBJS)\monodll_list.obj $(OBJS)\monodll_log.obj $(OBJS)\monodll_longlong.obj $(OBJS)\monodll_memory.obj $(OBJS)\monodll_mimecmn.obj $(OBJS)\monodll_module.obj $(OBJS)\monodll_mstream.obj $(OBJS)\monodll_object.obj $(OBJS)\monodll_process.obj $(OBJS)\monodll_protocol.obj $(OBJS)\monodll_regex.obj $(OBJS)\monodll_sckaddr.obj $(OBJS)\monodll_sckfile.obj $(OBJS)\monodll_sckipc.obj $(OBJS)\monodll_sckstrm.obj $(OBJS)\monodll_socket.obj $(OBJS)\monodll_stopwatch.obj $(OBJS)\monodll_strconv.obj $(OBJS)\monodll_stream.obj $(OBJS)\monodll_string.obj $(OBJS)\monodll_sysopt.obj $(OBJS)\monodll_textbuf.obj $(OBJS)\monodll_textfile.obj $(OBJS)\monodll_tokenzr.obj $(OBJS)\monodll_txtstrm.obj $(OBJS)\monodll_unzip.obj $(OBJS)\monodll_url.obj $(OBJS)\monodll_variant.obj $(OBJS)\monodll_wfstream.obj $(OBJS)\monodll_wxchar.obj $(OBJS)\monodll_zipstrm.obj $(OBJS)\monodll_zstream.obj $(OBJS)\monodll_gsocket.obj $(OBJS)\monodll_gsockmsw.obj $(OBJS)\monodll_basemsw.obj $(OBJS)\monodll_dde.obj $(OBJS)\monodll_dir.obj $(OBJS)\monodll_mimetype.obj $(OBJS)\monodll_regconf.obj $(OBJS)\monodll_registry.obj $(OBJS)\monodll_snglinst.obj $(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 $(OBJS)\monodll_utilscmn.obj $(OBJS)\monodll_main.obj $(OBJS)\monodll_mslu.obj $(OBJS)\monodll_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS)
-	ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG)  -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\monodll_dummy.obj $(OBJS)\monodll_appbase.obj $(OBJS)\monodll_clntdata.obj $(OBJS)\monodll_cmdline.obj $(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 $(OBJS)\monodll_dynload.obj $(OBJS)\monodll_encconv.obj $(OBJS)\monodll_extended.obj $(OBJS)\monodll_ffile.obj $(OBJS)\monodll_file.obj $(OBJS)\monodll_fileconf.obj $(OBJS)\monodll_filefn.obj $(OBJS)\monodll_filename.obj $(OBJS)\monodll_filesys.obj $(OBJS)\monodll_fmapbase.obj $(OBJS)\monodll_fs_inet.obj $(OBJS)\monodll_fs_zip.obj $(OBJS)\monodll_ftp.obj $(OBJS)\monodll_hash.obj $(OBJS)\monodll_hashmap.obj $(OBJS)\monodll_http.obj $(OBJS)\monodll_init.obj $(OBJS)\monodll_intl.obj $(OBJS)\monodll_ipcbase.obj $(OBJS)\monodll_list.obj $(OBJS)\monodll_log.obj $(OBJS)\monodll_longlong.obj $(OBJS)\monodll_memory.obj $(OBJS)\monodll_mimecmn.obj $(OBJS)\monodll_module.obj $(OBJS)\monodll_mstream.obj $(OBJS)\monodll_object.obj $(OBJS)\monodll_process.obj $(OBJS)\monodll_protocol.obj $(OBJS)\monodll_regex.obj $(OBJS)\monodll_sckaddr.obj $(OBJS)\monodll_sckfile.obj $(OBJS)\monodll_sckipc.obj $(OBJS)\monodll_sckstrm.obj $(OBJS)\monodll_socket.obj $(OBJS)\monodll_stopwatch.obj $(OBJS)\monodll_strconv.obj $(OBJS)\monodll_stream.obj $(OBJS)\monodll_string.obj $(OBJS)\monodll_sysopt.obj $(OBJS)\monodll_textbuf.obj $(OBJS)\monodll_textfile.obj $(OBJS)\monodll_tokenzr.obj $(OBJS)\monodll_txtstrm.obj $(OBJS)\monodll_unzip.obj $(OBJS)\monodll_url.obj $(OBJS)\monodll_variant.obj $(OBJS)\monodll_wfstream.obj $(OBJS)\monodll_wxchar.obj $(OBJS)\monodll_zipstrm.obj $(OBJS)\monodll_zstream.obj $(OBJS)\monodll_gsocket.obj $(OBJS)\monodll_gsockmsw.obj $(OBJS)\monodll_basemsw.obj $(OBJS)\monodll_dde.obj $(OBJS)\monodll_dir.obj $(OBJS)\monodll_mimetype.obj $(OBJS)\monodll_regconf.obj $(OBJS)\monodll_registry.obj $(OBJS)\monodll_snglinst.obj $(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 $(OBJS)\monodll_utilscmn.obj $(OBJS)\monodll_main.obj $(OBJS)\monodll_mslu.obj $(OBJS)\monodll_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS),$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_2).lib,,
+$(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) $(__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 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\monolib_dummy.obj $(OBJS)\monolib_dummy.obj $(OBJS)\monolib_appbase.obj $(OBJS)\monolib_clntdata.obj $(OBJS)\monolib_cmdline.obj $(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 $(OBJS)\monolib_dynload.obj $(OBJS)\monolib_encconv.obj $(OBJS)\monolib_extended.obj $(OBJS)\monolib_ffile.obj $(OBJS)\monolib_file.obj $(OBJS)\monolib_fileconf.obj $(OBJS)\monolib_filefn.obj $(OBJS)\monolib_filename.obj $(OBJS)\monolib_filesys.obj $(OBJS)\monolib_fmapbase.obj $(OBJS)\monolib_fs_inet.obj $(OBJS)\monolib_fs_zip.obj $(OBJS)\monolib_ftp.obj $(OBJS)\monolib_hash.obj $(OBJS)\monolib_hashmap.obj $(OBJS)\monolib_http.obj $(OBJS)\monolib_init.obj $(OBJS)\monolib_intl.obj $(OBJS)\monolib_ipcbase.obj $(OBJS)\monolib_list.obj $(OBJS)\monolib_log.obj $(OBJS)\monolib_longlong.obj $(OBJS)\monolib_memory.obj $(OBJS)\monolib_mimecmn.obj $(OBJS)\monolib_module.obj $(OBJS)\monolib_mstream.obj $(OBJS)\monolib_object.obj $(OBJS)\monolib_process.obj $(OBJS)\monolib_protocol.obj $(OBJS)\monolib_regex.obj $(OBJS)\monolib_sckaddr.obj $(OBJS)\monolib_sckfile.obj $(OBJS)\monolib_sckipc.obj $(OBJS)\monolib_sckstrm.obj $(OBJS)\monolib_socket.obj $(OBJS)\monolib_stopwatch.obj $(OBJS)\monolib_strconv.obj $(OBJS)\monolib_stream.obj $(OBJS)\monolib_string.obj $(OBJS)\monolib_sysopt.obj $(OBJS)\monolib_textbuf.obj $(OBJS)\monolib_textfile.obj $(OBJS)\monolib_tokenzr.obj $(OBJS)\monolib_txtstrm.obj $(OBJS)\monolib_unzip.obj $(OBJS)\monolib_url.obj $(OBJS)\monolib_variant.obj $(OBJS)\monolib_wfstream.obj $(OBJS)\monolib_wxchar.obj $(OBJS)\monolib_zipstrm.obj $(OBJS)\monolib_zstream.obj $(OBJS)\monolib_gsocket.obj $(OBJS)\monolib_gsockmsw.obj $(OBJS)\monolib_basemsw.obj $(OBJS)\monolib_dde.obj $(OBJS)\monolib_dir.obj $(OBJS)\monolib_mimetype.obj $(OBJS)\monolib_regconf.obj $(OBJS)\monolib_registry.obj $(OBJS)\monolib_snglinst.obj $(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 $(OBJS)\monolib_utilscmn.obj $(OBJS)\monolib_main.obj $(OBJS)\monolib_mslu.obj $(OBJS)\monolib_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\monolib_dummy.obj $(OBJS)\monolib_appbase.obj $(OBJS)\monolib_clntdata.obj $(OBJS)\monolib_cmdline.obj $(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 $(OBJS)\monolib_dynload.obj $(OBJS)\monolib_encconv.obj $(OBJS)\monolib_extended.obj $(OBJS)\monolib_ffile.obj $(OBJS)\monolib_file.obj $(OBJS)\monolib_fileconf.obj $(OBJS)\monolib_filefn.obj $(OBJS)\monolib_filename.obj $(OBJS)\monolib_filesys.obj $(OBJS)\monolib_fmapbase.obj $(OBJS)\monolib_fs_inet.obj $(OBJS)\monolib_fs_zip.obj $(OBJS)\monolib_ftp.obj $(OBJS)\monolib_hash.obj $(OBJS)\monolib_hashmap.obj $(OBJS)\monolib_http.obj $(OBJS)\monolib_init.obj $(OBJS)\monolib_intl.obj $(OBJS)\monolib_ipcbase.obj $(OBJS)\monolib_list.obj $(OBJS)\monolib_log.obj $(OBJS)\monolib_longlong.obj $(OBJS)\monolib_memory.obj $(OBJS)\monolib_mimecmn.obj $(OBJS)\monolib_module.obj $(OBJS)\monolib_mstream.obj $(OBJS)\monolib_object.obj $(OBJS)\monolib_process.obj $(OBJS)\monolib_protocol.obj $(OBJS)\monolib_regex.obj $(OBJS)\monolib_sckaddr.obj $(OBJS)\monolib_sckfile.obj $(OBJS)\monolib_sckipc.obj $(OBJS)\monolib_sckstrm.obj $(OBJS)\monolib_socket.obj $(OBJS)\monolib_stopwatch.obj $(OBJS)\monolib_strconv.obj $(OBJS)\monolib_stream.obj $(OBJS)\monolib_string.obj $(OBJS)\monolib_sysopt.obj $(OBJS)\monolib_textbuf.obj $(OBJS)\monolib_textfile.obj $(OBJS)\monolib_tokenzr.obj $(OBJS)\monolib_txtstrm.obj $(OBJS)\monolib_unzip.obj $(OBJS)\monolib_url.obj $(OBJS)\monolib_variant.obj $(OBJS)\monolib_wfstream.obj $(OBJS)\monolib_wxchar.obj $(OBJS)\monolib_zipstrm.obj $(OBJS)\monolib_zstream.obj $(OBJS)\monolib_gsocket.obj $(OBJS)\monolib_gsockmsw.obj $(OBJS)\monolib_basemsw.obj $(OBJS)\monolib_dde.obj $(OBJS)\monolib_dir.obj $(OBJS)\monolib_mimetype.obj $(OBJS)\monolib_regconf.obj $(OBJS)\monolib_registry.obj $(OBJS)\monolib_snglinst.obj $(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 $(OBJS)\monolib_utilscmn.obj $(OBJS)\monolib_main.obj $(OBJS)\monolib_mslu.obj $(OBJS)\monolib_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS)
+	tlib /a /p2048 $@ @&&|
+	$(MONOLIB_OBJECTS)
 |
 !endif
 
 ..\include\wx\msw\setup.h: 
 	if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h
+<<<<<<< makefile.bcc
+=======
+
+!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) $(__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
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h: ..\include\wx\msw\setup.h ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(NETLIB_OBJECTS)
+|
+!endif
+>>>>>>> 1.24
+
+<<<<<<< makefile.bcc
+<<<<<<< makefile.bcc
+..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h: 
 	if not exist ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h copy ..\include\wx\msw\setup.h ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h
 
-setup_h: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h
+setup_h: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx ..\include\wx\msw\setup.h ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h
+
+..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxexpat$(WXDEBUGFLAG).lib: $(OBJS)\wxexpat_xmlparse.obj $(OBJS)\wxexpat_xmlrole.obj $(OBJS)\wxexpat_xmltok.obj
+=======
+=======
+!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 $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(ODBCLIB_OBJECTS)
+|
+!endif
+
+>>>>>>> 1.30
+$(LIBDIRNAME)\wx\setup.h: 
+	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
+
+setup_h: $(LIBDIRNAME)\wx ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
+
+$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
+>>>>>>> 1.24
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(WXEXPAT_OBJECTS)
+|
+
+!if "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
+	if exist $@ del $@
+	tlib /a /p2048 $@ @&&|
+	$(WXJPEG_OBJECTS)
+|
+!endif
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxjpeg_jcomapi.obj $(OBJS)\wxjpeg_jutils.obj $(OBJS)\wxjpeg_jerror.obj $(OBJS)\wxjpeg_jmemmgr.obj $(OBJS)\wxjpeg_jmemnobs.obj $(OBJS)\wxjpeg_jcapimin.obj $(OBJS)\wxjpeg_jcapistd.obj $(OBJS)\wxjpeg_jctrans.obj $(OBJS)\wxjpeg_jcparam.obj $(OBJS)\wxjpeg_jdatadst.obj $(OBJS)\wxjpeg_jcinit.obj $(OBJS)\wxjpeg_jcmaster.obj $(OBJS)\wxjpeg_jcmarker.obj $(OBJS)\wxjpeg_jcmainct.obj $(OBJS)\wxjpeg_jcprepct.obj $(OBJS)\wxjpeg_jccoefct.obj $(OBJS)\wxjpeg_jccolor.obj $(OBJS)\wxjpeg_jcsample.obj $(OBJS)\wxjpeg_jchuff.obj $(OBJS)\wxjpeg_jcphuff.obj $(OBJS)\wxjpeg_jcdctmgr.obj $(OBJS)\wxjpeg_jfdctfst.obj $(OBJS)\wxjpeg_jfdctflt.obj $(OBJS)\wxjpeg_jfdctint.obj $(OBJS)\wxjpeg_jdapimin.obj $(OBJS)\wxjpeg_jdapistd.obj $(OBJS)\wxjpeg_jdtrans.obj $(OBJS)\wxjpeg_jdatasrc.obj $(OBJS)\wxjpeg_jdmaster.obj $(OBJS)\wxjpeg_jdinput.obj $(OBJS)\wxjpeg_jdmarker.obj $(OBJS)\wxjpeg_jdhuff.obj $(OBJS)\wxjpeg_jdphuff.obj $(OBJS)\wxjpeg_jdmainct.obj $(OBJS)\wxjpeg_jdcoefct.obj $(OBJS)\wxjpeg_jdpostct.obj $(OBJS)\wxjpeg_jddctmgr.obj $(OBJS)\wxjpeg_jidctfst.obj $(OBJS)\wxjpeg_jidctflt.obj $(OBJS)\wxjpeg_jidctint.obj $(OBJS)\wxjpeg_jidctred.obj $(OBJS)\wxjpeg_jdsample.obj $(OBJS)\wxjpeg_jdcolor.obj $(OBJS)\wxjpeg_jquant1.obj $(OBJS)\wxjpeg_jquant2.obj $(OBJS)\wxjpeg_jdmerge.obj
+!if "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\wxjpeg_jcomapi.obj $(OBJS)\wxjpeg_jutils.obj $(OBJS)\wxjpeg_jerror.obj $(OBJS)\wxjpeg_jmemmgr.obj $(OBJS)\wxjpeg_jmemnobs.obj $(OBJS)\wxjpeg_jcapimin.obj $(OBJS)\wxjpeg_jcapistd.obj $(OBJS)\wxjpeg_jctrans.obj $(OBJS)\wxjpeg_jcparam.obj $(OBJS)\wxjpeg_jdatadst.obj $(OBJS)\wxjpeg_jcinit.obj $(OBJS)\wxjpeg_jcmaster.obj $(OBJS)\wxjpeg_jcmarker.obj $(OBJS)\wxjpeg_jcmainct.obj $(OBJS)\wxjpeg_jcprepct.obj $(OBJS)\wxjpeg_jccoefct.obj $(OBJS)\wxjpeg_jccolor.obj $(OBJS)\wxjpeg_jcsample.obj $(OBJS)\wxjpeg_jchuff.obj $(OBJS)\wxjpeg_jcphuff.obj $(OBJS)\wxjpeg_jcdctmgr.obj $(OBJS)\wxjpeg_jfdctfst.obj $(OBJS)\wxjpeg_jfdctflt.obj $(OBJS)\wxjpeg_jfdctint.obj $(OBJS)\wxjpeg_jdapimin.obj $(OBJS)\wxjpeg_jdapistd.obj $(OBJS)\wxjpeg_jdtrans.obj $(OBJS)\wxjpeg_jdatasrc.obj $(OBJS)\wxjpeg_jdmaster.obj $(OBJS)\wxjpeg_jdinput.obj $(OBJS)\wxjpeg_jdmarker.obj $(OBJS)\wxjpeg_jdhuff.obj $(OBJS)\wxjpeg_jdphuff.obj $(OBJS)\wxjpeg_jdmainct.obj $(OBJS)\wxjpeg_jdcoefct.obj $(OBJS)\wxjpeg_jdpostct.obj $(OBJS)\wxjpeg_jddctmgr.obj $(OBJS)\wxjpeg_jidctfst.obj $(OBJS)\wxjpeg_jidctflt.obj $(OBJS)\wxjpeg_jidctint.obj $(OBJS)\wxjpeg_jidctred.obj $(OBJS)\wxjpeg_jdsample.obj $(OBJS)\wxjpeg_jdcolor.obj $(OBJS)\wxjpeg_jquant1.obj $(OBJS)\wxjpeg_jquant2.obj $(OBJS)\wxjpeg_jdmerge.obj
+	tlib /a /p2048 $@ @&&|
+	$(WXPNG_OBJECTS)
 |
+!endif
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxpng_png.obj $(OBJS)\wxpng_pngerror.obj $(OBJS)\wxpng_pnggccrd.obj $(OBJS)\wxpng_pngget.obj $(OBJS)\wxpng_pngmem.obj $(OBJS)\wxpng_pngpread.obj $(OBJS)\wxpng_pngread.obj $(OBJS)\wxpng_pngrio.obj $(OBJS)\wxpng_pngrtran.obj $(OBJS)\wxpng_pngrutil.obj $(OBJS)\wxpng_pngset.obj $(OBJS)\wxpng_pngtrans.obj $(OBJS)\wxpng_pngvcrd.obj $(OBJS)\wxpng_pngwio.obj $(OBJS)\wxpng_pngwrite.obj $(OBJS)\wxpng_pngwtran.obj $(OBJS)\wxpng_pngwutil.obj
+$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\wxpng_png.obj $(OBJS)\wxpng_pngerror.obj $(OBJS)\wxpng_pnggccrd.obj $(OBJS)\wxpng_pngget.obj $(OBJS)\wxpng_pngmem.obj $(OBJS)\wxpng_pngpread.obj $(OBJS)\wxpng_pngread.obj $(OBJS)\wxpng_pngrio.obj $(OBJS)\wxpng_pngrtran.obj $(OBJS)\wxpng_pngrutil.obj $(OBJS)\wxpng_pngset.obj $(OBJS)\wxpng_pngtrans.obj $(OBJS)\wxpng_pngvcrd.obj $(OBJS)\wxpng_pngwio.obj $(OBJS)\wxpng_pngwrite.obj $(OBJS)\wxpng_pngwtran.obj $(OBJS)\wxpng_pngwutil.obj
+	tlib /a /p2048 $@ @&&|
+	$(WXREGEX_OBJECTS)
 |
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxregex_regcomp.obj $(OBJS)\wxregex_regexec.obj $(OBJS)\wxregex_regerror.obj $(OBJS)\wxregex_regfree.obj
+!if "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS)
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\wxregex_regcomp.obj $(OBJS)\wxregex_regexec.obj $(OBJS)\wxregex_regerror.obj $(OBJS)\wxregex_regfree.obj
+	tlib /a /p2048 $@ @&&|
+	$(WXTIFF_OBJECTS)
 |
+!endif
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxtiff_tif_win32.obj $(OBJS)\wxtiff_tif_aux.obj $(OBJS)\wxtiff_tif_close.obj $(OBJS)\wxtiff_tif_codec.obj $(OBJS)\wxtiff_tif_compress.obj $(OBJS)\wxtiff_tif_dir.obj $(OBJS)\wxtiff_tif_dirinfo.obj $(OBJS)\wxtiff_tif_dirread.obj $(OBJS)\wxtiff_tif_dirwrite.obj $(OBJS)\wxtiff_tif_dumpmode.obj $(OBJS)\wxtiff_tif_error.obj $(OBJS)\wxtiff_tif_fax3.obj $(OBJS)\wxtiff_tif_fax3sm.obj $(OBJS)\wxtiff_tif_getimage.obj $(OBJS)\wxtiff_tif_jpeg.obj $(OBJS)\wxtiff_tif_flush.obj $(OBJS)\wxtiff_tif_lzw.obj $(OBJS)\wxtiff_tif_luv.obj $(OBJS)\wxtiff_tif_next.obj $(OBJS)\wxtiff_tif_open.obj $(OBJS)\wxtiff_tif_packbits.obj $(OBJS)\wxtiff_tif_pixarlog.obj $(OBJS)\wxtiff_tif_predict.obj $(OBJS)\wxtiff_tif_print.obj $(OBJS)\wxtiff_tif_read.obj $(OBJS)\wxtiff_tif_swab.obj $(OBJS)\wxtiff_tif_strip.obj $(OBJS)\wxtiff_tif_thunder.obj $(OBJS)\wxtiff_tif_tile.obj $(OBJS)\wxtiff_tif_version.obj $(OBJS)\wxtiff_tif_warning.obj $(OBJS)\wxtiff_tif_write.obj $(OBJS)\wxtiff_tif_zip.obj
+$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\wxtiff_tif_win32.obj $(OBJS)\wxtiff_tif_aux.obj $(OBJS)\wxtiff_tif_close.obj $(OBJS)\wxtiff_tif_codec.obj $(OBJS)\wxtiff_tif_compress.obj $(OBJS)\wxtiff_tif_dir.obj $(OBJS)\wxtiff_tif_dirinfo.obj $(OBJS)\wxtiff_tif_dirread.obj $(OBJS)\wxtiff_tif_dirwrite.obj $(OBJS)\wxtiff_tif_dumpmode.obj $(OBJS)\wxtiff_tif_error.obj $(OBJS)\wxtiff_tif_fax3.obj $(OBJS)\wxtiff_tif_fax3sm.obj $(OBJS)\wxtiff_tif_getimage.obj $(OBJS)\wxtiff_tif_jpeg.obj $(OBJS)\wxtiff_tif_flush.obj $(OBJS)\wxtiff_tif_lzw.obj $(OBJS)\wxtiff_tif_luv.obj $(OBJS)\wxtiff_tif_next.obj $(OBJS)\wxtiff_tif_open.obj $(OBJS)\wxtiff_tif_packbits.obj $(OBJS)\wxtiff_tif_pixarlog.obj $(OBJS)\wxtiff_tif_predict.obj $(OBJS)\wxtiff_tif_print.obj $(OBJS)\wxtiff_tif_read.obj $(OBJS)\wxtiff_tif_swab.obj $(OBJS)\wxtiff_tif_strip.obj $(OBJS)\wxtiff_tif_thunder.obj $(OBJS)\wxtiff_tif_tile.obj $(OBJS)\wxtiff_tif_version.obj $(OBJS)\wxtiff_tif_warning.obj $(OBJS)\wxtiff_tif_write.obj $(OBJS)\wxtiff_tif_zip.obj
+	tlib /a /p2048 $@ @&&|
+	$(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) $(__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
 
-..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxzlib_adler32.obj $(OBJS)\wxzlib_compress.obj $(OBJS)\wxzlib_crc32.obj $(OBJS)\wxzlib_gzio.obj $(OBJS)\wxzlib_uncompr.obj $(OBJS)\wxzlib_deflate.obj $(OBJS)\wxzlib_trees.obj $(OBJS)\wxzlib_zutil.obj $(OBJS)\wxzlib_inflate.obj $(OBJS)\wxzlib_infblock.obj $(OBJS)\wxzlib_inftrees.obj $(OBJS)\wxzlib_infcodes.obj $(OBJS)\wxzlib_infutil.obj $(OBJS)\wxzlib_inffast.obj
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 	if exist $@ del $@
-	tlib /a $@ @&&|
-	$(OBJS)\wxzlib_adler32.obj $(OBJS)\wxzlib_compress.obj $(OBJS)\wxzlib_crc32.obj $(OBJS)\wxzlib_gzio.obj $(OBJS)\wxzlib_uncompr.obj $(OBJS)\wxzlib_deflate.obj $(OBJS)\wxzlib_trees.obj $(OBJS)\wxzlib_zutil.obj $(OBJS)\wxzlib_inflate.obj $(OBJS)\wxzlib_infblock.obj $(OBJS)\wxzlib_inftrees.obj $(OBJS)\wxzlib_infcodes.obj $(OBJS)\wxzlib_infutil.obj $(OBJS)\wxzlib_inffast.obj
+	tlib /a /p2048 $@ @&&|
+	$(XMLLIB_OBJECTS)
 |
+!endif