]> git.saurik.com Git - wxWidgets.git/blobdiff - build/makefile.bcc
More wxMac compilation fixes.
[wxWidgets.git] / build / makefile.bcc
index 0b566248c1675ffb308e3f3abbed71f40c99eb1c..9c3c6138fab3cc2edc4ac832916c34ad31d77d1c 100644 (file)
 BCCDIR = $(MAKEDIR)\..
 !endif
 
+<<<<<<< makefile.bcc
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = release
+!endif
+# C compiler 
+!ifndef CC
+CC = bcc32
+!endif
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+!ifndef CFG
+CFG = 
+!endif
+# Standard flags for CC 
+!ifndef CFLAGS
+CFLAGS = 
+!endif
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include
+!endif
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
+!endif
+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = -L"D:\Borland C++ 5.5\Lib"
+!endif
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 1
+!endif
+# Is this official build by wxWindows developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0
+!endif
+# Version of C runtime library to use. You can change this to
+#                static if SHARED=0, but it is highly recommended to not do
+#                it if SHARED=1 unless you know what you are doing. [dynamic,static]
+!ifndef RUNTIME_LIBS
+RUNTIME_LIBS = dynamic
+!endif
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 1
+!endif
+# Compile Unicode build of wxWindows? [0,1]
+!ifndef UNICODE
+UNICODE = 0
+!endif
+# Build GUI libraries? [0,1]
+!ifndef USE_GUI
+USE_GUI = 1
+!endif
+# Build wxHTML library (USE_GUI must be 1)? [0,1]
+!ifndef USE_HTML
+USE_HTML = 1
+!endif
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+!ifndef USE_OPENGL
+USE_OPENGL = 1
+!endif
+# Use this to name your customized DLLs differently 
+!ifndef VENDOR
+VENDOR = custom
+!endif
+# Build wxUniversal instead of native port? [0,1]
+!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: ###
 
 ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
@@ -27,7 +118,6 @@ ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advdll.csm
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
-       $(OBJS)\advdll_dbgrid.obj \
        $(OBJS)\advdll_calctrl.obj \
        $(OBJS)\advdll_dcbuffer.obj \
        $(OBJS)\advdll_grid.obj \
@@ -38,7 +128,11 @@ ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_sashwin.obj \
        $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_tipdlg.obj \
-       $(OBJS)\advdll_wizard.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 \
@@ -46,7 +140,6 @@ ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advlib.csm
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
-       $(OBJS)\advlib_dbgrid.obj \
        $(OBJS)\advlib_calctrl.obj \
        $(OBJS)\advlib_dcbuffer.obj \
        $(OBJS)\advlib_grid.obj \
@@ -57,7 +150,11 @@ ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_sashwin.obj \
        $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_tipdlg.obj \
-       $(OBJS)\advlib_wizard.obj
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_wave.obj
 BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
@@ -77,8 +174,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \
        $(OBJS)\basedll_datstrm.obj \
-       $(OBJS)\basedll_db.obj \
-       $(OBJS)\basedll_dbtable.obj \
        $(OBJS)\basedll_dircmn.obj \
        $(OBJS)\basedll_dynarray.obj \
        $(OBJS)\basedll_dynlib.obj \
@@ -159,8 +254,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \
        $(OBJS)\baselib_datstrm.obj \
-       $(OBJS)\baselib_db.obj \
-       $(OBJS)\baselib_dbtable.obj \
        $(OBJS)\baselib_dircmn.obj \
        $(OBJS)\baselib_dynarray.obj \
        $(OBJS)\baselib_dynlib.obj \
@@ -254,6 +347,23 @@ CORELIB_OBJECTS =  \
        $(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$(LIBDIRNAME) -I..\src\tiff \
@@ -349,8 +459,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \
        $(OBJS)\monodll_datstrm.obj \
-       $(OBJS)\monodll_db.obj \
-       $(OBJS)\monodll_dbtable.obj \
        $(OBJS)\monodll_dircmn.obj \
        $(OBJS)\monodll_dynarray.obj \
        $(OBJS)\monodll_dynlib.obj \
@@ -445,8 +553,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \
        $(OBJS)\monolib_datstrm.obj \
-       $(OBJS)\monolib_db.obj \
-       $(OBJS)\monolib_dbtable.obj \
        $(OBJS)\monolib_dircmn.obj \
        $(OBJS)\monolib_dynarray.obj \
        $(OBJS)\monolib_dynlib.obj \
@@ -573,6 +679,25 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+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 =  \
@@ -787,20 +912,78 @@ __OPTIMIZEFLAG = -Od
 !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
@@ -813,12 +996,16 @@ __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_taskbarcmn.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
@@ -846,7 +1033,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpchm.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_icon.obj \
-       $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_dataobj.obj \
@@ -858,13 +1044,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
+       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_toplevel.obj \
        $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_wave.obj \
+       $(OBJS)\monolib_uxtheme.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_accel.obj \
@@ -901,7 +1087,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_slider95.obj \
        $(OBJS)\monolib_spinbutt.obj \
@@ -916,7 +1101,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
-       $(OBJS)\monolib_uxtheme.obj \
        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_appcmn.obj \
        $(OBJS)\monolib_artprov.obj \
@@ -987,6 +1171,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(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 \
@@ -1007,11 +1195,326 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(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 \
+       $(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_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_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 \
+       $(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)" == "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_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_mdig.obj \
+       $(OBJS)\monolib_imaglist.obj $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_listctrl.obj $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_accel.obj $(OBJS)\monolib_msgdlgg.obj \
+       $(OBJS)\monolib_fdrepdlg.obj $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_tabg.obj $(OBJS)\monolib_gtk.obj $(OBJS)\monolib_win32.obj \
+       $(OBJS)\monolib_metal.obj $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_calctrl.obj $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcbuffer.obj $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_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 \
+       $(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_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_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 \
+       $(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_renderg.obj \
+       $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj \
+       $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_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)\monolib_vscroll.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+>>>>>>> 1.28
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
-       $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
@@ -1039,7 +1542,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpchm.obj \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_icon.obj \
-       $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_dataobj.obj \
@@ -1051,13 +1553,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
+       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
-       $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_toplevel.obj \
        $(OBJS)\monolib_utilsgui.obj \
-       $(OBJS)\monolib_wave.obj \
+       $(OBJS)\monolib_uxtheme.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_accel.obj \
@@ -1080,6 +1582,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_colschem.obj \
        $(OBJS)\monolib_combobox.obj \
        $(OBJS)\monolib_control.obj \
+       $(OBJS)\monolib_ctrlrend.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \
        $(OBJS)\monolib_gauge.obj \
@@ -1090,7 +1593,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_scrthumb.obj \
@@ -1202,7 +1704,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
-       $(OBJS)\coredll_taskbarcmn.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
@@ -1230,7 +1731,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpchm.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_icon.obj \
-       $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_dataobj.obj \
@@ -1242,13 +1742,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
+       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_toplevel.obj \
        $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_wave.obj \
+       $(OBJS)\coredll_uxtheme.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_accel.obj \
@@ -1285,7 +1785,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_slider95.obj \
        $(OBJS)\coredll_spinbutt.obj \
@@ -1300,7 +1799,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
-       $(OBJS)\coredll_uxtheme.obj \
        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_appcmn.obj \
        $(OBJS)\coredll_artprov.obj \
@@ -1371,6 +1869,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(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 \
@@ -1391,11 +1893,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(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_taskbarcmn.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
@@ -1423,7 +1930,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpchm.obj \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_icon.obj \
-       $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_dataobj.obj \
@@ -1435,13 +1941,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
+       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
-       $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_toplevel.obj \
        $(OBJS)\coredll_utilsgui.obj \
-       $(OBJS)\coredll_wave.obj \
+       $(OBJS)\coredll_uxtheme.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_accel.obj \
@@ -1464,6 +1970,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_colschem.obj \
        $(OBJS)\coredll_combobox.obj \
        $(OBJS)\coredll_control.obj \
+       $(OBJS)\coredll_ctrlrend.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \
        $(OBJS)\coredll_gauge.obj \
@@ -1474,7 +1981,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_scrthumb.obj \
@@ -1586,7 +2092,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
-       $(OBJS)\corelib_taskbarcmn.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
@@ -1614,7 +2119,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpchm.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_icon.obj \
-       $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_dataobj.obj \
@@ -1626,13 +2130,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
+       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_wave.obj \
+       $(OBJS)\corelib_uxtheme.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_accel.obj \
@@ -1669,7 +2173,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_slider95.obj \
        $(OBJS)\corelib_spinbutt.obj \
@@ -1684,7 +2187,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
-       $(OBJS)\corelib_uxtheme.obj \
        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_appcmn.obj \
        $(OBJS)\corelib_artprov.obj \
@@ -1779,7 +2281,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
-       $(OBJS)\corelib_taskbarcmn.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
@@ -1807,7 +2308,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpchm.obj \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_icon.obj \
-       $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_dataobj.obj \
@@ -1819,13 +2319,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
+       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
-       $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_toplevel.obj \
        $(OBJS)\corelib_utilsgui.obj \
-       $(OBJS)\corelib_wave.obj \
+       $(OBJS)\corelib_uxtheme.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_accel.obj \
@@ -1848,6 +2348,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_colschem.obj \
        $(OBJS)\corelib_combobox.obj \
        $(OBJS)\corelib_control.obj \
+       $(OBJS)\corelib_ctrlrend.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \
        $(OBJS)\corelib_gauge.obj \
@@ -1858,7 +2359,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_scrthumb.obj \
@@ -1970,7 +2470,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
-       $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
@@ -1998,7 +2497,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpchm.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_icon.obj \
-       $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_dataobj.obj \
@@ -2010,13 +2508,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
+       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_toplevel.obj \
        $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_wave.obj \
+       $(OBJS)\monodll_uxtheme.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_accel.obj \
@@ -2053,7 +2551,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_slider95.obj \
        $(OBJS)\monodll_spinbutt.obj \
@@ -2068,7 +2565,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
-       $(OBJS)\monodll_uxtheme.obj \
        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_appcmn.obj \
        $(OBJS)\monodll_artprov.obj \
@@ -2162,8 +2658,172 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(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 \
+       $(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_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_mdig.obj \
+       $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_accel.obj $(OBJS)\monodll_msgdlgg.obj \
+       $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_tabg.obj $(OBJS)\monodll_gtk.obj $(OBJS)\monodll_win32.obj \
+       $(OBJS)\monodll_metal.obj $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_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 \
+       $(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.9
+=======
 ____CORE_SRC_FILENAMES_OBJECTS =  \
-       $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
@@ -2191,7 +2851,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpchm.obj \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_icon.obj \
-       $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_dataobj.obj \
@@ -2203,13 +2862,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
+       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
-       $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_toplevel.obj \
        $(OBJS)\monodll_utilsgui.obj \
-       $(OBJS)\monodll_wave.obj \
+       $(OBJS)\monodll_uxtheme.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_accel.obj \
@@ -2232,6 +2891,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_colschem.obj \
        $(OBJS)\monodll_combobox.obj \
        $(OBJS)\monodll_control.obj \
+       $(OBJS)\monodll_ctrlrend.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \
        $(OBJS)\monodll_gauge.obj \
@@ -2242,7 +2902,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_scrthumb.obj \
@@ -2355,7 +3014,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
-       $(OBJS)\monolib_dbgrid.obj \
        $(OBJS)\monolib_calctrl.obj \
        $(OBJS)\monolib_dcbuffer.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2367,6 +3025,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(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 \
@@ -2388,12 +3050,27 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(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_dbgrid.obj \
        $(OBJS)\monodll_calctrl.obj \
        $(OBJS)\monodll_dcbuffer.obj \
        $(OBJS)\monodll_grid.obj \
@@ -2405,6 +3082,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(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 \
@@ -2426,7 +3107,25 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(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 = \
@@ -2436,6 +3135,7 @@ __advdll___depname = \
 __advlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !endif
+>>>>>>> 1.28
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll
@@ -2452,17 +3152,50 @@ __coredll___depname = \
 __corelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__dbgriddll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__dbgridlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+!endif
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll
 !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 = \
@@ -2484,6 +3217,14 @@ __netdll___depname = \
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__odbcdll___depname = \
+       $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+__odbclib___depname = \
+       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+!endif
 !if "$(USE_GUI)" == "1"
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !endif
@@ -2509,14 +3250,11 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
+all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
 
 $(OBJS)\advdll_calctrl.obj: ..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_dbgrid.obj: ..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -2535,6 +3273,9 @@ $(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp
 $(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) $**
 
@@ -2544,18 +3285,24 @@ $(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp
 $(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_dbgrid.obj: ..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -2574,6 +3321,9 @@ $(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp
 $(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) $**
 
@@ -2583,9 +3333,18 @@ $(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp
 $(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) $**
 
@@ -2613,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) $**
 
@@ -2826,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) $**
 
@@ -3212,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) $**
@@ -3598,11 +4348,6 @@ $(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) $**
@@ -3816,12 +4561,7 @@ $(OBJS)\coredll_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
@@ -3970,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) $**
 
@@ -4081,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
@@ -4112,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) $**
 
@@ -4335,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) $**
@@ -4721,11 +5451,6 @@ $(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) $**
@@ -4939,12 +5664,16 @@ $(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"
+>>>>>>> 1.28
 $(OBJS)\corelib_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
@@ -5093,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) $**
 
@@ -5204,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
@@ -5235,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) $**
 
@@ -5261,6 +5977,18 @@ $(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 $**
 
@@ -5629,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) $**
@@ -6156,10 +6887,8 @@ $(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
@@ -6449,12 +7178,7 @@ $(OBJS)\monodll_rendcmn.obj: ..\src\common\rendcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_renderer.obj: ..\src\univ\renderer.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
@@ -6642,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) $**
@@ -6783,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
@@ -6817,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) $**
@@ -7082,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) $**
@@ -7609,10 +8332,8 @@ $(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
@@ -7902,12 +8623,16 @@ $(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"
+>>>>>>> 1.28
 $(OBJS)\monolib_renderer.obj: ..\src\msw\renderer.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
@@ -8095,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) $**
@@ -8236,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
@@ -8270,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) $**
@@ -8395,6 +9116,24 @@ $(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj: ..\src\common\url.cpp
        $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
 
+$(OBJS)\odbcdll_db.obj: ..\src\common\db.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
+
+$(OBJS)\odbcdll_dbtable.obj: ..\src\common\dbtable.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
+
+$(OBJS)\odbcdll_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**
+
+$(OBJS)\odbclib_db.obj: ..\src\common\db.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
+
+$(OBJS)\odbclib_dbtable.obj: ..\src\common\dbtable.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
+
+$(OBJS)\odbclib_dummy.obj: ..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $**
+
 $(OBJS)\wxexpat_xmlparse.obj: ..\src\expat\lib\xmlparse.c
        $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $**
 
@@ -8761,13 +9500,13 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp
 !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 cw32mt$(__RUNTIME_LIBS_5).lib,,
+       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
+$(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)
@@ -8777,13 +9516,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__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 cw32mt$(__RUNTIME_LIBS_5).lib,,
+       c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.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 /p2048 $@ @&&|
        $(BASELIB_OBJECTS)
@@ -8814,6 +9553,12 @@ clean:
        -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
@@ -8827,29 +9572,45 @@ clean:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__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 cw32mt$(__RUNTIME_LIBS_5).lib,,
+       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj
+$(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 /p2048 $@ @&&|
+       $(DBGRIDLIB_OBJECTS)
+|
+!endif
+
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__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) cw32mt$(__RUNTIME_LIBS_5).lib,,
+       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
 !endif
 
 !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.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 /p2048 $@ @&&|
        $(GLLIB_OBJECTS)
@@ -8859,13 +9620,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__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 cw32mt$(__RUNTIME_LIBS_5).lib,,
+       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.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 /p2048 $@ @&&|
        $(HTMLLIB_OBJECTS)
@@ -8881,13 +9642,13 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__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   cw32mt$(__RUNTIME_LIBS_5).lib,,
+       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib    import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj
+$(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 /p2048 $@ @&&|
        $(MONOLIB_OBJECTS)
@@ -8896,29 +9657,60 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 
 ..\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 cw32mt$(__RUNTIME_LIBS_5).lib,,
+       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
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj
+$(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 ..\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)
@@ -8963,13 +9755,13 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__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  cw32mt$(__RUNTIME_LIBS_5).lib,,
+       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
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj
+$(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 /p2048 $@ @&&|
        $(XMLLIB_OBJECTS)