diff --git a/Makefile.in b/Makefile.in
index c08e5ed525..29e60802ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -265,7 +265,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_UNIX_1@	wx/unix/gsockunx.h wx/unix/mimetype.h
 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = \
 @COND_PLATFORM_WIN32_1@	wx/msw/dde.h wx/msw/gccpriv.h wx/msw/mimetype.h \
-@COND_PLATFORM_WIN32_1@	wx/msw/winundef.h wx/msw/wrapwin.h wx/msw/chkconf.h
+@COND_PLATFORM_WIN32_1@	wx/msw/winundef.h wx/msw/wrapwin.h wx/msw/chkconf.h \
+@COND_PLATFORM_WIN32_1@	wx/msw/crashrpt.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = 
 @COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = 
 @COND_DEPS_TRACKING_0@CCC = $(CC)
@@ -585,7 +586,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_WIN32_1@	monodll_basemsw.o monodll_dde.o monodll_dir.o \
 @COND_PLATFORM_WIN32_1@	monodll_mimetype.o monodll_regconf.o \
 @COND_PLATFORM_WIN32_1@	monodll_registry.o monodll_snglinst.o \
-@COND_PLATFORM_WIN32_1@	monodll_thread.o monodll_utils.o monodll_utilsexc.o
+@COND_PLATFORM_WIN32_1@	monodll_thread.o monodll_utils.o monodll_utilsexc.o \
+@COND_PLATFORM_WIN32_1@	monodll_crashrpt.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@	= $(__BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = \
@@ -597,7 +599,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_WIN32_1@	monolib_basemsw.o monolib_dde.o monolib_dir.o \
 @COND_PLATFORM_WIN32_1@	monolib_mimetype.o monolib_regconf.o \
 @COND_PLATFORM_WIN32_1@	monolib_registry.o monolib_snglinst.o \
-@COND_PLATFORM_WIN32_1@	monolib_thread.o monolib_utils.o monolib_utilsexc.o
+@COND_PLATFORM_WIN32_1@	monolib_thread.o monolib_utils.o monolib_utilsexc.o \
+@COND_PLATFORM_WIN32_1@	monolib_crashrpt.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@	= $(__BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = \
@@ -609,7 +612,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_WIN32_1@	basedll_basemsw.o basedll_dde.o basedll_dir.o \
 @COND_PLATFORM_WIN32_1@	basedll_mimetype.o basedll_regconf.o \
 @COND_PLATFORM_WIN32_1@	basedll_registry.o basedll_snglinst.o \
-@COND_PLATFORM_WIN32_1@	basedll_thread.o basedll_utils.o basedll_utilsexc.o
+@COND_PLATFORM_WIN32_1@	basedll_thread.o basedll_utils.o basedll_utilsexc.o \
+@COND_PLATFORM_WIN32_1@	basedll_crashrpt.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@	= $(__BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = \
@@ -621,58 +625,60 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_WIN32_1@	baselib_basemsw.o baselib_dde.o baselib_dir.o \
 @COND_PLATFORM_WIN32_1@	baselib_mimetype.o baselib_regconf.o \
 @COND_PLATFORM_WIN32_1@	baselib_registry.o baselib_snglinst.o \
-@COND_PLATFORM_WIN32_1@	baselib_thread.o baselib_utils.o baselib_utilsexc.o
+@COND_PLATFORM_WIN32_1@	baselib_thread.o baselib_utils.o baselib_utilsexc.o \
+@COND_PLATFORM_WIN32_1@	baselib_crashrpt.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_0@	$(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) \
 @COND_USE_GUI_1_WXUNIV_0@	monodll_selstore.o monodll_busyinfo.o \
 @COND_USE_GUI_1_WXUNIV_0@	monodll_calctrl.o monodll_choicdgg.o \
 @COND_USE_GUI_1_WXUNIV_0@	monodll_dcbuffer.o monodll_dcpsg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_dirctrlg.o monodll_grid.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_gridctrl.o monodll_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_panelg.o monodll_progdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_sashwin.o monodll_scrlwing.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_spinctlg.o monodll_splash.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_splitter.o monodll_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_textdlgg.o monodll_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_tipwin.o monodll_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_vlbox.o monodll_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_wizard.o monodll_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_fontmap.o monodll_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_artprov.o monodll_artstd.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_bmpbase.o monodll_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_clipcmn.o monodll_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_cmndata.o monodll_containr.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_cshelp.o monodll_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_ctrlsub.o monodll_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_dbgrid.o monodll_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_dlgcmn.o monodll_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_dobjcmn.o monodll_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_docview.o monodll_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_dseldlg.o monodll_effects.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_fddlgcmn.o monodll_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_fontcmn.o monodll_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_timercmn.o monodll_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_gaugecmn.o monodll_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_geometry.o monodll_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_helpbase.o monodll_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_imagall.o monodll_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_image.o monodll_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_imagiff.o monodll_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_imagpcx.o monodll_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_imagpnm.o monodll_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_imagxpm.o monodll_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_layout.o monodll_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_matrix.o monodll_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_nbkbase.o monodll_paper.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_popupcmn.o monodll_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_quantize.o monodll_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_rgncmn.o monodll_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_sizer.o monodll_statbar.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_tbarbase.o monodll_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_treebase.o monodll_valgen.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_validate.o monodll_valtext.o \
-@COND_USE_GUI_1_WXUNIV_0@	monodll_wincmn.o monodll_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@	monodll_dirctrlg.o monodll_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_grid.o monodll_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_gridsel.o monodll_laywin.o monodll_logg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_numdlgg.o monodll_panelg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_progdlgg.o monodll_sashwin.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_scrlwing.o monodll_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_splash.o monodll_splitter.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_tbarsmpl.o monodll_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_tipdlg.o monodll_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_treectlg.o monodll_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_vscroll.o monodll_wizard.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_appcmn.o monodll_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_accesscmn.o monodll_artprov.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_artstd.o monodll_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_choiccmn.o monodll_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_cmdproc.o monodll_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_containr.o monodll_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_ctrlcmn.o monodll_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_datacmn.o monodll_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_dcbase.o monodll_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_dndcmn.o monodll_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_docmdi.o monodll_docview.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_dpycmn.o monodll_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_effects.o monodll_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_fldlgcmn.o monodll_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_framecmn.o monodll_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_toplvcmn.o monodll_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_gdicmn.o monodll_geometry.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_gifdecod.o monodll_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_iconbndl.o monodll_imagall.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imagbmp.o monodll_image.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imaggif.o monodll_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imagjpeg.o monodll_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imagpng.o monodll_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imagtiff.o monodll_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_imagfill.o monodll_layout.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_lboxcmn.o monodll_matrix.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_menucmn.o monodll_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_paper.o monodll_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_prntbase.o monodll_quantize.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_radiocmn.o monodll_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_settcmn.o monodll_sizer.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_statbar.o monodll_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_textcmn.o monodll_treebase.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_valgen.o monodll_validate.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_valtext.o monodll_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_0@	monodll_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_1@	$(__LOWLEVEL_SRC_OBJECTS) \
 @COND_USE_GUI_1_WXUNIV_1@	$(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o \
@@ -701,7 +707,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@	monodll_metal.o monodll_selstore.o \
 @COND_USE_GUI_1_WXUNIV_1@	monodll_busyinfo.o monodll_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_1@	monodll_choicdgg.o monodll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@	monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o \
+@COND_USE_GUI_1_WXUNIV_1@	monodll_dcpsg.o monodll_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_1@	monodll_dragimgg.o monodll_grid.o \
 @COND_USE_GUI_1_WXUNIV_1@	monodll_gridctrl.o monodll_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_1@	monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@	monodll_panelg.o monodll_progdlgg.o \
@@ -752,7 +759,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_0@	$(__GUI_SRC_OBJECTS_1) monolib_selstore.o \
 @COND_USE_GUI_1_WXUNIV_0@	monolib_busyinfo.o monolib_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_0@	monolib_choicdgg.o monolib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@	monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o \
+@COND_USE_GUI_1_WXUNIV_0@	monolib_dcpsg.o monolib_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_0@	monolib_dragimgg.o monolib_grid.o \
 @COND_USE_GUI_1_WXUNIV_0@	monolib_gridctrl.o monolib_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_0@	monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_0@	monolib_panelg.o monolib_progdlgg.o \
@@ -826,7 +834,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@	monolib_metal.o monolib_selstore.o \
 @COND_USE_GUI_1_WXUNIV_1@	monolib_busyinfo.o monolib_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_1@	monolib_choicdgg.o monolib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@	monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o \
+@COND_USE_GUI_1_WXUNIV_1@	monolib_dcpsg.o monolib_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_1@	monolib_dragimgg.o monolib_grid.o \
 @COND_USE_GUI_1_WXUNIV_1@	monolib_gridctrl.o monolib_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_1@	monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@	monolib_panelg.o monolib_progdlgg.o \
@@ -877,7 +886,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_0@	$(__GUI_SRC_OBJECTS_2) coredll_selstore.o \
 @COND_USE_GUI_1_WXUNIV_0@	coredll_busyinfo.o coredll_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_0@	coredll_choicdgg.o coredll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@	coredll_dcpsg.o coredll_dirctrlg.o coredll_grid.o \
+@COND_USE_GUI_1_WXUNIV_0@	coredll_dcpsg.o coredll_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_0@	coredll_dragimgg.o coredll_grid.o \
 @COND_USE_GUI_1_WXUNIV_0@	coredll_gridctrl.o coredll_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_0@	coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_0@	coredll_panelg.o coredll_progdlgg.o \
@@ -951,7 +961,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@	coredll_metal.o coredll_selstore.o \
 @COND_USE_GUI_1_WXUNIV_1@	coredll_busyinfo.o coredll_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_1@	coredll_choicdgg.o coredll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@	coredll_dcpsg.o coredll_dirctrlg.o coredll_grid.o \
+@COND_USE_GUI_1_WXUNIV_1@	coredll_dcpsg.o coredll_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_1@	coredll_dragimgg.o coredll_grid.o \
 @COND_USE_GUI_1_WXUNIV_1@	coredll_gridctrl.o coredll_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_1@	coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@	coredll_panelg.o coredll_progdlgg.o \
@@ -1002,7 +1013,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_0@	$(__GUI_SRC_OBJECTS_3) corelib_selstore.o \
 @COND_USE_GUI_1_WXUNIV_0@	corelib_busyinfo.o corelib_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_0@	corelib_choicdgg.o corelib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@	corelib_dcpsg.o corelib_dirctrlg.o corelib_grid.o \
+@COND_USE_GUI_1_WXUNIV_0@	corelib_dcpsg.o corelib_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_0@	corelib_dragimgg.o corelib_grid.o \
 @COND_USE_GUI_1_WXUNIV_0@	corelib_gridctrl.o corelib_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_0@	corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_0@	corelib_panelg.o corelib_progdlgg.o \
@@ -1076,7 +1088,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@	corelib_metal.o corelib_selstore.o \
 @COND_USE_GUI_1_WXUNIV_1@	corelib_busyinfo.o corelib_calctrl.o \
 @COND_USE_GUI_1_WXUNIV_1@	corelib_choicdgg.o corelib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@	corelib_dcpsg.o corelib_dirctrlg.o corelib_grid.o \
+@COND_USE_GUI_1_WXUNIV_1@	corelib_dcpsg.o corelib_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_1@	corelib_dragimgg.o corelib_grid.o \
 @COND_USE_GUI_1_WXUNIV_1@	corelib_gridctrl.o corelib_gridsel.o \
 @COND_USE_GUI_1_WXUNIV_1@	corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@	corelib_panelg.o corelib_progdlgg.o \
@@ -2281,6 +2294,9 @@ basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp
 basedll_config.o: $(srcdir)/src/common/config.cpp
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+basedll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_datetime.o: $(srcdir)/src/common/datetime.cpp
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -2607,6 +2623,9 @@ baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp
 baselib_config.o: $(srcdir)/src/common/config.cpp
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+baselib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_datetime.o: $(srcdir)/src/common/datetime.cpp
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -3635,6 +3654,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
 coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_USE_GUI_1@coredll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -5758,6 +5780,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
 corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_USE_GUI_1@corelib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -7918,6 +7943,9 @@ monodll_config.o: $(srcdir)/src/common/config.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8239,6 +8267,9 @@ monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
 monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -10401,6 +10432,9 @@ monolib_config.o: $(srcdir)/src/common/config.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monolib_cshelp.o: $(srcdir)/src/common/cshelp.cpp
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10722,6 +10756,9 @@ monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
 monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_USE_GUI_1@monolib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index a4b1280ef7..6e1b2f02bd 100644
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -7,11 +7,11 @@ BAKEFILE = bakefile -v
 CDEPS = config.bkl common.bkl common_contrib.bkl
 SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
-MINGW_ALL = ../makefile.gcc ../../samples/makefile.gcc ../../samples/db/makefile.gcc ../../samples/dnd/makefile.gcc ../../samples/ipc/makefile.gcc ../../samples/mdi/makefile.gcc ../../samples/mfc/makefile.gcc ../../samples/png/makefile.gcc ../../samples/tab/makefile.gcc ../../samples/exec/makefile.gcc ../../samples/font/makefile.gcc ../../samples/help/makefile.gcc ../../samples/grid/makefile.gcc ../../samples/html/makefile.gcc ../../samples/html/zip/makefile.gcc ../../samples/html/help/makefile.gcc ../../samples/html/test/makefile.gcc ../../samples/html/about/makefile.gcc ../../samples/html/widget/makefile.gcc ../../samples/html/printing/makefile.gcc ../../samples/html/virtual/makefile.gcc ../../samples/html/helpview/makefile.gcc ../../samples/menu/makefile.gcc ../../samples/text/makefile.gcc ../../samples/console/makefile.gcc ../../samples/treectrl/makefile.gcc ../../samples/listctrl/makefile.gcc ../../samples/joytest/makefile.gcc ../../samples/regtest/makefile.gcc ../../samples/dialogs/makefile.gcc ../../samples/nativdlg/makefile.gcc ../../samples/display/makefile.gcc ../../samples/notebook/makefile.gcc ../../samples/caret/makefile.gcc ../../samples/erase/makefile.gcc ../../samples/event/makefile.gcc ../../samples/image/makefile.gcc ../../samples/sashtest/makefile.gcc ../../samples/docview/makefile.gcc ../../samples/typetest/makefile.gcc ../../samples/drawing/makefile.gcc ../../samples/splitter/makefile.gcc ../../samples/listbox/makefile.gcc ../../samples/multimon/makefile.gcc ../../samples/dynamic/makefile.gcc ../../samples/checklst/makefile.gcc ../../samples/taskbar/makefile.gcc ../../samples/dragimag/makefile.gcc ../../samples/sockets/makefile.gcc ../../samples/calendar/makefile.gcc ../../samples/minimal/makefile.gcc ../../samples/access/makefile.gcc ../../samples/statbar/makefile.gcc ../../samples/config/makefile.gcc ../../samples/dialup/makefile.gcc ../../samples/controls/makefile.gcc ../../samples/richedit/makefile.gcc ../../samples/newgrid/makefile.gcc ../../samples/toolbar/makefile.gcc ../../samples/htlbox/makefile.gcc ../../samples/layout/makefile.gcc ../../samples/minifram/makefile.gcc ../../samples/mobile/makefile.gcc ../../samples/opengl/makefile.gcc ../../samples/scroll/makefile.gcc ../../samples/rotate/makefile.gcc ../../samples/shaped/makefile.gcc ../../samples/thread/makefile.gcc ../../samples/wizard/makefile.gcc ../../samples/printing/makefile.gcc ../../samples/oleauto/makefile.gcc ../../samples/wxtest/makefile.gcc ../../samples/artprov/makefile.gcc ../../samples/propsize/makefile.gcc ../../samples/ownerdrw/makefile.gcc ../../samples/vscroll/makefile.gcc ../../samples/validate/makefile.gcc ../../samples/widgets/makefile.gcc ../../samples/keyboard/makefile.gcc ../../samples/docvwmdi/makefile.gcc ../../samples/scrollsub/makefile.gcc ../../samples/memcheck/makefile.gcc ../../samples/internat/makefile.gcc ../../contrib/build/fl/makefile.gcc ../../contrib/build/stc/makefile.gcc ../../contrib/build/xrc/makefile.gcc ../../contrib/build/gizmos/makefile.gcc ../../contrib/build/animate/makefile.gcc ../../contrib/samples/xrc/makefile.gcc ../../contrib/samples/animate/makefile.gcc
-MSVC_ALL = ../makefile.vc ../../samples/makefile.vc ../../samples/db/makefile.vc ../../samples/dnd/makefile.vc ../../samples/ipc/makefile.vc ../../samples/mdi/makefile.vc ../../samples/mfc/makefile.vc ../../samples/png/makefile.vc ../../samples/tab/makefile.vc ../../samples/exec/makefile.vc ../../samples/font/makefile.vc ../../samples/help/makefile.vc ../../samples/grid/makefile.vc ../../samples/html/makefile.vc ../../samples/html/zip/makefile.vc ../../samples/html/help/makefile.vc ../../samples/html/test/makefile.vc ../../samples/html/about/makefile.vc ../../samples/html/widget/makefile.vc ../../samples/html/printing/makefile.vc ../../samples/html/virtual/makefile.vc ../../samples/html/helpview/makefile.vc ../../samples/menu/makefile.vc ../../samples/text/makefile.vc ../../samples/console/makefile.vc ../../samples/treectrl/makefile.vc ../../samples/listctrl/makefile.vc ../../samples/joytest/makefile.vc ../../samples/regtest/makefile.vc ../../samples/dialogs/makefile.vc ../../samples/nativdlg/makefile.vc ../../samples/display/makefile.vc ../../samples/notebook/makefile.vc ../../samples/caret/makefile.vc ../../samples/erase/makefile.vc ../../samples/event/makefile.vc ../../samples/image/makefile.vc ../../samples/sashtest/makefile.vc ../../samples/docview/makefile.vc ../../samples/typetest/makefile.vc ../../samples/drawing/makefile.vc ../../samples/splitter/makefile.vc ../../samples/listbox/makefile.vc ../../samples/multimon/makefile.vc ../../samples/dynamic/makefile.vc ../../samples/checklst/makefile.vc ../../samples/taskbar/makefile.vc ../../samples/dragimag/makefile.vc ../../samples/sockets/makefile.vc ../../samples/calendar/makefile.vc ../../samples/minimal/makefile.vc ../../samples/access/makefile.vc ../../samples/statbar/makefile.vc ../../samples/config/makefile.vc ../../samples/dialup/makefile.vc ../../samples/controls/makefile.vc ../../samples/richedit/makefile.vc ../../samples/newgrid/makefile.vc ../../samples/toolbar/makefile.vc ../../samples/htlbox/makefile.vc ../../samples/layout/makefile.vc ../../samples/minifram/makefile.vc ../../samples/mobile/makefile.vc ../../samples/opengl/makefile.vc ../../samples/scroll/makefile.vc ../../samples/rotate/makefile.vc ../../samples/shaped/makefile.vc ../../samples/thread/makefile.vc ../../samples/wizard/makefile.vc ../../samples/printing/makefile.vc ../../samples/oleauto/makefile.vc ../../samples/wxtest/makefile.vc ../../samples/artprov/makefile.vc ../../samples/propsize/makefile.vc ../../samples/ownerdrw/makefile.vc ../../samples/vscroll/makefile.vc ../../samples/validate/makefile.vc ../../samples/widgets/makefile.vc ../../samples/keyboard/makefile.vc ../../samples/docvwmdi/makefile.vc ../../samples/scrollsub/makefile.vc ../../samples/memcheck/makefile.vc ../../samples/internat/makefile.vc ../../contrib/build/fl/makefile.vc ../../contrib/build/stc/makefile.vc ../../contrib/build/xrc/makefile.vc ../../contrib/build/gizmos/makefile.vc ../../contrib/build/animate/makefile.vc ../../contrib/samples/xrc/makefile.vc ../../contrib/samples/animate/makefile.vc
-AUTOCONF_ALL = ../../configure ../../Makefile.in ../../samples/Makefile.in ../../samples/db/Makefile.in ../../samples/dnd/Makefile.in ../../samples/ipc/Makefile.in ../../samples/mdi/Makefile.in ../../samples/mfc/Makefile.in ../../samples/png/Makefile.in ../../samples/tab/Makefile.in ../../samples/exec/Makefile.in ../../samples/font/Makefile.in ../../samples/help/Makefile.in ../../samples/grid/Makefile.in ../../samples/html/Makefile.in ../../samples/html/zip/Makefile.in ../../samples/html/help/Makefile.in ../../samples/html/test/Makefile.in ../../samples/html/about/Makefile.in ../../samples/html/widget/Makefile.in ../../samples/html/printing/Makefile.in ../../samples/html/virtual/Makefile.in ../../samples/html/helpview/Makefile.in ../../samples/menu/Makefile.in ../../samples/text/Makefile.in ../../samples/console/Makefile.in ../../samples/treectrl/Makefile.in ../../samples/listctrl/Makefile.in ../../samples/joytest/Makefile.in ../../samples/regtest/Makefile.in ../../samples/dialogs/Makefile.in ../../samples/nativdlg/Makefile.in ../../samples/display/Makefile.in ../../samples/notebook/Makefile.in ../../samples/caret/Makefile.in ../../samples/erase/Makefile.in ../../samples/event/Makefile.in ../../samples/image/Makefile.in ../../samples/sashtest/Makefile.in ../../samples/docview/Makefile.in ../../samples/typetest/Makefile.in ../../samples/drawing/Makefile.in ../../samples/splitter/Makefile.in ../../samples/listbox/Makefile.in ../../samples/multimon/Makefile.in ../../samples/dynamic/Makefile.in ../../samples/checklst/Makefile.in ../../samples/taskbar/Makefile.in ../../samples/dragimag/Makefile.in ../../samples/sockets/Makefile.in ../../samples/calendar/Makefile.in ../../samples/minimal/Makefile.in ../../samples/access/Makefile.in ../../samples/statbar/Makefile.in ../../samples/config/Makefile.in ../../samples/dialup/Makefile.in ../../samples/controls/Makefile.in ../../samples/richedit/Makefile.in ../../samples/newgrid/Makefile.in ../../samples/toolbar/Makefile.in ../../samples/htlbox/Makefile.in ../../samples/layout/Makefile.in ../../samples/minifram/Makefile.in ../../samples/mobile/Makefile.in ../../samples/opengl/Makefile.in ../../samples/scroll/Makefile.in ../../samples/rotate/Makefile.in ../../samples/shaped/Makefile.in ../../samples/thread/Makefile.in ../../samples/wizard/Makefile.in ../../samples/printing/Makefile.in ../../samples/oleauto/Makefile.in ../../samples/wxtest/Makefile.in ../../samples/artprov/Makefile.in ../../samples/propsize/Makefile.in ../../samples/ownerdrw/Makefile.in ../../samples/vscroll/Makefile.in ../../samples/validate/Makefile.in ../../samples/widgets/Makefile.in ../../samples/keyboard/Makefile.in ../../samples/docvwmdi/Makefile.in ../../samples/scrollsub/Makefile.in ../../samples/memcheck/Makefile.in ../../samples/internat/Makefile.in ../../contrib/src/fl/Makefile.in ../../contrib/src/stc/Makefile.in ../../contrib/src/xrc/Makefile.in ../../contrib/src/gizmos/Makefile.in ../../contrib/src/animate/Makefile.in ../../contrib/samples/xrc/Makefile.in ../../contrib/samples/animate/Makefile.in
-BORLAND_ALL = ../makefile.bcc ../../samples/makefile.bcc ../../samples/db/makefile.bcc ../../samples/dnd/makefile.bcc ../../samples/ipc/makefile.bcc ../../samples/mdi/makefile.bcc ../../samples/mfc/makefile.bcc ../../samples/png/makefile.bcc ../../samples/tab/makefile.bcc ../../samples/exec/makefile.bcc ../../samples/font/makefile.bcc ../../samples/help/makefile.bcc ../../samples/grid/makefile.bcc ../../samples/html/makefile.bcc ../../samples/html/zip/makefile.bcc ../../samples/html/help/makefile.bcc ../../samples/html/test/makefile.bcc ../../samples/html/about/makefile.bcc ../../samples/html/widget/makefile.bcc ../../samples/html/printing/makefile.bcc ../../samples/html/virtual/makefile.bcc ../../samples/html/helpview/makefile.bcc ../../samples/menu/makefile.bcc ../../samples/text/makefile.bcc ../../samples/console/makefile.bcc ../../samples/treectrl/makefile.bcc ../../samples/listctrl/makefile.bcc ../../samples/joytest/makefile.bcc ../../samples/regtest/makefile.bcc ../../samples/dialogs/makefile.bcc ../../samples/nativdlg/makefile.bcc ../../samples/display/makefile.bcc ../../samples/notebook/makefile.bcc ../../samples/caret/makefile.bcc ../../samples/erase/makefile.bcc ../../samples/event/makefile.bcc ../../samples/image/makefile.bcc ../../samples/sashtest/makefile.bcc ../../samples/docview/makefile.bcc ../../samples/typetest/makefile.bcc ../../samples/drawing/makefile.bcc ../../samples/splitter/makefile.bcc ../../samples/listbox/makefile.bcc ../../samples/multimon/makefile.bcc ../../samples/dynamic/makefile.bcc ../../samples/checklst/makefile.bcc ../../samples/taskbar/makefile.bcc ../../samples/dragimag/makefile.bcc ../../samples/sockets/makefile.bcc ../../samples/calendar/makefile.bcc ../../samples/minimal/makefile.bcc ../../samples/access/makefile.bcc ../../samples/statbar/makefile.bcc ../../samples/config/makefile.bcc ../../samples/dialup/makefile.bcc ../../samples/controls/makefile.bcc ../../samples/richedit/makefile.bcc ../../samples/newgrid/makefile.bcc ../../samples/toolbar/makefile.bcc ../../samples/htlbox/makefile.bcc ../../samples/layout/makefile.bcc ../../samples/minifram/makefile.bcc ../../samples/mobile/makefile.bcc ../../samples/opengl/makefile.bcc ../../samples/scroll/makefile.bcc ../../samples/rotate/makefile.bcc ../../samples/shaped/makefile.bcc ../../samples/thread/makefile.bcc ../../samples/wizard/makefile.bcc ../../samples/printing/makefile.bcc ../../samples/oleauto/makefile.bcc ../../samples/wxtest/makefile.bcc ../../samples/artprov/makefile.bcc ../../samples/propsize/makefile.bcc ../../samples/ownerdrw/makefile.bcc ../../samples/vscroll/makefile.bcc ../../samples/validate/makefile.bcc ../../samples/widgets/makefile.bcc ../../samples/keyboard/makefile.bcc ../../samples/docvwmdi/makefile.bcc ../../samples/scrollsub/makefile.bcc ../../samples/memcheck/makefile.bcc ../../samples/internat/makefile.bcc ../../contrib/build/fl/makefile.bcc ../../contrib/build/stc/makefile.bcc ../../contrib/build/xrc/makefile.bcc ../../contrib/build/gizmos/makefile.bcc ../../contrib/build/animate/makefile.bcc ../../contrib/samples/xrc/makefile.bcc ../../contrib/samples/animate/makefile.bcc
-WATCOM_ALL = ../makefile.wat ../../samples/makefile.wat ../../samples/db/makefile.wat ../../samples/dnd/makefile.wat ../../samples/ipc/makefile.wat ../../samples/mdi/makefile.wat ../../samples/mfc/makefile.wat ../../samples/png/makefile.wat ../../samples/tab/makefile.wat ../../samples/exec/makefile.wat ../../samples/font/makefile.wat ../../samples/help/makefile.wat ../../samples/grid/makefile.wat ../../samples/html/makefile.wat ../../samples/html/zip/makefile.wat ../../samples/html/help/makefile.wat ../../samples/html/test/makefile.wat ../../samples/html/about/makefile.wat ../../samples/html/widget/makefile.wat ../../samples/html/printing/makefile.wat ../../samples/html/virtual/makefile.wat ../../samples/html/helpview/makefile.wat ../../samples/menu/makefile.wat ../../samples/text/makefile.wat ../../samples/console/makefile.wat ../../samples/treectrl/makefile.wat ../../samples/listctrl/makefile.wat ../../samples/joytest/makefile.wat ../../samples/regtest/makefile.wat ../../samples/dialogs/makefile.wat ../../samples/nativdlg/makefile.wat ../../samples/display/makefile.wat ../../samples/notebook/makefile.wat ../../samples/caret/makefile.wat ../../samples/erase/makefile.wat ../../samples/event/makefile.wat ../../samples/image/makefile.wat ../../samples/sashtest/makefile.wat ../../samples/docview/makefile.wat ../../samples/typetest/makefile.wat ../../samples/drawing/makefile.wat ../../samples/splitter/makefile.wat ../../samples/listbox/makefile.wat ../../samples/multimon/makefile.wat ../../samples/dynamic/makefile.wat ../../samples/checklst/makefile.wat ../../samples/taskbar/makefile.wat ../../samples/dragimag/makefile.wat ../../samples/sockets/makefile.wat ../../samples/calendar/makefile.wat ../../samples/minimal/makefile.wat ../../samples/access/makefile.wat ../../samples/statbar/makefile.wat ../../samples/config/makefile.wat ../../samples/dialup/makefile.wat ../../samples/controls/makefile.wat ../../samples/richedit/makefile.wat ../../samples/newgrid/makefile.wat ../../samples/toolbar/makefile.wat ../../samples/htlbox/makefile.wat ../../samples/layout/makefile.wat ../../samples/minifram/makefile.wat ../../samples/mobile/makefile.wat ../../samples/opengl/makefile.wat ../../samples/scroll/makefile.wat ../../samples/rotate/makefile.wat ../../samples/shaped/makefile.wat ../../samples/thread/makefile.wat ../../samples/wizard/makefile.wat ../../samples/printing/makefile.wat ../../samples/oleauto/makefile.wat ../../samples/wxtest/makefile.wat ../../samples/artprov/makefile.wat ../../samples/propsize/makefile.wat ../../samples/ownerdrw/makefile.wat ../../samples/vscroll/makefile.wat ../../samples/validate/makefile.wat ../../samples/widgets/makefile.wat ../../samples/keyboard/makefile.wat ../../samples/docvwmdi/makefile.wat ../../samples/scrollsub/makefile.wat ../../samples/memcheck/makefile.wat ../../samples/internat/makefile.wat ../../contrib/build/fl/makefile.wat ../../contrib/build/stc/makefile.wat ../../contrib/build/xrc/makefile.wat ../../contrib/build/gizmos/makefile.wat ../../contrib/build/animate/makefile.wat ../../contrib/samples/xrc/makefile.wat ../../contrib/samples/animate/makefile.wat
+MINGW_ALL = ../makefile.gcc ../../samples/makefile.gcc ../../samples/access/makefile.gcc ../../samples/shaped/makefile.gcc ../../samples/artprov/makefile.gcc ../../samples/calendar/makefile.gcc ../../samples/caret/makefile.gcc ../../samples/checklst/makefile.gcc ../../samples/config/makefile.gcc ../../samples/console/makefile.gcc ../../samples/controls/makefile.gcc ../../samples/db/makefile.gcc ../../samples/dialogs/makefile.gcc ../../samples/dialup/makefile.gcc ../../samples/dnd/makefile.gcc ../../samples/docview/makefile.gcc ../../samples/docvwmdi/makefile.gcc ../../samples/dragimag/makefile.gcc ../../samples/drawing/makefile.gcc ../../samples/dynamic/makefile.gcc ../../samples/erase/makefile.gcc ../../samples/event/makefile.gcc ../../samples/exec/makefile.gcc ../../samples/font/makefile.gcc ../../samples/display/makefile.gcc ../../samples/grid/makefile.gcc ../../samples/help/makefile.gcc ../../samples/html/makefile.gcc ../../samples/html/about/makefile.gcc ../../samples/html/help/makefile.gcc ../../samples/html/helpview/makefile.gcc ../../samples/html/printing/makefile.gcc ../../samples/html/test/makefile.gcc ../../samples/html/virtual/makefile.gcc ../../samples/html/widget/makefile.gcc ../../samples/html/zip/makefile.gcc ../../samples/image/makefile.gcc ../../samples/internat/makefile.gcc ../../samples/ipc/makefile.gcc ../../samples/joytest/makefile.gcc ../../samples/keyboard/makefile.gcc ../../samples/layout/makefile.gcc ../../samples/listbox/makefile.gcc ../../samples/listctrl/makefile.gcc ../../samples/mdi/makefile.gcc ../../samples/memcheck/makefile.gcc ../../samples/menu/makefile.gcc ../../samples/mfc/makefile.gcc ../../samples/minifram/makefile.gcc ../../samples/minimal/makefile.gcc ../../samples/mobile/makefile.gcc ../../samples/multimon/makefile.gcc ../../samples/nativdlg/makefile.gcc ../../samples/newgrid/makefile.gcc ../../samples/notebook/makefile.gcc ../../samples/oleauto/makefile.gcc ../../samples/opengl/makefile.gcc ../../samples/ownerdrw/makefile.gcc ../../samples/png/makefile.gcc ../../samples/printing/makefile.gcc ../../samples/htlbox/makefile.gcc ../../samples/propsize/makefile.gcc ../../samples/regtest/makefile.gcc ../../samples/richedit/makefile.gcc ../../samples/rotate/makefile.gcc ../../samples/sashtest/makefile.gcc ../../samples/scroll/makefile.gcc ../../samples/scrollsub/makefile.gcc ../../samples/sockets/makefile.gcc ../../samples/splitter/makefile.gcc ../../samples/statbar/makefile.gcc ../../samples/tab/makefile.gcc ../../samples/taskbar/makefile.gcc ../../samples/text/makefile.gcc ../../samples/thread/makefile.gcc ../../samples/toolbar/makefile.gcc ../../samples/treectrl/makefile.gcc ../../samples/typetest/makefile.gcc ../../samples/validate/makefile.gcc ../../samples/widgets/makefile.gcc ../../samples/wizard/makefile.gcc ../../samples/wxtest/makefile.gcc ../../samples/vscroll/makefile.gcc ../../contrib/build/gizmos/makefile.gcc ../../contrib/build/xrc/makefile.gcc ../../contrib/build/animate/makefile.gcc ../../contrib/build/stc/makefile.gcc ../../contrib/build/fl/makefile.gcc ../../contrib/build/ogl/makefile.gcc ../../contrib/samples/animate/makefile.gcc ../../contrib/samples/xrc/makefile.gcc
+MSVC_ALL = ../makefile.vc ../../samples/makefile.vc ../../samples/access/makefile.vc ../../samples/shaped/makefile.vc ../../samples/artprov/makefile.vc ../../samples/calendar/makefile.vc ../../samples/caret/makefile.vc ../../samples/checklst/makefile.vc ../../samples/config/makefile.vc ../../samples/console/makefile.vc ../../samples/controls/makefile.vc ../../samples/db/makefile.vc ../../samples/dialogs/makefile.vc ../../samples/dialup/makefile.vc ../../samples/dnd/makefile.vc ../../samples/docview/makefile.vc ../../samples/docvwmdi/makefile.vc ../../samples/dragimag/makefile.vc ../../samples/drawing/makefile.vc ../../samples/dynamic/makefile.vc ../../samples/erase/makefile.vc ../../samples/event/makefile.vc ../../samples/exec/makefile.vc ../../samples/font/makefile.vc ../../samples/display/makefile.vc ../../samples/grid/makefile.vc ../../samples/help/makefile.vc ../../samples/html/makefile.vc ../../samples/html/about/makefile.vc ../../samples/html/help/makefile.vc ../../samples/html/helpview/makefile.vc ../../samples/html/printing/makefile.vc ../../samples/html/test/makefile.vc ../../samples/html/virtual/makefile.vc ../../samples/html/widget/makefile.vc ../../samples/html/zip/makefile.vc ../../samples/image/makefile.vc ../../samples/internat/makefile.vc ../../samples/ipc/makefile.vc ../../samples/joytest/makefile.vc ../../samples/keyboard/makefile.vc ../../samples/layout/makefile.vc ../../samples/listbox/makefile.vc ../../samples/listctrl/makefile.vc ../../samples/mdi/makefile.vc ../../samples/memcheck/makefile.vc ../../samples/menu/makefile.vc ../../samples/mfc/makefile.vc ../../samples/minifram/makefile.vc ../../samples/minimal/makefile.vc ../../samples/mobile/makefile.vc ../../samples/multimon/makefile.vc ../../samples/nativdlg/makefile.vc ../../samples/newgrid/makefile.vc ../../samples/notebook/makefile.vc ../../samples/oleauto/makefile.vc ../../samples/opengl/makefile.vc ../../samples/ownerdrw/makefile.vc ../../samples/png/makefile.vc ../../samples/printing/makefile.vc ../../samples/htlbox/makefile.vc ../../samples/propsize/makefile.vc ../../samples/regtest/makefile.vc ../../samples/richedit/makefile.vc ../../samples/rotate/makefile.vc ../../samples/sashtest/makefile.vc ../../samples/scroll/makefile.vc ../../samples/scrollsub/makefile.vc ../../samples/sockets/makefile.vc ../../samples/splitter/makefile.vc ../../samples/statbar/makefile.vc ../../samples/tab/makefile.vc ../../samples/taskbar/makefile.vc ../../samples/text/makefile.vc ../../samples/thread/makefile.vc ../../samples/toolbar/makefile.vc ../../samples/treectrl/makefile.vc ../../samples/typetest/makefile.vc ../../samples/validate/makefile.vc ../../samples/widgets/makefile.vc ../../samples/wizard/makefile.vc ../../samples/wxtest/makefile.vc ../../samples/vscroll/makefile.vc ../../contrib/build/gizmos/makefile.vc ../../contrib/build/xrc/makefile.vc ../../contrib/build/animate/makefile.vc ../../contrib/build/stc/makefile.vc ../../contrib/build/fl/makefile.vc ../../contrib/build/ogl/makefile.vc ../../contrib/samples/animate/makefile.vc ../../contrib/samples/xrc/makefile.vc
+AUTOCONF_ALL = ../../configure ../../Makefile.in ../../samples/Makefile.in ../../samples/access/Makefile.in ../../samples/shaped/Makefile.in ../../samples/artprov/Makefile.in ../../samples/calendar/Makefile.in ../../samples/caret/Makefile.in ../../samples/checklst/Makefile.in ../../samples/config/Makefile.in ../../samples/console/Makefile.in ../../samples/controls/Makefile.in ../../samples/db/Makefile.in ../../samples/dialogs/Makefile.in ../../samples/dialup/Makefile.in ../../samples/dnd/Makefile.in ../../samples/docview/Makefile.in ../../samples/docvwmdi/Makefile.in ../../samples/dragimag/Makefile.in ../../samples/drawing/Makefile.in ../../samples/dynamic/Makefile.in ../../samples/erase/Makefile.in ../../samples/event/Makefile.in ../../samples/exec/Makefile.in ../../samples/font/Makefile.in ../../samples/display/Makefile.in ../../samples/grid/Makefile.in ../../samples/help/Makefile.in ../../samples/html/Makefile.in ../../samples/html/about/Makefile.in ../../samples/html/help/Makefile.in ../../samples/html/helpview/Makefile.in ../../samples/html/printing/Makefile.in ../../samples/html/test/Makefile.in ../../samples/html/virtual/Makefile.in ../../samples/html/widget/Makefile.in ../../samples/html/zip/Makefile.in ../../samples/image/Makefile.in ../../samples/internat/Makefile.in ../../samples/ipc/Makefile.in ../../samples/joytest/Makefile.in ../../samples/keyboard/Makefile.in ../../samples/layout/Makefile.in ../../samples/listbox/Makefile.in ../../samples/listctrl/Makefile.in ../../samples/mdi/Makefile.in ../../samples/memcheck/Makefile.in ../../samples/menu/Makefile.in ../../samples/mfc/Makefile.in ../../samples/minifram/Makefile.in ../../samples/minimal/Makefile.in ../../samples/mobile/Makefile.in ../../samples/multimon/Makefile.in ../../samples/nativdlg/Makefile.in ../../samples/newgrid/Makefile.in ../../samples/notebook/Makefile.in ../../samples/oleauto/Makefile.in ../../samples/opengl/Makefile.in ../../samples/ownerdrw/Makefile.in ../../samples/png/Makefile.in ../../samples/printing/Makefile.in ../../samples/htlbox/Makefile.in ../../samples/propsize/Makefile.in ../../samples/regtest/Makefile.in ../../samples/richedit/Makefile.in ../../samples/rotate/Makefile.in ../../samples/sashtest/Makefile.in ../../samples/scroll/Makefile.in ../../samples/scrollsub/Makefile.in ../../samples/sockets/Makefile.in ../../samples/splitter/Makefile.in ../../samples/statbar/Makefile.in ../../samples/tab/Makefile.in ../../samples/taskbar/Makefile.in ../../samples/text/Makefile.in ../../samples/thread/Makefile.in ../../samples/toolbar/Makefile.in ../../samples/treectrl/Makefile.in ../../samples/typetest/Makefile.in ../../samples/validate/Makefile.in ../../samples/widgets/Makefile.in ../../samples/wizard/Makefile.in ../../samples/wxtest/Makefile.in ../../samples/vscroll/Makefile.in ../../contrib/src/gizmos/Makefile.in ../../contrib/src/xrc/Makefile.in ../../contrib/src/animate/Makefile.in ../../contrib/src/stc/Makefile.in ../../contrib/src/fl/Makefile.in ../../contrib/src/ogl/Makefile.in ../../contrib/samples/animate/Makefile.in ../../contrib/samples/xrc/Makefile.in
+BORLAND_ALL = ../makefile.bcc ../../samples/makefile.bcc ../../samples/access/makefile.bcc ../../samples/shaped/makefile.bcc ../../samples/artprov/makefile.bcc ../../samples/calendar/makefile.bcc ../../samples/caret/makefile.bcc ../../samples/checklst/makefile.bcc ../../samples/config/makefile.bcc ../../samples/console/makefile.bcc ../../samples/controls/makefile.bcc ../../samples/db/makefile.bcc ../../samples/dialogs/makefile.bcc ../../samples/dialup/makefile.bcc ../../samples/dnd/makefile.bcc ../../samples/docview/makefile.bcc ../../samples/docvwmdi/makefile.bcc ../../samples/dragimag/makefile.bcc ../../samples/drawing/makefile.bcc ../../samples/dynamic/makefile.bcc ../../samples/erase/makefile.bcc ../../samples/event/makefile.bcc ../../samples/exec/makefile.bcc ../../samples/font/makefile.bcc ../../samples/display/makefile.bcc ../../samples/grid/makefile.bcc ../../samples/help/makefile.bcc ../../samples/html/makefile.bcc ../../samples/html/about/makefile.bcc ../../samples/html/help/makefile.bcc ../../samples/html/helpview/makefile.bcc ../../samples/html/printing/makefile.bcc ../../samples/html/test/makefile.bcc ../../samples/html/virtual/makefile.bcc ../../samples/html/widget/makefile.bcc ../../samples/html/zip/makefile.bcc ../../samples/image/makefile.bcc ../../samples/internat/makefile.bcc ../../samples/ipc/makefile.bcc ../../samples/joytest/makefile.bcc ../../samples/keyboard/makefile.bcc ../../samples/layout/makefile.bcc ../../samples/listbox/makefile.bcc ../../samples/listctrl/makefile.bcc ../../samples/mdi/makefile.bcc ../../samples/memcheck/makefile.bcc ../../samples/menu/makefile.bcc ../../samples/mfc/makefile.bcc ../../samples/minifram/makefile.bcc ../../samples/minimal/makefile.bcc ../../samples/mobile/makefile.bcc ../../samples/multimon/makefile.bcc ../../samples/nativdlg/makefile.bcc ../../samples/newgrid/makefile.bcc ../../samples/notebook/makefile.bcc ../../samples/oleauto/makefile.bcc ../../samples/opengl/makefile.bcc ../../samples/ownerdrw/makefile.bcc ../../samples/png/makefile.bcc ../../samples/printing/makefile.bcc ../../samples/htlbox/makefile.bcc ../../samples/propsize/makefile.bcc ../../samples/regtest/makefile.bcc ../../samples/richedit/makefile.bcc ../../samples/rotate/makefile.bcc ../../samples/sashtest/makefile.bcc ../../samples/scroll/makefile.bcc ../../samples/scrollsub/makefile.bcc ../../samples/sockets/makefile.bcc ../../samples/splitter/makefile.bcc ../../samples/statbar/makefile.bcc ../../samples/tab/makefile.bcc ../../samples/taskbar/makefile.bcc ../../samples/text/makefile.bcc ../../samples/thread/makefile.bcc ../../samples/toolbar/makefile.bcc ../../samples/treectrl/makefile.bcc ../../samples/typetest/makefile.bcc ../../samples/validate/makefile.bcc ../../samples/widgets/makefile.bcc ../../samples/wizard/makefile.bcc ../../samples/wxtest/makefile.bcc ../../samples/vscroll/makefile.bcc ../../contrib/build/gizmos/makefile.bcc ../../contrib/build/xrc/makefile.bcc ../../contrib/build/animate/makefile.bcc ../../contrib/build/stc/makefile.bcc ../../contrib/build/fl/makefile.bcc ../../contrib/build/ogl/makefile.bcc ../../contrib/samples/animate/makefile.bcc ../../contrib/samples/xrc/makefile.bcc
+WATCOM_ALL = ../makefile.wat ../../samples/makefile.wat ../../samples/access/makefile.wat ../../samples/shaped/makefile.wat ../../samples/artprov/makefile.wat ../../samples/calendar/makefile.wat ../../samples/caret/makefile.wat ../../samples/checklst/makefile.wat ../../samples/config/makefile.wat ../../samples/console/makefile.wat ../../samples/controls/makefile.wat ../../samples/db/makefile.wat ../../samples/dialogs/makefile.wat ../../samples/dialup/makefile.wat ../../samples/dnd/makefile.wat ../../samples/docview/makefile.wat ../../samples/docvwmdi/makefile.wat ../../samples/dragimag/makefile.wat ../../samples/drawing/makefile.wat ../../samples/dynamic/makefile.wat ../../samples/erase/makefile.wat ../../samples/event/makefile.wat ../../samples/exec/makefile.wat ../../samples/font/makefile.wat ../../samples/display/makefile.wat ../../samples/grid/makefile.wat ../../samples/help/makefile.wat ../../samples/html/makefile.wat ../../samples/html/about/makefile.wat ../../samples/html/help/makefile.wat ../../samples/html/helpview/makefile.wat ../../samples/html/printing/makefile.wat ../../samples/html/test/makefile.wat ../../samples/html/virtual/makefile.wat ../../samples/html/widget/makefile.wat ../../samples/html/zip/makefile.wat ../../samples/image/makefile.wat ../../samples/internat/makefile.wat ../../samples/ipc/makefile.wat ../../samples/joytest/makefile.wat ../../samples/keyboard/makefile.wat ../../samples/layout/makefile.wat ../../samples/listbox/makefile.wat ../../samples/listctrl/makefile.wat ../../samples/mdi/makefile.wat ../../samples/memcheck/makefile.wat ../../samples/menu/makefile.wat ../../samples/mfc/makefile.wat ../../samples/minifram/makefile.wat ../../samples/minimal/makefile.wat ../../samples/mobile/makefile.wat ../../samples/multimon/makefile.wat ../../samples/nativdlg/makefile.wat ../../samples/newgrid/makefile.wat ../../samples/notebook/makefile.wat ../../samples/oleauto/makefile.wat ../../samples/opengl/makefile.wat ../../samples/ownerdrw/makefile.wat ../../samples/png/makefile.wat ../../samples/printing/makefile.wat ../../samples/htlbox/makefile.wat ../../samples/propsize/makefile.wat ../../samples/regtest/makefile.wat ../../samples/richedit/makefile.wat ../../samples/rotate/makefile.wat ../../samples/sashtest/makefile.wat ../../samples/scroll/makefile.wat ../../samples/scrollsub/makefile.wat ../../samples/sockets/makefile.wat ../../samples/splitter/makefile.wat ../../samples/statbar/makefile.wat ../../samples/tab/makefile.wat ../../samples/taskbar/makefile.wat ../../samples/text/makefile.wat ../../samples/thread/makefile.wat ../../samples/toolbar/makefile.wat ../../samples/treectrl/makefile.wat ../../samples/typetest/makefile.wat ../../samples/validate/makefile.wat ../../samples/widgets/makefile.wat ../../samples/wizard/makefile.wat ../../samples/wxtest/makefile.wat ../../samples/vscroll/makefile.wat ../../contrib/build/gizmos/makefile.wat ../../contrib/build/xrc/makefile.wat ../../contrib/build/animate/makefile.wat ../../contrib/build/stc/makefile.wat ../../contrib/build/fl/makefile.wat ../../contrib/build/ogl/makefile.wat ../../contrib/samples/animate/makefile.wat ../../contrib/samples/xrc/makefile.wat
 all: mingw msvc autoconf borland watcom
 
 mingw: $(MINGW_ALL)
@@ -24,455 +24,460 @@ clean:
 	rm -f ../../autoconf_inc.m4
 	rm -f ../makefile.gcc
 	rm -f ../../samples/makefile.gcc
-	rm -f ../../samples/db/makefile.gcc
-	rm -f ../../samples/dnd/makefile.gcc
-	rm -f ../../samples/ipc/makefile.gcc
-	rm -f ../../samples/mdi/makefile.gcc
-	rm -f ../../samples/mfc/makefile.gcc
-	rm -f ../../samples/png/makefile.gcc
-	rm -f ../../samples/tab/makefile.gcc
-	rm -f ../../samples/exec/makefile.gcc
-	rm -f ../../samples/font/makefile.gcc
-	rm -f ../../samples/help/makefile.gcc
-	rm -f ../../samples/grid/makefile.gcc
-	rm -f ../../samples/html/makefile.gcc
-	rm -f ../../samples/html/zip/makefile.gcc
-	rm -f ../../samples/html/help/makefile.gcc
-	rm -f ../../samples/html/test/makefile.gcc
-	rm -f ../../samples/html/about/makefile.gcc
-	rm -f ../../samples/html/widget/makefile.gcc
-	rm -f ../../samples/html/printing/makefile.gcc
-	rm -f ../../samples/html/virtual/makefile.gcc
-	rm -f ../../samples/html/helpview/makefile.gcc
-	rm -f ../../samples/menu/makefile.gcc
-	rm -f ../../samples/text/makefile.gcc
-	rm -f ../../samples/console/makefile.gcc
-	rm -f ../../samples/treectrl/makefile.gcc
-	rm -f ../../samples/listctrl/makefile.gcc
-	rm -f ../../samples/joytest/makefile.gcc
-	rm -f ../../samples/regtest/makefile.gcc
-	rm -f ../../samples/dialogs/makefile.gcc
-	rm -f ../../samples/nativdlg/makefile.gcc
-	rm -f ../../samples/display/makefile.gcc
-	rm -f ../../samples/notebook/makefile.gcc
+	rm -f ../../samples/access/makefile.gcc
+	rm -f ../../samples/shaped/makefile.gcc
+	rm -f ../../samples/artprov/makefile.gcc
+	rm -f ../../samples/calendar/makefile.gcc
 	rm -f ../../samples/caret/makefile.gcc
+	rm -f ../../samples/checklst/makefile.gcc
+	rm -f ../../samples/config/makefile.gcc
+	rm -f ../../samples/console/makefile.gcc
+	rm -f ../../samples/controls/makefile.gcc
+	rm -f ../../samples/db/makefile.gcc
+	rm -f ../../samples/dialogs/makefile.gcc
+	rm -f ../../samples/dialup/makefile.gcc
+	rm -f ../../samples/dnd/makefile.gcc
+	rm -f ../../samples/docview/makefile.gcc
+	rm -f ../../samples/docvwmdi/makefile.gcc
+	rm -f ../../samples/dragimag/makefile.gcc
+	rm -f ../../samples/drawing/makefile.gcc
+	rm -f ../../samples/dynamic/makefile.gcc
 	rm -f ../../samples/erase/makefile.gcc
 	rm -f ../../samples/event/makefile.gcc
+	rm -f ../../samples/exec/makefile.gcc
+	rm -f ../../samples/font/makefile.gcc
+	rm -f ../../samples/display/makefile.gcc
+	rm -f ../../samples/grid/makefile.gcc
+	rm -f ../../samples/help/makefile.gcc
+	rm -f ../../samples/html/makefile.gcc
+	rm -f ../../samples/html/about/makefile.gcc
+	rm -f ../../samples/html/help/makefile.gcc
+	rm -f ../../samples/html/helpview/makefile.gcc
+	rm -f ../../samples/html/printing/makefile.gcc
+	rm -f ../../samples/html/test/makefile.gcc
+	rm -f ../../samples/html/virtual/makefile.gcc
+	rm -f ../../samples/html/widget/makefile.gcc
+	rm -f ../../samples/html/zip/makefile.gcc
 	rm -f ../../samples/image/makefile.gcc
-	rm -f ../../samples/sashtest/makefile.gcc
-	rm -f ../../samples/docview/makefile.gcc
-	rm -f ../../samples/typetest/makefile.gcc
-	rm -f ../../samples/drawing/makefile.gcc
-	rm -f ../../samples/splitter/makefile.gcc
-	rm -f ../../samples/listbox/makefile.gcc
-	rm -f ../../samples/multimon/makefile.gcc
-	rm -f ../../samples/dynamic/makefile.gcc
-	rm -f ../../samples/checklst/makefile.gcc
-	rm -f ../../samples/taskbar/makefile.gcc
-	rm -f ../../samples/dragimag/makefile.gcc
-	rm -f ../../samples/sockets/makefile.gcc
-	rm -f ../../samples/calendar/makefile.gcc
-	rm -f ../../samples/minimal/makefile.gcc
-	rm -f ../../samples/access/makefile.gcc
-	rm -f ../../samples/statbar/makefile.gcc
-	rm -f ../../samples/config/makefile.gcc
-	rm -f ../../samples/dialup/makefile.gcc
-	rm -f ../../samples/controls/makefile.gcc
-	rm -f ../../samples/richedit/makefile.gcc
-	rm -f ../../samples/newgrid/makefile.gcc
-	rm -f ../../samples/toolbar/makefile.gcc
-	rm -f ../../samples/htlbox/makefile.gcc
+	rm -f ../../samples/internat/makefile.gcc
+	rm -f ../../samples/ipc/makefile.gcc
+	rm -f ../../samples/joytest/makefile.gcc
+	rm -f ../../samples/keyboard/makefile.gcc
 	rm -f ../../samples/layout/makefile.gcc
+	rm -f ../../samples/listbox/makefile.gcc
+	rm -f ../../samples/listctrl/makefile.gcc
+	rm -f ../../samples/mdi/makefile.gcc
+	rm -f ../../samples/memcheck/makefile.gcc
+	rm -f ../../samples/menu/makefile.gcc
+	rm -f ../../samples/mfc/makefile.gcc
 	rm -f ../../samples/minifram/makefile.gcc
+	rm -f ../../samples/minimal/makefile.gcc
 	rm -f ../../samples/mobile/makefile.gcc
-	rm -f ../../samples/opengl/makefile.gcc
-	rm -f ../../samples/scroll/makefile.gcc
-	rm -f ../../samples/rotate/makefile.gcc
-	rm -f ../../samples/shaped/makefile.gcc
-	rm -f ../../samples/thread/makefile.gcc
-	rm -f ../../samples/wizard/makefile.gcc
-	rm -f ../../samples/printing/makefile.gcc
+	rm -f ../../samples/multimon/makefile.gcc
+	rm -f ../../samples/nativdlg/makefile.gcc
+	rm -f ../../samples/newgrid/makefile.gcc
+	rm -f ../../samples/notebook/makefile.gcc
 	rm -f ../../samples/oleauto/makefile.gcc
-	rm -f ../../samples/wxtest/makefile.gcc
-	rm -f ../../samples/artprov/makefile.gcc
-	rm -f ../../samples/propsize/makefile.gcc
+	rm -f ../../samples/opengl/makefile.gcc
 	rm -f ../../samples/ownerdrw/makefile.gcc
-	rm -f ../../samples/vscroll/makefile.gcc
+	rm -f ../../samples/png/makefile.gcc
+	rm -f ../../samples/printing/makefile.gcc
+	rm -f ../../samples/htlbox/makefile.gcc
+	rm -f ../../samples/propsize/makefile.gcc
+	rm -f ../../samples/regtest/makefile.gcc
+	rm -f ../../samples/richedit/makefile.gcc
+	rm -f ../../samples/rotate/makefile.gcc
+	rm -f ../../samples/sashtest/makefile.gcc
+	rm -f ../../samples/scroll/makefile.gcc
+	rm -f ../../samples/scrollsub/makefile.gcc
+	rm -f ../../samples/sockets/makefile.gcc
+	rm -f ../../samples/splitter/makefile.gcc
+	rm -f ../../samples/statbar/makefile.gcc
+	rm -f ../../samples/tab/makefile.gcc
+	rm -f ../../samples/taskbar/makefile.gcc
+	rm -f ../../samples/text/makefile.gcc
+	rm -f ../../samples/thread/makefile.gcc
+	rm -f ../../samples/toolbar/makefile.gcc
+	rm -f ../../samples/treectrl/makefile.gcc
+	rm -f ../../samples/typetest/makefile.gcc
 	rm -f ../../samples/validate/makefile.gcc
 	rm -f ../../samples/widgets/makefile.gcc
-	rm -f ../../samples/keyboard/makefile.gcc
-	rm -f ../../samples/docvwmdi/makefile.gcc
-	rm -f ../../samples/scrollsub/makefile.gcc
-	rm -f ../../samples/memcheck/makefile.gcc
-	rm -f ../../samples/internat/makefile.gcc
-	rm -f ../../contrib/build/fl/makefile.gcc
-	rm -f ../../contrib/build/stc/makefile.gcc
-	rm -f ../../contrib/build/xrc/makefile.gcc
+	rm -f ../../samples/wizard/makefile.gcc
+	rm -f ../../samples/wxtest/makefile.gcc
+	rm -f ../../samples/vscroll/makefile.gcc
 	rm -f ../../contrib/build/gizmos/makefile.gcc
+	rm -f ../../contrib/build/xrc/makefile.gcc
 	rm -f ../../contrib/build/animate/makefile.gcc
-	rm -f ../../contrib/samples/xrc/makefile.gcc
+	rm -f ../../contrib/build/stc/makefile.gcc
+	rm -f ../../contrib/build/fl/makefile.gcc
+	rm -f ../../contrib/build/ogl/makefile.gcc
 	rm -f ../../contrib/samples/animate/makefile.gcc
+	rm -f ../../contrib/samples/xrc/makefile.gcc
 	rm -f ../makefile.vc
 	rm -f ../../samples/makefile.vc
-	rm -f ../../samples/db/makefile.vc
-	rm -f ../../samples/dnd/makefile.vc
-	rm -f ../../samples/ipc/makefile.vc
-	rm -f ../../samples/mdi/makefile.vc
-	rm -f ../../samples/mfc/makefile.vc
-	rm -f ../../samples/png/makefile.vc
-	rm -f ../../samples/tab/makefile.vc
-	rm -f ../../samples/exec/makefile.vc
-	rm -f ../../samples/font/makefile.vc
-	rm -f ../../samples/help/makefile.vc
-	rm -f ../../samples/grid/makefile.vc
-	rm -f ../../samples/html/makefile.vc
-	rm -f ../../samples/html/zip/makefile.vc
-	rm -f ../../samples/html/help/makefile.vc
-	rm -f ../../samples/html/test/makefile.vc
-	rm -f ../../samples/html/about/makefile.vc
-	rm -f ../../samples/html/widget/makefile.vc
-	rm -f ../../samples/html/printing/makefile.vc
-	rm -f ../../samples/html/virtual/makefile.vc
-	rm -f ../../samples/html/helpview/makefile.vc
-	rm -f ../../samples/menu/makefile.vc
-	rm -f ../../samples/text/makefile.vc
-	rm -f ../../samples/console/makefile.vc
-	rm -f ../../samples/treectrl/makefile.vc
-	rm -f ../../samples/listctrl/makefile.vc
-	rm -f ../../samples/joytest/makefile.vc
-	rm -f ../../samples/regtest/makefile.vc
-	rm -f ../../samples/dialogs/makefile.vc
-	rm -f ../../samples/nativdlg/makefile.vc
-	rm -f ../../samples/display/makefile.vc
-	rm -f ../../samples/notebook/makefile.vc
+	rm -f ../../samples/access/makefile.vc
+	rm -f ../../samples/shaped/makefile.vc
+	rm -f ../../samples/artprov/makefile.vc
+	rm -f ../../samples/calendar/makefile.vc
 	rm -f ../../samples/caret/makefile.vc
+	rm -f ../../samples/checklst/makefile.vc
+	rm -f ../../samples/config/makefile.vc
+	rm -f ../../samples/console/makefile.vc
+	rm -f ../../samples/controls/makefile.vc
+	rm -f ../../samples/db/makefile.vc
+	rm -f ../../samples/dialogs/makefile.vc
+	rm -f ../../samples/dialup/makefile.vc
+	rm -f ../../samples/dnd/makefile.vc
+	rm -f ../../samples/docview/makefile.vc
+	rm -f ../../samples/docvwmdi/makefile.vc
+	rm -f ../../samples/dragimag/makefile.vc
+	rm -f ../../samples/drawing/makefile.vc
+	rm -f ../../samples/dynamic/makefile.vc
 	rm -f ../../samples/erase/makefile.vc
 	rm -f ../../samples/event/makefile.vc
+	rm -f ../../samples/exec/makefile.vc
+	rm -f ../../samples/font/makefile.vc
+	rm -f ../../samples/display/makefile.vc
+	rm -f ../../samples/grid/makefile.vc
+	rm -f ../../samples/help/makefile.vc
+	rm -f ../../samples/html/makefile.vc
+	rm -f ../../samples/html/about/makefile.vc
+	rm -f ../../samples/html/help/makefile.vc
+	rm -f ../../samples/html/helpview/makefile.vc
+	rm -f ../../samples/html/printing/makefile.vc
+	rm -f ../../samples/html/test/makefile.vc
+	rm -f ../../samples/html/virtual/makefile.vc
+	rm -f ../../samples/html/widget/makefile.vc
+	rm -f ../../samples/html/zip/makefile.vc
 	rm -f ../../samples/image/makefile.vc
-	rm -f ../../samples/sashtest/makefile.vc
-	rm -f ../../samples/docview/makefile.vc
-	rm -f ../../samples/typetest/makefile.vc
-	rm -f ../../samples/drawing/makefile.vc
-	rm -f ../../samples/splitter/makefile.vc
-	rm -f ../../samples/listbox/makefile.vc
-	rm -f ../../samples/multimon/makefile.vc
-	rm -f ../../samples/dynamic/makefile.vc
-	rm -f ../../samples/checklst/makefile.vc
-	rm -f ../../samples/taskbar/makefile.vc
-	rm -f ../../samples/dragimag/makefile.vc
-	rm -f ../../samples/sockets/makefile.vc
-	rm -f ../../samples/calendar/makefile.vc
-	rm -f ../../samples/minimal/makefile.vc
-	rm -f ../../samples/access/makefile.vc
-	rm -f ../../samples/statbar/makefile.vc
-	rm -f ../../samples/config/makefile.vc
-	rm -f ../../samples/dialup/makefile.vc
-	rm -f ../../samples/controls/makefile.vc
-	rm -f ../../samples/richedit/makefile.vc
-	rm -f ../../samples/newgrid/makefile.vc
-	rm -f ../../samples/toolbar/makefile.vc
-	rm -f ../../samples/htlbox/makefile.vc
+	rm -f ../../samples/internat/makefile.vc
+	rm -f ../../samples/ipc/makefile.vc
+	rm -f ../../samples/joytest/makefile.vc
+	rm -f ../../samples/keyboard/makefile.vc
 	rm -f ../../samples/layout/makefile.vc
+	rm -f ../../samples/listbox/makefile.vc
+	rm -f ../../samples/listctrl/makefile.vc
+	rm -f ../../samples/mdi/makefile.vc
+	rm -f ../../samples/memcheck/makefile.vc
+	rm -f ../../samples/menu/makefile.vc
+	rm -f ../../samples/mfc/makefile.vc
 	rm -f ../../samples/minifram/makefile.vc
+	rm -f ../../samples/minimal/makefile.vc
 	rm -f ../../samples/mobile/makefile.vc
-	rm -f ../../samples/opengl/makefile.vc
-	rm -f ../../samples/scroll/makefile.vc
-	rm -f ../../samples/rotate/makefile.vc
-	rm -f ../../samples/shaped/makefile.vc
-	rm -f ../../samples/thread/makefile.vc
-	rm -f ../../samples/wizard/makefile.vc
-	rm -f ../../samples/printing/makefile.vc
+	rm -f ../../samples/multimon/makefile.vc
+	rm -f ../../samples/nativdlg/makefile.vc
+	rm -f ../../samples/newgrid/makefile.vc
+	rm -f ../../samples/notebook/makefile.vc
 	rm -f ../../samples/oleauto/makefile.vc
-	rm -f ../../samples/wxtest/makefile.vc
-	rm -f ../../samples/artprov/makefile.vc
-	rm -f ../../samples/propsize/makefile.vc
+	rm -f ../../samples/opengl/makefile.vc
 	rm -f ../../samples/ownerdrw/makefile.vc
-	rm -f ../../samples/vscroll/makefile.vc
+	rm -f ../../samples/png/makefile.vc
+	rm -f ../../samples/printing/makefile.vc
+	rm -f ../../samples/htlbox/makefile.vc
+	rm -f ../../samples/propsize/makefile.vc
+	rm -f ../../samples/regtest/makefile.vc
+	rm -f ../../samples/richedit/makefile.vc
+	rm -f ../../samples/rotate/makefile.vc
+	rm -f ../../samples/sashtest/makefile.vc
+	rm -f ../../samples/scroll/makefile.vc
+	rm -f ../../samples/scrollsub/makefile.vc
+	rm -f ../../samples/sockets/makefile.vc
+	rm -f ../../samples/splitter/makefile.vc
+	rm -f ../../samples/statbar/makefile.vc
+	rm -f ../../samples/tab/makefile.vc
+	rm -f ../../samples/taskbar/makefile.vc
+	rm -f ../../samples/text/makefile.vc
+	rm -f ../../samples/thread/makefile.vc
+	rm -f ../../samples/toolbar/makefile.vc
+	rm -f ../../samples/treectrl/makefile.vc
+	rm -f ../../samples/typetest/makefile.vc
 	rm -f ../../samples/validate/makefile.vc
 	rm -f ../../samples/widgets/makefile.vc
-	rm -f ../../samples/keyboard/makefile.vc
-	rm -f ../../samples/docvwmdi/makefile.vc
-	rm -f ../../samples/scrollsub/makefile.vc
-	rm -f ../../samples/memcheck/makefile.vc
-	rm -f ../../samples/internat/makefile.vc
-	rm -f ../../contrib/build/fl/makefile.vc
-	rm -f ../../contrib/build/stc/makefile.vc
-	rm -f ../../contrib/build/xrc/makefile.vc
+	rm -f ../../samples/wizard/makefile.vc
+	rm -f ../../samples/wxtest/makefile.vc
+	rm -f ../../samples/vscroll/makefile.vc
 	rm -f ../../contrib/build/gizmos/makefile.vc
+	rm -f ../../contrib/build/xrc/makefile.vc
 	rm -f ../../contrib/build/animate/makefile.vc
-	rm -f ../../contrib/samples/xrc/makefile.vc
+	rm -f ../../contrib/build/stc/makefile.vc
+	rm -f ../../contrib/build/fl/makefile.vc
+	rm -f ../../contrib/build/ogl/makefile.vc
 	rm -f ../../contrib/samples/animate/makefile.vc
+	rm -f ../../contrib/samples/xrc/makefile.vc
 	rm -f ../../configure
 	rm -f ../../Makefile.in
 	rm -f ../../samples/Makefile.in
-	rm -f ../../samples/db/Makefile.in
-	rm -f ../../samples/dnd/Makefile.in
-	rm -f ../../samples/ipc/Makefile.in
-	rm -f ../../samples/mdi/Makefile.in
-	rm -f ../../samples/mfc/Makefile.in
-	rm -f ../../samples/png/Makefile.in
-	rm -f ../../samples/tab/Makefile.in
-	rm -f ../../samples/exec/Makefile.in
-	rm -f ../../samples/font/Makefile.in
-	rm -f ../../samples/help/Makefile.in
-	rm -f ../../samples/grid/Makefile.in
-	rm -f ../../samples/html/Makefile.in
-	rm -f ../../samples/html/zip/Makefile.in
-	rm -f ../../samples/html/help/Makefile.in
-	rm -f ../../samples/html/test/Makefile.in
-	rm -f ../../samples/html/about/Makefile.in
-	rm -f ../../samples/html/widget/Makefile.in
-	rm -f ../../samples/html/printing/Makefile.in
-	rm -f ../../samples/html/virtual/Makefile.in
-	rm -f ../../samples/html/helpview/Makefile.in
-	rm -f ../../samples/menu/Makefile.in
-	rm -f ../../samples/text/Makefile.in
-	rm -f ../../samples/console/Makefile.in
-	rm -f ../../samples/treectrl/Makefile.in
-	rm -f ../../samples/listctrl/Makefile.in
-	rm -f ../../samples/joytest/Makefile.in
-	rm -f ../../samples/regtest/Makefile.in
-	rm -f ../../samples/dialogs/Makefile.in
-	rm -f ../../samples/nativdlg/Makefile.in
-	rm -f ../../samples/display/Makefile.in
-	rm -f ../../samples/notebook/Makefile.in
+	rm -f ../../samples/access/Makefile.in
+	rm -f ../../samples/shaped/Makefile.in
+	rm -f ../../samples/artprov/Makefile.in
+	rm -f ../../samples/calendar/Makefile.in
 	rm -f ../../samples/caret/Makefile.in
+	rm -f ../../samples/checklst/Makefile.in
+	rm -f ../../samples/config/Makefile.in
+	rm -f ../../samples/console/Makefile.in
+	rm -f ../../samples/controls/Makefile.in
+	rm -f ../../samples/db/Makefile.in
+	rm -f ../../samples/dialogs/Makefile.in
+	rm -f ../../samples/dialup/Makefile.in
+	rm -f ../../samples/dnd/Makefile.in
+	rm -f ../../samples/docview/Makefile.in
+	rm -f ../../samples/docvwmdi/Makefile.in
+	rm -f ../../samples/dragimag/Makefile.in
+	rm -f ../../samples/drawing/Makefile.in
+	rm -f ../../samples/dynamic/Makefile.in
 	rm -f ../../samples/erase/Makefile.in
 	rm -f ../../samples/event/Makefile.in
+	rm -f ../../samples/exec/Makefile.in
+	rm -f ../../samples/font/Makefile.in
+	rm -f ../../samples/display/Makefile.in
+	rm -f ../../samples/grid/Makefile.in
+	rm -f ../../samples/help/Makefile.in
+	rm -f ../../samples/html/Makefile.in
+	rm -f ../../samples/html/about/Makefile.in
+	rm -f ../../samples/html/help/Makefile.in
+	rm -f ../../samples/html/helpview/Makefile.in
+	rm -f ../../samples/html/printing/Makefile.in
+	rm -f ../../samples/html/test/Makefile.in
+	rm -f ../../samples/html/virtual/Makefile.in
+	rm -f ../../samples/html/widget/Makefile.in
+	rm -f ../../samples/html/zip/Makefile.in
 	rm -f ../../samples/image/Makefile.in
-	rm -f ../../samples/sashtest/Makefile.in
-	rm -f ../../samples/docview/Makefile.in
-	rm -f ../../samples/typetest/Makefile.in
-	rm -f ../../samples/drawing/Makefile.in
-	rm -f ../../samples/splitter/Makefile.in
-	rm -f ../../samples/listbox/Makefile.in
-	rm -f ../../samples/multimon/Makefile.in
-	rm -f ../../samples/dynamic/Makefile.in
-	rm -f ../../samples/checklst/Makefile.in
-	rm -f ../../samples/taskbar/Makefile.in
-	rm -f ../../samples/dragimag/Makefile.in
-	rm -f ../../samples/sockets/Makefile.in
-	rm -f ../../samples/calendar/Makefile.in
-	rm -f ../../samples/minimal/Makefile.in
-	rm -f ../../samples/access/Makefile.in
-	rm -f ../../samples/statbar/Makefile.in
-	rm -f ../../samples/config/Makefile.in
-	rm -f ../../samples/dialup/Makefile.in
-	rm -f ../../samples/controls/Makefile.in
-	rm -f ../../samples/richedit/Makefile.in
-	rm -f ../../samples/newgrid/Makefile.in
-	rm -f ../../samples/toolbar/Makefile.in
-	rm -f ../../samples/htlbox/Makefile.in
+	rm -f ../../samples/internat/Makefile.in
+	rm -f ../../samples/ipc/Makefile.in
+	rm -f ../../samples/joytest/Makefile.in
+	rm -f ../../samples/keyboard/Makefile.in
 	rm -f ../../samples/layout/Makefile.in
+	rm -f ../../samples/listbox/Makefile.in
+	rm -f ../../samples/listctrl/Makefile.in
+	rm -f ../../samples/mdi/Makefile.in
+	rm -f ../../samples/memcheck/Makefile.in
+	rm -f ../../samples/menu/Makefile.in
+	rm -f ../../samples/mfc/Makefile.in
 	rm -f ../../samples/minifram/Makefile.in
+	rm -f ../../samples/minimal/Makefile.in
 	rm -f ../../samples/mobile/Makefile.in
-	rm -f ../../samples/opengl/Makefile.in
-	rm -f ../../samples/scroll/Makefile.in
-	rm -f ../../samples/rotate/Makefile.in
-	rm -f ../../samples/shaped/Makefile.in
-	rm -f ../../samples/thread/Makefile.in
-	rm -f ../../samples/wizard/Makefile.in
-	rm -f ../../samples/printing/Makefile.in
+	rm -f ../../samples/multimon/Makefile.in
+	rm -f ../../samples/nativdlg/Makefile.in
+	rm -f ../../samples/newgrid/Makefile.in
+	rm -f ../../samples/notebook/Makefile.in
 	rm -f ../../samples/oleauto/Makefile.in
-	rm -f ../../samples/wxtest/Makefile.in
-	rm -f ../../samples/artprov/Makefile.in
-	rm -f ../../samples/propsize/Makefile.in
+	rm -f ../../samples/opengl/Makefile.in
 	rm -f ../../samples/ownerdrw/Makefile.in
-	rm -f ../../samples/vscroll/Makefile.in
+	rm -f ../../samples/png/Makefile.in
+	rm -f ../../samples/printing/Makefile.in
+	rm -f ../../samples/htlbox/Makefile.in
+	rm -f ../../samples/propsize/Makefile.in
+	rm -f ../../samples/regtest/Makefile.in
+	rm -f ../../samples/richedit/Makefile.in
+	rm -f ../../samples/rotate/Makefile.in
+	rm -f ../../samples/sashtest/Makefile.in
+	rm -f ../../samples/scroll/Makefile.in
+	rm -f ../../samples/scrollsub/Makefile.in
+	rm -f ../../samples/sockets/Makefile.in
+	rm -f ../../samples/splitter/Makefile.in
+	rm -f ../../samples/statbar/Makefile.in
+	rm -f ../../samples/tab/Makefile.in
+	rm -f ../../samples/taskbar/Makefile.in
+	rm -f ../../samples/text/Makefile.in
+	rm -f ../../samples/thread/Makefile.in
+	rm -f ../../samples/toolbar/Makefile.in
+	rm -f ../../samples/treectrl/Makefile.in
+	rm -f ../../samples/typetest/Makefile.in
 	rm -f ../../samples/validate/Makefile.in
 	rm -f ../../samples/widgets/Makefile.in
-	rm -f ../../samples/keyboard/Makefile.in
-	rm -f ../../samples/docvwmdi/Makefile.in
-	rm -f ../../samples/scrollsub/Makefile.in
-	rm -f ../../samples/memcheck/Makefile.in
-	rm -f ../../samples/internat/Makefile.in
-	rm -f ../../contrib/src/fl/Makefile.in
-	rm -f ../../contrib/src/stc/Makefile.in
-	rm -f ../../contrib/src/xrc/Makefile.in
+	rm -f ../../samples/wizard/Makefile.in
+	rm -f ../../samples/wxtest/Makefile.in
+	rm -f ../../samples/vscroll/Makefile.in
 	rm -f ../../contrib/src/gizmos/Makefile.in
+	rm -f ../../contrib/src/xrc/Makefile.in
 	rm -f ../../contrib/src/animate/Makefile.in
-	rm -f ../../contrib/samples/xrc/Makefile.in
+	rm -f ../../contrib/src/stc/Makefile.in
+	rm -f ../../contrib/src/fl/Makefile.in
+	rm -f ../../contrib/src/ogl/Makefile.in
 	rm -f ../../contrib/samples/animate/Makefile.in
+	rm -f ../../contrib/samples/xrc/Makefile.in
 	rm -f ../makefile.bcc
 	rm -f ../../samples/makefile.bcc
-	rm -f ../../samples/db/makefile.bcc
-	rm -f ../../samples/dnd/makefile.bcc
-	rm -f ../../samples/ipc/makefile.bcc
-	rm -f ../../samples/mdi/makefile.bcc
-	rm -f ../../samples/mfc/makefile.bcc
-	rm -f ../../samples/png/makefile.bcc
-	rm -f ../../samples/tab/makefile.bcc
-	rm -f ../../samples/exec/makefile.bcc
-	rm -f ../../samples/font/makefile.bcc
-	rm -f ../../samples/help/makefile.bcc
-	rm -f ../../samples/grid/makefile.bcc
-	rm -f ../../samples/html/makefile.bcc
-	rm -f ../../samples/html/zip/makefile.bcc
-	rm -f ../../samples/html/help/makefile.bcc
-	rm -f ../../samples/html/test/makefile.bcc
-	rm -f ../../samples/html/about/makefile.bcc
-	rm -f ../../samples/html/widget/makefile.bcc
-	rm -f ../../samples/html/printing/makefile.bcc
-	rm -f ../../samples/html/virtual/makefile.bcc
-	rm -f ../../samples/html/helpview/makefile.bcc
-	rm -f ../../samples/menu/makefile.bcc
-	rm -f ../../samples/text/makefile.bcc
-	rm -f ../../samples/console/makefile.bcc
-	rm -f ../../samples/treectrl/makefile.bcc
-	rm -f ../../samples/listctrl/makefile.bcc
-	rm -f ../../samples/joytest/makefile.bcc
-	rm -f ../../samples/regtest/makefile.bcc
-	rm -f ../../samples/dialogs/makefile.bcc
-	rm -f ../../samples/nativdlg/makefile.bcc
-	rm -f ../../samples/display/makefile.bcc
-	rm -f ../../samples/notebook/makefile.bcc
+	rm -f ../../samples/access/makefile.bcc
+	rm -f ../../samples/shaped/makefile.bcc
+	rm -f ../../samples/artprov/makefile.bcc
+	rm -f ../../samples/calendar/makefile.bcc
 	rm -f ../../samples/caret/makefile.bcc
+	rm -f ../../samples/checklst/makefile.bcc
+	rm -f ../../samples/config/makefile.bcc
+	rm -f ../../samples/console/makefile.bcc
+	rm -f ../../samples/controls/makefile.bcc
+	rm -f ../../samples/db/makefile.bcc
+	rm -f ../../samples/dialogs/makefile.bcc
+	rm -f ../../samples/dialup/makefile.bcc
+	rm -f ../../samples/dnd/makefile.bcc
+	rm -f ../../samples/docview/makefile.bcc
+	rm -f ../../samples/docvwmdi/makefile.bcc
+	rm -f ../../samples/dragimag/makefile.bcc
+	rm -f ../../samples/drawing/makefile.bcc
+	rm -f ../../samples/dynamic/makefile.bcc
 	rm -f ../../samples/erase/makefile.bcc
 	rm -f ../../samples/event/makefile.bcc
+	rm -f ../../samples/exec/makefile.bcc
+	rm -f ../../samples/font/makefile.bcc
+	rm -f ../../samples/display/makefile.bcc
+	rm -f ../../samples/grid/makefile.bcc
+	rm -f ../../samples/help/makefile.bcc
+	rm -f ../../samples/html/makefile.bcc
+	rm -f ../../samples/html/about/makefile.bcc
+	rm -f ../../samples/html/help/makefile.bcc
+	rm -f ../../samples/html/helpview/makefile.bcc
+	rm -f ../../samples/html/printing/makefile.bcc
+	rm -f ../../samples/html/test/makefile.bcc
+	rm -f ../../samples/html/virtual/makefile.bcc
+	rm -f ../../samples/html/widget/makefile.bcc
+	rm -f ../../samples/html/zip/makefile.bcc
 	rm -f ../../samples/image/makefile.bcc
-	rm -f ../../samples/sashtest/makefile.bcc
-	rm -f ../../samples/docview/makefile.bcc
-	rm -f ../../samples/typetest/makefile.bcc
-	rm -f ../../samples/drawing/makefile.bcc
-	rm -f ../../samples/splitter/makefile.bcc
-	rm -f ../../samples/listbox/makefile.bcc
-	rm -f ../../samples/multimon/makefile.bcc
-	rm -f ../../samples/dynamic/makefile.bcc
-	rm -f ../../samples/checklst/makefile.bcc
-	rm -f ../../samples/taskbar/makefile.bcc
-	rm -f ../../samples/dragimag/makefile.bcc
-	rm -f ../../samples/sockets/makefile.bcc
-	rm -f ../../samples/calendar/makefile.bcc
-	rm -f ../../samples/minimal/makefile.bcc
-	rm -f ../../samples/access/makefile.bcc
-	rm -f ../../samples/statbar/makefile.bcc
-	rm -f ../../samples/config/makefile.bcc
-	rm -f ../../samples/dialup/makefile.bcc
-	rm -f ../../samples/controls/makefile.bcc
-	rm -f ../../samples/richedit/makefile.bcc
-	rm -f ../../samples/newgrid/makefile.bcc
-	rm -f ../../samples/toolbar/makefile.bcc
-	rm -f ../../samples/htlbox/makefile.bcc
+	rm -f ../../samples/internat/makefile.bcc
+	rm -f ../../samples/ipc/makefile.bcc
+	rm -f ../../samples/joytest/makefile.bcc
+	rm -f ../../samples/keyboard/makefile.bcc
 	rm -f ../../samples/layout/makefile.bcc
+	rm -f ../../samples/listbox/makefile.bcc
+	rm -f ../../samples/listctrl/makefile.bcc
+	rm -f ../../samples/mdi/makefile.bcc
+	rm -f ../../samples/memcheck/makefile.bcc
+	rm -f ../../samples/menu/makefile.bcc
+	rm -f ../../samples/mfc/makefile.bcc
 	rm -f ../../samples/minifram/makefile.bcc
+	rm -f ../../samples/minimal/makefile.bcc
 	rm -f ../../samples/mobile/makefile.bcc
-	rm -f ../../samples/opengl/makefile.bcc
-	rm -f ../../samples/scroll/makefile.bcc
-	rm -f ../../samples/rotate/makefile.bcc
-	rm -f ../../samples/shaped/makefile.bcc
-	rm -f ../../samples/thread/makefile.bcc
-	rm -f ../../samples/wizard/makefile.bcc
-	rm -f ../../samples/printing/makefile.bcc
+	rm -f ../../samples/multimon/makefile.bcc
+	rm -f ../../samples/nativdlg/makefile.bcc
+	rm -f ../../samples/newgrid/makefile.bcc
+	rm -f ../../samples/notebook/makefile.bcc
 	rm -f ../../samples/oleauto/makefile.bcc
-	rm -f ../../samples/wxtest/makefile.bcc
-	rm -f ../../samples/artprov/makefile.bcc
-	rm -f ../../samples/propsize/makefile.bcc
+	rm -f ../../samples/opengl/makefile.bcc
 	rm -f ../../samples/ownerdrw/makefile.bcc
-	rm -f ../../samples/vscroll/makefile.bcc
+	rm -f ../../samples/png/makefile.bcc
+	rm -f ../../samples/printing/makefile.bcc
+	rm -f ../../samples/htlbox/makefile.bcc
+	rm -f ../../samples/propsize/makefile.bcc
+	rm -f ../../samples/regtest/makefile.bcc
+	rm -f ../../samples/richedit/makefile.bcc
+	rm -f ../../samples/rotate/makefile.bcc
+	rm -f ../../samples/sashtest/makefile.bcc
+	rm -f ../../samples/scroll/makefile.bcc
+	rm -f ../../samples/scrollsub/makefile.bcc
+	rm -f ../../samples/sockets/makefile.bcc
+	rm -f ../../samples/splitter/makefile.bcc
+	rm -f ../../samples/statbar/makefile.bcc
+	rm -f ../../samples/tab/makefile.bcc
+	rm -f ../../samples/taskbar/makefile.bcc
+	rm -f ../../samples/text/makefile.bcc
+	rm -f ../../samples/thread/makefile.bcc
+	rm -f ../../samples/toolbar/makefile.bcc
+	rm -f ../../samples/treectrl/makefile.bcc
+	rm -f ../../samples/typetest/makefile.bcc
 	rm -f ../../samples/validate/makefile.bcc
 	rm -f ../../samples/widgets/makefile.bcc
-	rm -f ../../samples/keyboard/makefile.bcc
-	rm -f ../../samples/docvwmdi/makefile.bcc
-	rm -f ../../samples/scrollsub/makefile.bcc
-	rm -f ../../samples/memcheck/makefile.bcc
-	rm -f ../../samples/internat/makefile.bcc
-	rm -f ../../contrib/build/fl/makefile.bcc
-	rm -f ../../contrib/build/stc/makefile.bcc
-	rm -f ../../contrib/build/xrc/makefile.bcc
+	rm -f ../../samples/wizard/makefile.bcc
+	rm -f ../../samples/wxtest/makefile.bcc
+	rm -f ../../samples/vscroll/makefile.bcc
 	rm -f ../../contrib/build/gizmos/makefile.bcc
+	rm -f ../../contrib/build/xrc/makefile.bcc
 	rm -f ../../contrib/build/animate/makefile.bcc
-	rm -f ../../contrib/samples/xrc/makefile.bcc
+	rm -f ../../contrib/build/stc/makefile.bcc
+	rm -f ../../contrib/build/fl/makefile.bcc
+	rm -f ../../contrib/build/ogl/makefile.bcc
 	rm -f ../../contrib/samples/animate/makefile.bcc
+	rm -f ../../contrib/samples/xrc/makefile.bcc
 	rm -f ../makefile.wat
 	rm -f ../../samples/makefile.wat
-	rm -f ../../samples/db/makefile.wat
-	rm -f ../../samples/dnd/makefile.wat
-	rm -f ../../samples/ipc/makefile.wat
-	rm -f ../../samples/mdi/makefile.wat
-	rm -f ../../samples/mfc/makefile.wat
-	rm -f ../../samples/png/makefile.wat
-	rm -f ../../samples/tab/makefile.wat
-	rm -f ../../samples/exec/makefile.wat
-	rm -f ../../samples/font/makefile.wat
-	rm -f ../../samples/help/makefile.wat
-	rm -f ../../samples/grid/makefile.wat
-	rm -f ../../samples/html/makefile.wat
-	rm -f ../../samples/html/zip/makefile.wat
-	rm -f ../../samples/html/help/makefile.wat
-	rm -f ../../samples/html/test/makefile.wat
-	rm -f ../../samples/html/about/makefile.wat
-	rm -f ../../samples/html/widget/makefile.wat
-	rm -f ../../samples/html/printing/makefile.wat
-	rm -f ../../samples/html/virtual/makefile.wat
-	rm -f ../../samples/html/helpview/makefile.wat
-	rm -f ../../samples/menu/makefile.wat
-	rm -f ../../samples/text/makefile.wat
-	rm -f ../../samples/console/makefile.wat
-	rm -f ../../samples/treectrl/makefile.wat
-	rm -f ../../samples/listctrl/makefile.wat
-	rm -f ../../samples/joytest/makefile.wat
-	rm -f ../../samples/regtest/makefile.wat
-	rm -f ../../samples/dialogs/makefile.wat
-	rm -f ../../samples/nativdlg/makefile.wat
-	rm -f ../../samples/display/makefile.wat
-	rm -f ../../samples/notebook/makefile.wat
+	rm -f ../../samples/access/makefile.wat
+	rm -f ../../samples/shaped/makefile.wat
+	rm -f ../../samples/artprov/makefile.wat
+	rm -f ../../samples/calendar/makefile.wat
 	rm -f ../../samples/caret/makefile.wat
+	rm -f ../../samples/checklst/makefile.wat
+	rm -f ../../samples/config/makefile.wat
+	rm -f ../../samples/console/makefile.wat
+	rm -f ../../samples/controls/makefile.wat
+	rm -f ../../samples/db/makefile.wat
+	rm -f ../../samples/dialogs/makefile.wat
+	rm -f ../../samples/dialup/makefile.wat
+	rm -f ../../samples/dnd/makefile.wat
+	rm -f ../../samples/docview/makefile.wat
+	rm -f ../../samples/docvwmdi/makefile.wat
+	rm -f ../../samples/dragimag/makefile.wat
+	rm -f ../../samples/drawing/makefile.wat
+	rm -f ../../samples/dynamic/makefile.wat
 	rm -f ../../samples/erase/makefile.wat
 	rm -f ../../samples/event/makefile.wat
+	rm -f ../../samples/exec/makefile.wat
+	rm -f ../../samples/font/makefile.wat
+	rm -f ../../samples/display/makefile.wat
+	rm -f ../../samples/grid/makefile.wat
+	rm -f ../../samples/help/makefile.wat
+	rm -f ../../samples/html/makefile.wat
+	rm -f ../../samples/html/about/makefile.wat
+	rm -f ../../samples/html/help/makefile.wat
+	rm -f ../../samples/html/helpview/makefile.wat
+	rm -f ../../samples/html/printing/makefile.wat
+	rm -f ../../samples/html/test/makefile.wat
+	rm -f ../../samples/html/virtual/makefile.wat
+	rm -f ../../samples/html/widget/makefile.wat
+	rm -f ../../samples/html/zip/makefile.wat
 	rm -f ../../samples/image/makefile.wat
-	rm -f ../../samples/sashtest/makefile.wat
-	rm -f ../../samples/docview/makefile.wat
-	rm -f ../../samples/typetest/makefile.wat
-	rm -f ../../samples/drawing/makefile.wat
-	rm -f ../../samples/splitter/makefile.wat
-	rm -f ../../samples/listbox/makefile.wat
-	rm -f ../../samples/multimon/makefile.wat
-	rm -f ../../samples/dynamic/makefile.wat
-	rm -f ../../samples/checklst/makefile.wat
-	rm -f ../../samples/taskbar/makefile.wat
-	rm -f ../../samples/dragimag/makefile.wat
-	rm -f ../../samples/sockets/makefile.wat
-	rm -f ../../samples/calendar/makefile.wat
-	rm -f ../../samples/minimal/makefile.wat
-	rm -f ../../samples/access/makefile.wat
-	rm -f ../../samples/statbar/makefile.wat
-	rm -f ../../samples/config/makefile.wat
-	rm -f ../../samples/dialup/makefile.wat
-	rm -f ../../samples/controls/makefile.wat
-	rm -f ../../samples/richedit/makefile.wat
-	rm -f ../../samples/newgrid/makefile.wat
-	rm -f ../../samples/toolbar/makefile.wat
-	rm -f ../../samples/htlbox/makefile.wat
+	rm -f ../../samples/internat/makefile.wat
+	rm -f ../../samples/ipc/makefile.wat
+	rm -f ../../samples/joytest/makefile.wat
+	rm -f ../../samples/keyboard/makefile.wat
 	rm -f ../../samples/layout/makefile.wat
+	rm -f ../../samples/listbox/makefile.wat
+	rm -f ../../samples/listctrl/makefile.wat
+	rm -f ../../samples/mdi/makefile.wat
+	rm -f ../../samples/memcheck/makefile.wat
+	rm -f ../../samples/menu/makefile.wat
+	rm -f ../../samples/mfc/makefile.wat
 	rm -f ../../samples/minifram/makefile.wat
+	rm -f ../../samples/minimal/makefile.wat
 	rm -f ../../samples/mobile/makefile.wat
-	rm -f ../../samples/opengl/makefile.wat
-	rm -f ../../samples/scroll/makefile.wat
-	rm -f ../../samples/rotate/makefile.wat
-	rm -f ../../samples/shaped/makefile.wat
-	rm -f ../../samples/thread/makefile.wat
-	rm -f ../../samples/wizard/makefile.wat
-	rm -f ../../samples/printing/makefile.wat
+	rm -f ../../samples/multimon/makefile.wat
+	rm -f ../../samples/nativdlg/makefile.wat
+	rm -f ../../samples/newgrid/makefile.wat
+	rm -f ../../samples/notebook/makefile.wat
 	rm -f ../../samples/oleauto/makefile.wat
-	rm -f ../../samples/wxtest/makefile.wat
-	rm -f ../../samples/artprov/makefile.wat
-	rm -f ../../samples/propsize/makefile.wat
+	rm -f ../../samples/opengl/makefile.wat
 	rm -f ../../samples/ownerdrw/makefile.wat
-	rm -f ../../samples/vscroll/makefile.wat
+	rm -f ../../samples/png/makefile.wat
+	rm -f ../../samples/printing/makefile.wat
+	rm -f ../../samples/htlbox/makefile.wat
+	rm -f ../../samples/propsize/makefile.wat
+	rm -f ../../samples/regtest/makefile.wat
+	rm -f ../../samples/richedit/makefile.wat
+	rm -f ../../samples/rotate/makefile.wat
+	rm -f ../../samples/sashtest/makefile.wat
+	rm -f ../../samples/scroll/makefile.wat
+	rm -f ../../samples/scrollsub/makefile.wat
+	rm -f ../../samples/sockets/makefile.wat
+	rm -f ../../samples/splitter/makefile.wat
+	rm -f ../../samples/statbar/makefile.wat
+	rm -f ../../samples/tab/makefile.wat
+	rm -f ../../samples/taskbar/makefile.wat
+	rm -f ../../samples/text/makefile.wat
+	rm -f ../../samples/thread/makefile.wat
+	rm -f ../../samples/toolbar/makefile.wat
+	rm -f ../../samples/treectrl/makefile.wat
+	rm -f ../../samples/typetest/makefile.wat
 	rm -f ../../samples/validate/makefile.wat
 	rm -f ../../samples/widgets/makefile.wat
-	rm -f ../../samples/keyboard/makefile.wat
-	rm -f ../../samples/docvwmdi/makefile.wat
-	rm -f ../../samples/scrollsub/makefile.wat
-	rm -f ../../samples/memcheck/makefile.wat
-	rm -f ../../samples/internat/makefile.wat
-	rm -f ../../contrib/build/fl/makefile.wat
-	rm -f ../../contrib/build/stc/makefile.wat
-	rm -f ../../contrib/build/xrc/makefile.wat
+	rm -f ../../samples/wizard/makefile.wat
+	rm -f ../../samples/wxtest/makefile.wat
+	rm -f ../../samples/vscroll/makefile.wat
 	rm -f ../../contrib/build/gizmos/makefile.wat
+	rm -f ../../contrib/build/xrc/makefile.wat
 	rm -f ../../contrib/build/animate/makefile.wat
-	rm -f ../../contrib/samples/xrc/makefile.wat
+	rm -f ../../contrib/build/stc/makefile.wat
+	rm -f ../../contrib/build/fl/makefile.wat
+	rm -f ../../contrib/build/ogl/makefile.wat
 	rm -f ../../contrib/samples/animate/makefile.wat
+	rm -f ../../contrib/samples/xrc/makefile.wat
 
 
 ../../autoconf_inc.m4: ../../Makefile.in
@@ -520,356 +525,116 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  ../../samples/samples.bkl
 	touch $@
 
-../../samples/db/Makefile.in: $(SDEPS) ../../samples/db/db.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl
+../../samples/access/Makefile.in: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl
 	touch $@
-../../samples/db/makefile.bcc: $(SDEPS) ../../samples/db/db.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
+../../samples/access/makefile.bcc: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
 	touch $@
-../../samples/db/makefile.vc: $(SDEPS) ../../samples/db/db.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
+../../samples/access/makefile.vc: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
 	touch $@
-../../samples/db/makefile.gcc: $(SDEPS) ../../samples/db/db.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
+../../samples/access/makefile.gcc: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
 	touch $@
-../../samples/db/makefile.wat: $(SDEPS) ../../samples/db/db.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
+../../samples/access/makefile.wat: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
 	touch $@
 
-../../samples/dnd/Makefile.in: $(SDEPS) ../../samples/dnd/dnd.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl
+../../samples/shaped/Makefile.in: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl
 	touch $@
-../../samples/dnd/makefile.bcc: $(SDEPS) ../../samples/dnd/dnd.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+../../samples/shaped/makefile.bcc: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
 	touch $@
-../../samples/dnd/makefile.vc: $(SDEPS) ../../samples/dnd/dnd.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+../../samples/shaped/makefile.vc: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
 	touch $@
-../../samples/dnd/makefile.gcc: $(SDEPS) ../../samples/dnd/dnd.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+../../samples/shaped/makefile.gcc: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
 	touch $@
-../../samples/dnd/makefile.wat: $(SDEPS) ../../samples/dnd/dnd.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+../../samples/shaped/makefile.wat: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
 	touch $@
 
-../../samples/ipc/Makefile.in: $(SDEPS) ../../samples/ipc/ipc.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl
+../../samples/artprov/Makefile.in: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl
 	touch $@
-../../samples/ipc/makefile.bcc: $(SDEPS) ../../samples/ipc/ipc.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+../../samples/artprov/makefile.bcc: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
 	touch $@
-../../samples/ipc/makefile.vc: $(SDEPS) ../../samples/ipc/ipc.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+../../samples/artprov/makefile.vc: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
 	touch $@
-../../samples/ipc/makefile.gcc: $(SDEPS) ../../samples/ipc/ipc.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+../../samples/artprov/makefile.gcc: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
 	touch $@
-../../samples/ipc/makefile.wat: $(SDEPS) ../../samples/ipc/ipc.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+../../samples/artprov/makefile.wat: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
 	touch $@
 
-../../samples/mdi/Makefile.in: $(SDEPS) ../../samples/mdi/mdi.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl
+../../samples/calendar/Makefile.in: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl
 	touch $@
-../../samples/mdi/makefile.bcc: $(SDEPS) ../../samples/mdi/mdi.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+../../samples/calendar/makefile.bcc: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
 	touch $@
-../../samples/mdi/makefile.vc: $(SDEPS) ../../samples/mdi/mdi.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+../../samples/calendar/makefile.vc: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
 	touch $@
-../../samples/mdi/makefile.gcc: $(SDEPS) ../../samples/mdi/mdi.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+../../samples/calendar/makefile.gcc: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
 	touch $@
-../../samples/mdi/makefile.wat: $(SDEPS) ../../samples/mdi/mdi.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+../../samples/calendar/makefile.wat: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
 	touch $@
 
-../../samples/mfc/Makefile.in: $(SDEPS) ../../samples/mfc/mfc.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl
+../../samples/caret/Makefile.in: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl
 	touch $@
-../../samples/mfc/makefile.bcc: $(SDEPS) ../../samples/mfc/mfc.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+../../samples/caret/makefile.bcc: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
 	touch $@
-../../samples/mfc/makefile.vc: $(SDEPS) ../../samples/mfc/mfc.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+../../samples/caret/makefile.vc: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
 	touch $@
-../../samples/mfc/makefile.gcc: $(SDEPS) ../../samples/mfc/mfc.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+../../samples/caret/makefile.gcc: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
 	touch $@
-../../samples/mfc/makefile.wat: $(SDEPS) ../../samples/mfc/mfc.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+../../samples/caret/makefile.wat: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
 	touch $@
 
-../../samples/png/Makefile.in: $(SDEPS) ../../samples/png/png.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl
+../../samples/checklst/Makefile.in: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl
 	touch $@
-../../samples/png/makefile.bcc: $(SDEPS) ../../samples/png/png.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
+../../samples/checklst/makefile.bcc: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
 	touch $@
-../../samples/png/makefile.vc: $(SDEPS) ../../samples/png/png.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
+../../samples/checklst/makefile.vc: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
 	touch $@
-../../samples/png/makefile.gcc: $(SDEPS) ../../samples/png/png.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
+../../samples/checklst/makefile.gcc: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
 	touch $@
-../../samples/png/makefile.wat: $(SDEPS) ../../samples/png/png.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
+../../samples/checklst/makefile.wat: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
 	touch $@
 
-../../samples/tab/Makefile.in: $(SDEPS) ../../samples/tab/tab.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl
+../../samples/config/Makefile.in: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl
 	touch $@
-../../samples/tab/makefile.bcc: $(SDEPS) ../../samples/tab/tab.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+../../samples/config/makefile.bcc: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
 	touch $@
-../../samples/tab/makefile.vc: $(SDEPS) ../../samples/tab/tab.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+../../samples/config/makefile.vc: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
 	touch $@
-../../samples/tab/makefile.gcc: $(SDEPS) ../../samples/tab/tab.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+../../samples/config/makefile.gcc: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
 	touch $@
-../../samples/tab/makefile.wat: $(SDEPS) ../../samples/tab/tab.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
-	touch $@
-
-../../samples/exec/Makefile.in: $(SDEPS) ../../samples/exec/exec.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl
-	touch $@
-../../samples/exec/makefile.bcc: $(SDEPS) ../../samples/exec/exec.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
-	touch $@
-../../samples/exec/makefile.vc: $(SDEPS) ../../samples/exec/exec.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
-	touch $@
-../../samples/exec/makefile.gcc: $(SDEPS) ../../samples/exec/exec.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
-	touch $@
-../../samples/exec/makefile.wat: $(SDEPS) ../../samples/exec/exec.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
-	touch $@
-
-../../samples/font/Makefile.in: $(SDEPS) ../../samples/font/font.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl
-	touch $@
-../../samples/font/makefile.bcc: $(SDEPS) ../../samples/font/font.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
-	touch $@
-../../samples/font/makefile.vc: $(SDEPS) ../../samples/font/font.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
-	touch $@
-../../samples/font/makefile.gcc: $(SDEPS) ../../samples/font/font.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
-	touch $@
-../../samples/font/makefile.wat: $(SDEPS) ../../samples/font/font.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
-	touch $@
-
-../../samples/help/Makefile.in: $(SDEPS) ../../samples/help/help.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl
-	touch $@
-../../samples/help/makefile.bcc: $(SDEPS) ../../samples/help/help.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
-	touch $@
-../../samples/help/makefile.vc: $(SDEPS) ../../samples/help/help.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
-	touch $@
-../../samples/help/makefile.gcc: $(SDEPS) ../../samples/help/help.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
-	touch $@
-../../samples/help/makefile.wat: $(SDEPS) ../../samples/help/help.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
-	touch $@
-
-../../samples/grid/Makefile.in: $(SDEPS) ../../samples/grid/grid.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl
-	touch $@
-../../samples/grid/makefile.bcc: $(SDEPS) ../../samples/grid/grid.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
-	touch $@
-../../samples/grid/makefile.vc: $(SDEPS) ../../samples/grid/grid.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
-	touch $@
-../../samples/grid/makefile.gcc: $(SDEPS) ../../samples/grid/grid.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
-	touch $@
-../../samples/grid/makefile.wat: $(SDEPS) ../../samples/grid/grid.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
-	touch $@
-
-../../samples/html/Makefile.in: $(SDEPS) ../../samples/html/html_samples.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/html_samples.bkl
-	touch $@
-../../samples/html/makefile.bcc: $(SDEPS) ../../samples/html/html_samples.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
-	touch $@
-../../samples/html/makefile.vc: $(SDEPS) ../../samples/html/html_samples.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
-	touch $@
-../../samples/html/makefile.gcc: $(SDEPS) ../../samples/html/html_samples.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
-	touch $@
-../../samples/html/makefile.wat: $(SDEPS) ../../samples/html/html_samples.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
-	touch $@
-
-../../samples/html/zip/Makefile.in: $(SDEPS) ../../samples/html/zip/zip.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/zip/zip.bkl
-	touch $@
-../../samples/html/zip/makefile.bcc: $(SDEPS) ../../samples/html/zip/zip.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
-	touch $@
-../../samples/html/zip/makefile.vc: $(SDEPS) ../../samples/html/zip/zip.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
-	touch $@
-../../samples/html/zip/makefile.gcc: $(SDEPS) ../../samples/html/zip/zip.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
-	touch $@
-../../samples/html/zip/makefile.wat: $(SDEPS) ../../samples/html/zip/zip.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
-	touch $@
-
-../../samples/html/help/Makefile.in: $(SDEPS) ../../samples/html/help/help.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/help/help.bkl
-	touch $@
-../../samples/html/help/makefile.bcc: $(SDEPS) ../../samples/html/help/help.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
-	touch $@
-../../samples/html/help/makefile.vc: $(SDEPS) ../../samples/html/help/help.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
-	touch $@
-../../samples/html/help/makefile.gcc: $(SDEPS) ../../samples/html/help/help.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
-	touch $@
-../../samples/html/help/makefile.wat: $(SDEPS) ../../samples/html/help/help.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
-	touch $@
-
-../../samples/html/test/Makefile.in: $(SDEPS) ../../samples/html/test/test.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/test/test.bkl
-	touch $@
-../../samples/html/test/makefile.bcc: $(SDEPS) ../../samples/html/test/test.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
-	touch $@
-../../samples/html/test/makefile.vc: $(SDEPS) ../../samples/html/test/test.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
-	touch $@
-../../samples/html/test/makefile.gcc: $(SDEPS) ../../samples/html/test/test.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
-	touch $@
-../../samples/html/test/makefile.wat: $(SDEPS) ../../samples/html/test/test.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
-	touch $@
-
-../../samples/html/about/Makefile.in: $(SDEPS) ../../samples/html/about/about.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/about/about.bkl
-	touch $@
-../../samples/html/about/makefile.bcc: $(SDEPS) ../../samples/html/about/about.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
-	touch $@
-../../samples/html/about/makefile.vc: $(SDEPS) ../../samples/html/about/about.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
-	touch $@
-../../samples/html/about/makefile.gcc: $(SDEPS) ../../samples/html/about/about.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
-	touch $@
-../../samples/html/about/makefile.wat: $(SDEPS) ../../samples/html/about/about.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
-	touch $@
-
-../../samples/html/widget/Makefile.in: $(SDEPS) ../../samples/html/widget/widget.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/widget/widget.bkl
-	touch $@
-../../samples/html/widget/makefile.bcc: $(SDEPS) ../../samples/html/widget/widget.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
-	touch $@
-../../samples/html/widget/makefile.vc: $(SDEPS) ../../samples/html/widget/widget.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
-	touch $@
-../../samples/html/widget/makefile.gcc: $(SDEPS) ../../samples/html/widget/widget.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
-	touch $@
-../../samples/html/widget/makefile.wat: $(SDEPS) ../../samples/html/widget/widget.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
-	touch $@
-
-../../samples/html/printing/Makefile.in: $(SDEPS) ../../samples/html/printing/printing.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/printing/printing.bkl
-	touch $@
-../../samples/html/printing/makefile.bcc: $(SDEPS) ../../samples/html/printing/printing.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
-	touch $@
-../../samples/html/printing/makefile.vc: $(SDEPS) ../../samples/html/printing/printing.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
-	touch $@
-../../samples/html/printing/makefile.gcc: $(SDEPS) ../../samples/html/printing/printing.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
-	touch $@
-../../samples/html/printing/makefile.wat: $(SDEPS) ../../samples/html/printing/printing.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
-	touch $@
-
-../../samples/html/virtual/Makefile.in: $(SDEPS) ../../samples/html/virtual/virtual.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/virtual/virtual.bkl
-	touch $@
-../../samples/html/virtual/makefile.bcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
-	touch $@
-../../samples/html/virtual/makefile.vc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
-	touch $@
-../../samples/html/virtual/makefile.gcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
-	touch $@
-../../samples/html/virtual/makefile.wat: $(SDEPS) ../../samples/html/virtual/virtual.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
-	touch $@
-
-../../samples/html/helpview/Makefile.in: $(SDEPS) ../../samples/html/helpview/helpview.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/helpview/helpview.bkl
-	touch $@
-../../samples/html/helpview/makefile.bcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
-	touch $@
-../../samples/html/helpview/makefile.vc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
-	touch $@
-../../samples/html/helpview/makefile.gcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
-	touch $@
-../../samples/html/helpview/makefile.wat: $(SDEPS) ../../samples/html/helpview/helpview.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
-	touch $@
-
-../../samples/menu/Makefile.in: $(SDEPS) ../../samples/menu/menu.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl
-	touch $@
-../../samples/menu/makefile.bcc: $(SDEPS) ../../samples/menu/menu.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
-	touch $@
-../../samples/menu/makefile.vc: $(SDEPS) ../../samples/menu/menu.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
-	touch $@
-../../samples/menu/makefile.gcc: $(SDEPS) ../../samples/menu/menu.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
-	touch $@
-../../samples/menu/makefile.wat: $(SDEPS) ../../samples/menu/menu.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
-	touch $@
-
-../../samples/text/Makefile.in: $(SDEPS) ../../samples/text/text.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl
-	touch $@
-../../samples/text/makefile.bcc: $(SDEPS) ../../samples/text/text.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
-	touch $@
-../../samples/text/makefile.vc: $(SDEPS) ../../samples/text/text.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
-	touch $@
-../../samples/text/makefile.gcc: $(SDEPS) ../../samples/text/text.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
-	touch $@
-../../samples/text/makefile.wat: $(SDEPS) ../../samples/text/text.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
+../../samples/config/makefile.wat: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
 	touch $@
 
 ../../samples/console/Makefile.in: $(SDEPS) ../../samples/console/console.bkl
@@ -888,68 +653,36 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/console/console.bkl
 	touch $@
 
-../../samples/treectrl/Makefile.in: $(SDEPS) ../../samples/treectrl/treectrl.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl
+../../samples/controls/Makefile.in: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl
 	touch $@
-../../samples/treectrl/makefile.bcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+../../samples/controls/makefile.bcc: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
 	touch $@
-../../samples/treectrl/makefile.vc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+../../samples/controls/makefile.vc: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
 	touch $@
-../../samples/treectrl/makefile.gcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+../../samples/controls/makefile.gcc: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
 	touch $@
-../../samples/treectrl/makefile.wat: $(SDEPS) ../../samples/treectrl/treectrl.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+../../samples/controls/makefile.wat: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
 	touch $@
 
-../../samples/listctrl/Makefile.in: $(SDEPS) ../../samples/listctrl/listctrl.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl
+../../samples/db/Makefile.in: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl
 	touch $@
-../../samples/listctrl/makefile.bcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+../../samples/db/makefile.bcc: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
 	touch $@
-../../samples/listctrl/makefile.vc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+../../samples/db/makefile.vc: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
 	touch $@
-../../samples/listctrl/makefile.gcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+../../samples/db/makefile.gcc: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
 	touch $@
-../../samples/listctrl/makefile.wat: $(SDEPS) ../../samples/listctrl/listctrl.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
-	touch $@
-
-../../samples/joytest/Makefile.in: $(SDEPS) ../../samples/joytest/joytest.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl
-	touch $@
-../../samples/joytest/makefile.bcc: $(SDEPS) ../../samples/joytest/joytest.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
-	touch $@
-../../samples/joytest/makefile.vc: $(SDEPS) ../../samples/joytest/joytest.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
-	touch $@
-../../samples/joytest/makefile.gcc: $(SDEPS) ../../samples/joytest/joytest.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
-	touch $@
-../../samples/joytest/makefile.wat: $(SDEPS) ../../samples/joytest/joytest.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
-	touch $@
-
-../../samples/regtest/Makefile.in: $(SDEPS) ../../samples/regtest/regtest.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl
-	touch $@
-../../samples/regtest/makefile.bcc: $(SDEPS) ../../samples/regtest/regtest.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
-	touch $@
-../../samples/regtest/makefile.vc: $(SDEPS) ../../samples/regtest/regtest.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
-	touch $@
-../../samples/regtest/makefile.gcc: $(SDEPS) ../../samples/regtest/regtest.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
-	touch $@
-../../samples/regtest/makefile.wat: $(SDEPS) ../../samples/regtest/regtest.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+../../samples/db/makefile.wat: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/db/db.bkl
 	touch $@
 
 ../../samples/dialogs/Makefile.in: $(SDEPS) ../../samples/dialogs/dialogs.bkl
@@ -968,68 +701,116 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
 	touch $@
 
-../../samples/nativdlg/Makefile.in: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl
+../../samples/dialup/Makefile.in: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl
 	touch $@
-../../samples/nativdlg/makefile.bcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+../../samples/dialup/makefile.bcc: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
 	touch $@
-../../samples/nativdlg/makefile.vc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+../../samples/dialup/makefile.vc: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
 	touch $@
-../../samples/nativdlg/makefile.gcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+../../samples/dialup/makefile.gcc: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
 	touch $@
-../../samples/nativdlg/makefile.wat: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+../../samples/dialup/makefile.wat: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
 	touch $@
 
-../../samples/display/Makefile.in: $(SDEPS) ../../samples/display/display.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl
+../../samples/dnd/Makefile.in: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl
 	touch $@
-../../samples/display/makefile.bcc: $(SDEPS) ../../samples/display/display.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+../../samples/dnd/makefile.bcc: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
 	touch $@
-../../samples/display/makefile.vc: $(SDEPS) ../../samples/display/display.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+../../samples/dnd/makefile.vc: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
 	touch $@
-../../samples/display/makefile.gcc: $(SDEPS) ../../samples/display/display.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+../../samples/dnd/makefile.gcc: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
 	touch $@
-../../samples/display/makefile.wat: $(SDEPS) ../../samples/display/display.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+../../samples/dnd/makefile.wat: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
 	touch $@
 
-../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl
+../../samples/docview/Makefile.in: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl
 	touch $@
-../../samples/notebook/makefile.bcc: $(SDEPS) ../../samples/notebook/notebook.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+../../samples/docview/makefile.bcc: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
 	touch $@
-../../samples/notebook/makefile.vc: $(SDEPS) ../../samples/notebook/notebook.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+../../samples/docview/makefile.vc: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
 	touch $@
-../../samples/notebook/makefile.gcc: $(SDEPS) ../../samples/notebook/notebook.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+../../samples/docview/makefile.gcc: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
 	touch $@
-../../samples/notebook/makefile.wat: $(SDEPS) ../../samples/notebook/notebook.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+../../samples/docview/makefile.wat: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
 	touch $@
 
-../../samples/caret/Makefile.in: $(SDEPS) ../../samples/caret/caret.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl
+../../samples/docvwmdi/Makefile.in: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl
 	touch $@
-../../samples/caret/makefile.bcc: $(SDEPS) ../../samples/caret/caret.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+../../samples/docvwmdi/makefile.bcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
 	touch $@
-../../samples/caret/makefile.vc: $(SDEPS) ../../samples/caret/caret.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+../../samples/docvwmdi/makefile.vc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
 	touch $@
-../../samples/caret/makefile.gcc: $(SDEPS) ../../samples/caret/caret.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+../../samples/docvwmdi/makefile.gcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
 	touch $@
-../../samples/caret/makefile.wat: $(SDEPS) ../../samples/caret/caret.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+../../samples/docvwmdi/makefile.wat: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+	touch $@
+
+../../samples/dragimag/Makefile.in: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl
+	touch $@
+../../samples/dragimag/makefile.bcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+	touch $@
+../../samples/dragimag/makefile.vc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+	touch $@
+../../samples/dragimag/makefile.gcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+	touch $@
+../../samples/dragimag/makefile.wat: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+	touch $@
+
+../../samples/drawing/Makefile.in: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl
+	touch $@
+../../samples/drawing/makefile.bcc: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+	touch $@
+../../samples/drawing/makefile.vc: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+	touch $@
+../../samples/drawing/makefile.gcc: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+	touch $@
+../../samples/drawing/makefile.wat: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+	touch $@
+
+../../samples/dynamic/Makefile.in: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl
+	touch $@
+../../samples/dynamic/makefile.bcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+	touch $@
+../../samples/dynamic/makefile.vc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+	touch $@
+../../samples/dynamic/makefile.gcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+	touch $@
+../../samples/dynamic/makefile.wat: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
 	touch $@
 
 ../../samples/erase/Makefile.in: $(SDEPS) ../../samples/erase/erase.bkl
@@ -1064,6 +845,230 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/event/event.bkl
 	touch $@
 
+../../samples/exec/Makefile.in: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl
+	touch $@
+../../samples/exec/makefile.bcc: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+	touch $@
+../../samples/exec/makefile.vc: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+	touch $@
+../../samples/exec/makefile.gcc: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+	touch $@
+../../samples/exec/makefile.wat: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+	touch $@
+
+../../samples/font/Makefile.in: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl
+	touch $@
+../../samples/font/makefile.bcc: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
+	touch $@
+../../samples/font/makefile.vc: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
+	touch $@
+../../samples/font/makefile.gcc: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
+	touch $@
+../../samples/font/makefile.wat: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/font/font.bkl
+	touch $@
+
+../../samples/display/Makefile.in: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl
+	touch $@
+../../samples/display/makefile.bcc: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+	touch $@
+../../samples/display/makefile.vc: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+	touch $@
+../../samples/display/makefile.gcc: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+	touch $@
+../../samples/display/makefile.wat: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/display/display.bkl
+	touch $@
+
+../../samples/grid/Makefile.in: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl
+	touch $@
+../../samples/grid/makefile.bcc: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+	touch $@
+../../samples/grid/makefile.vc: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+	touch $@
+../../samples/grid/makefile.gcc: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+	touch $@
+../../samples/grid/makefile.wat: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+	touch $@
+
+../../samples/help/Makefile.in: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl
+	touch $@
+../../samples/help/makefile.bcc: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
+	touch $@
+../../samples/help/makefile.vc: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
+	touch $@
+../../samples/help/makefile.gcc: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
+	touch $@
+../../samples/help/makefile.wat: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/help/help.bkl
+	touch $@
+
+../../samples/html/Makefile.in: $(SDEPS) ../../samples/html/html_samples.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/html_samples.bkl
+	touch $@
+../../samples/html/makefile.bcc: $(SDEPS) ../../samples/html/html_samples.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+	touch $@
+../../samples/html/makefile.vc: $(SDEPS) ../../samples/html/html_samples.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+	touch $@
+../../samples/html/makefile.gcc: $(SDEPS) ../../samples/html/html_samples.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+	touch $@
+../../samples/html/makefile.wat: $(SDEPS) ../../samples/html/html_samples.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+	touch $@
+
+../../samples/html/about/Makefile.in: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/about/about.bkl
+	touch $@
+../../samples/html/about/makefile.bcc: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+	touch $@
+../../samples/html/about/makefile.vc: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+	touch $@
+../../samples/html/about/makefile.gcc: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+	touch $@
+../../samples/html/about/makefile.wat: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+	touch $@
+
+../../samples/html/help/Makefile.in: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/help/help.bkl
+	touch $@
+../../samples/html/help/makefile.bcc: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+	touch $@
+../../samples/html/help/makefile.vc: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+	touch $@
+../../samples/html/help/makefile.gcc: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+	touch $@
+../../samples/html/help/makefile.wat: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+	touch $@
+
+../../samples/html/helpview/Makefile.in: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/helpview/helpview.bkl
+	touch $@
+../../samples/html/helpview/makefile.bcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+	touch $@
+../../samples/html/helpview/makefile.vc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+	touch $@
+../../samples/html/helpview/makefile.gcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+	touch $@
+../../samples/html/helpview/makefile.wat: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+	touch $@
+
+../../samples/html/printing/Makefile.in: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/printing/printing.bkl
+	touch $@
+../../samples/html/printing/makefile.bcc: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+	touch $@
+../../samples/html/printing/makefile.vc: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+	touch $@
+../../samples/html/printing/makefile.gcc: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+	touch $@
+../../samples/html/printing/makefile.wat: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+	touch $@
+
+../../samples/html/test/Makefile.in: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/test/test.bkl
+	touch $@
+../../samples/html/test/makefile.bcc: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+	touch $@
+../../samples/html/test/makefile.vc: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+	touch $@
+../../samples/html/test/makefile.gcc: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+	touch $@
+../../samples/html/test/makefile.wat: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+	touch $@
+
+../../samples/html/virtual/Makefile.in: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/virtual/virtual.bkl
+	touch $@
+../../samples/html/virtual/makefile.bcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+	touch $@
+../../samples/html/virtual/makefile.vc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+	touch $@
+../../samples/html/virtual/makefile.gcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+	touch $@
+../../samples/html/virtual/makefile.wat: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+	touch $@
+
+../../samples/html/widget/Makefile.in: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/widget/widget.bkl
+	touch $@
+../../samples/html/widget/makefile.bcc: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+	touch $@
+../../samples/html/widget/makefile.vc: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+	touch $@
+../../samples/html/widget/makefile.gcc: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+	touch $@
+../../samples/html/widget/makefile.wat: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+	touch $@
+
+../../samples/html/zip/Makefile.in: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/zip/zip.bkl
+	touch $@
+../../samples/html/zip/makefile.bcc: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+	touch $@
+../../samples/html/zip/makefile.vc: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+	touch $@
+../../samples/html/zip/makefile.gcc: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+	touch $@
+../../samples/html/zip/makefile.wat: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+	touch $@
+
 ../../samples/image/Makefile.in: $(SDEPS) ../../samples/image/image.bkl
 	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/image/image.bkl
 	touch $@
@@ -1080,372 +1085,68 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/image/image.bkl
 	touch $@
 
-../../samples/sashtest/Makefile.in: $(SDEPS) ../../samples/sashtest/sashtest.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl
+../../samples/internat/Makefile.in: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl
 	touch $@
-../../samples/sashtest/makefile.bcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+../../samples/internat/makefile.bcc: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
 	touch $@
-../../samples/sashtest/makefile.vc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+../../samples/internat/makefile.vc: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
 	touch $@
-../../samples/sashtest/makefile.gcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+../../samples/internat/makefile.gcc: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
 	touch $@
-../../samples/sashtest/makefile.wat: $(SDEPS) ../../samples/sashtest/sashtest.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+../../samples/internat/makefile.wat: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
 	touch $@
 
-../../samples/docview/Makefile.in: $(SDEPS) ../../samples/docview/docview.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl
+../../samples/ipc/Makefile.in: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl
 	touch $@
-../../samples/docview/makefile.bcc: $(SDEPS) ../../samples/docview/docview.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+../../samples/ipc/makefile.bcc: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
 	touch $@
-../../samples/docview/makefile.vc: $(SDEPS) ../../samples/docview/docview.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+../../samples/ipc/makefile.vc: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
 	touch $@
-../../samples/docview/makefile.gcc: $(SDEPS) ../../samples/docview/docview.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+../../samples/ipc/makefile.gcc: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
 	touch $@
-../../samples/docview/makefile.wat: $(SDEPS) ../../samples/docview/docview.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+../../samples/ipc/makefile.wat: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
 	touch $@
 
-../../samples/typetest/Makefile.in: $(SDEPS) ../../samples/typetest/typetest.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl
+../../samples/joytest/Makefile.in: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl
 	touch $@
-../../samples/typetest/makefile.bcc: $(SDEPS) ../../samples/typetest/typetest.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+../../samples/joytest/makefile.bcc: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
 	touch $@
-../../samples/typetest/makefile.vc: $(SDEPS) ../../samples/typetest/typetest.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+../../samples/joytest/makefile.vc: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
 	touch $@
-../../samples/typetest/makefile.gcc: $(SDEPS) ../../samples/typetest/typetest.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+../../samples/joytest/makefile.gcc: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
 	touch $@
-../../samples/typetest/makefile.wat: $(SDEPS) ../../samples/typetest/typetest.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+../../samples/joytest/makefile.wat: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
 	touch $@
 
-../../samples/drawing/Makefile.in: $(SDEPS) ../../samples/drawing/drawing.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl
+../../samples/keyboard/Makefile.in: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl
 	touch $@
-../../samples/drawing/makefile.bcc: $(SDEPS) ../../samples/drawing/drawing.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+../../samples/keyboard/makefile.bcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
 	touch $@
-../../samples/drawing/makefile.vc: $(SDEPS) ../../samples/drawing/drawing.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+../../samples/keyboard/makefile.vc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
 	touch $@
-../../samples/drawing/makefile.gcc: $(SDEPS) ../../samples/drawing/drawing.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+../../samples/keyboard/makefile.gcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
 	touch $@
-../../samples/drawing/makefile.wat: $(SDEPS) ../../samples/drawing/drawing.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
-	touch $@
-
-../../samples/splitter/Makefile.in: $(SDEPS) ../../samples/splitter/splitter.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl
-	touch $@
-../../samples/splitter/makefile.bcc: $(SDEPS) ../../samples/splitter/splitter.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
-	touch $@
-../../samples/splitter/makefile.vc: $(SDEPS) ../../samples/splitter/splitter.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
-	touch $@
-../../samples/splitter/makefile.gcc: $(SDEPS) ../../samples/splitter/splitter.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
-	touch $@
-../../samples/splitter/makefile.wat: $(SDEPS) ../../samples/splitter/splitter.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
-	touch $@
-
-../../samples/listbox/Makefile.in: $(SDEPS) ../../samples/listbox/listbox.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl
-	touch $@
-../../samples/listbox/makefile.bcc: $(SDEPS) ../../samples/listbox/listbox.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
-	touch $@
-../../samples/listbox/makefile.vc: $(SDEPS) ../../samples/listbox/listbox.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
-	touch $@
-../../samples/listbox/makefile.gcc: $(SDEPS) ../../samples/listbox/listbox.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
-	touch $@
-../../samples/listbox/makefile.wat: $(SDEPS) ../../samples/listbox/listbox.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
-	touch $@
-
-../../samples/multimon/Makefile.in: $(SDEPS) ../../samples/multimon/multimon.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl
-	touch $@
-../../samples/multimon/makefile.bcc: $(SDEPS) ../../samples/multimon/multimon.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
-	touch $@
-../../samples/multimon/makefile.vc: $(SDEPS) ../../samples/multimon/multimon.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
-	touch $@
-../../samples/multimon/makefile.gcc: $(SDEPS) ../../samples/multimon/multimon.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
-	touch $@
-../../samples/multimon/makefile.wat: $(SDEPS) ../../samples/multimon/multimon.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
-	touch $@
-
-../../samples/dynamic/Makefile.in: $(SDEPS) ../../samples/dynamic/dynamic.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl
-	touch $@
-../../samples/dynamic/makefile.bcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
-	touch $@
-../../samples/dynamic/makefile.vc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
-	touch $@
-../../samples/dynamic/makefile.gcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
-	touch $@
-../../samples/dynamic/makefile.wat: $(SDEPS) ../../samples/dynamic/dynamic.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
-	touch $@
-
-../../samples/checklst/Makefile.in: $(SDEPS) ../../samples/checklst/checklst.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl
-	touch $@
-../../samples/checklst/makefile.bcc: $(SDEPS) ../../samples/checklst/checklst.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
-	touch $@
-../../samples/checklst/makefile.vc: $(SDEPS) ../../samples/checklst/checklst.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
-	touch $@
-../../samples/checklst/makefile.gcc: $(SDEPS) ../../samples/checklst/checklst.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
-	touch $@
-../../samples/checklst/makefile.wat: $(SDEPS) ../../samples/checklst/checklst.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
-	touch $@
-
-../../samples/taskbar/Makefile.in: $(SDEPS) ../../samples/taskbar/taskbar.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl
-	touch $@
-../../samples/taskbar/makefile.bcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
-	touch $@
-../../samples/taskbar/makefile.vc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
-	touch $@
-../../samples/taskbar/makefile.gcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
-	touch $@
-../../samples/taskbar/makefile.wat: $(SDEPS) ../../samples/taskbar/taskbar.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
-	touch $@
-
-../../samples/dragimag/Makefile.in: $(SDEPS) ../../samples/dragimag/dragimag.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl
-	touch $@
-../../samples/dragimag/makefile.bcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
-	touch $@
-../../samples/dragimag/makefile.vc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
-	touch $@
-../../samples/dragimag/makefile.gcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
-	touch $@
-../../samples/dragimag/makefile.wat: $(SDEPS) ../../samples/dragimag/dragimag.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
-	touch $@
-
-../../samples/sockets/Makefile.in: $(SDEPS) ../../samples/sockets/sockets.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl
-	touch $@
-../../samples/sockets/makefile.bcc: $(SDEPS) ../../samples/sockets/sockets.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
-	touch $@
-../../samples/sockets/makefile.vc: $(SDEPS) ../../samples/sockets/sockets.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
-	touch $@
-../../samples/sockets/makefile.gcc: $(SDEPS) ../../samples/sockets/sockets.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
-	touch $@
-../../samples/sockets/makefile.wat: $(SDEPS) ../../samples/sockets/sockets.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
-	touch $@
-
-../../samples/calendar/Makefile.in: $(SDEPS) ../../samples/calendar/calendar.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl
-	touch $@
-../../samples/calendar/makefile.bcc: $(SDEPS) ../../samples/calendar/calendar.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
-	touch $@
-../../samples/calendar/makefile.vc: $(SDEPS) ../../samples/calendar/calendar.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
-	touch $@
-../../samples/calendar/makefile.gcc: $(SDEPS) ../../samples/calendar/calendar.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
-	touch $@
-../../samples/calendar/makefile.wat: $(SDEPS) ../../samples/calendar/calendar.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
-	touch $@
-
-../../samples/minimal/Makefile.in: $(SDEPS) ../../samples/minimal/minimal.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl
-	touch $@
-../../samples/minimal/makefile.bcc: $(SDEPS) ../../samples/minimal/minimal.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
-	touch $@
-../../samples/minimal/makefile.vc: $(SDEPS) ../../samples/minimal/minimal.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
-	touch $@
-../../samples/minimal/makefile.gcc: $(SDEPS) ../../samples/minimal/minimal.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
-	touch $@
-../../samples/minimal/makefile.wat: $(SDEPS) ../../samples/minimal/minimal.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
-	touch $@
-
-../../samples/access/Makefile.in: $(SDEPS) ../../samples/access/access.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl
-	touch $@
-../../samples/access/makefile.bcc: $(SDEPS) ../../samples/access/access.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
-	touch $@
-../../samples/access/makefile.vc: $(SDEPS) ../../samples/access/access.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
-	touch $@
-../../samples/access/makefile.gcc: $(SDEPS) ../../samples/access/access.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
-	touch $@
-../../samples/access/makefile.wat: $(SDEPS) ../../samples/access/access.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/access/access.bkl
-	touch $@
-
-../../samples/statbar/Makefile.in: $(SDEPS) ../../samples/statbar/statbar.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl
-	touch $@
-../../samples/statbar/makefile.bcc: $(SDEPS) ../../samples/statbar/statbar.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
-	touch $@
-../../samples/statbar/makefile.vc: $(SDEPS) ../../samples/statbar/statbar.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
-	touch $@
-../../samples/statbar/makefile.gcc: $(SDEPS) ../../samples/statbar/statbar.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
-	touch $@
-../../samples/statbar/makefile.wat: $(SDEPS) ../../samples/statbar/statbar.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
-	touch $@
-
-../../samples/config/Makefile.in: $(SDEPS) ../../samples/config/config.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl
-	touch $@
-../../samples/config/makefile.bcc: $(SDEPS) ../../samples/config/config.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
-	touch $@
-../../samples/config/makefile.vc: $(SDEPS) ../../samples/config/config.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
-	touch $@
-../../samples/config/makefile.gcc: $(SDEPS) ../../samples/config/config.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
-	touch $@
-../../samples/config/makefile.wat: $(SDEPS) ../../samples/config/config.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/config/config.bkl
-	touch $@
-
-../../samples/dialup/Makefile.in: $(SDEPS) ../../samples/dialup/dialup.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl
-	touch $@
-../../samples/dialup/makefile.bcc: $(SDEPS) ../../samples/dialup/dialup.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
-	touch $@
-../../samples/dialup/makefile.vc: $(SDEPS) ../../samples/dialup/dialup.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
-	touch $@
-../../samples/dialup/makefile.gcc: $(SDEPS) ../../samples/dialup/dialup.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
-	touch $@
-../../samples/dialup/makefile.wat: $(SDEPS) ../../samples/dialup/dialup.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
-	touch $@
-
-../../samples/controls/Makefile.in: $(SDEPS) ../../samples/controls/controls.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl
-	touch $@
-../../samples/controls/makefile.bcc: $(SDEPS) ../../samples/controls/controls.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
-	touch $@
-../../samples/controls/makefile.vc: $(SDEPS) ../../samples/controls/controls.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
-	touch $@
-../../samples/controls/makefile.gcc: $(SDEPS) ../../samples/controls/controls.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
-	touch $@
-../../samples/controls/makefile.wat: $(SDEPS) ../../samples/controls/controls.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
-	touch $@
-
-../../samples/richedit/Makefile.in: $(SDEPS) ../../samples/richedit/richedit.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl
-	touch $@
-../../samples/richedit/makefile.bcc: $(SDEPS) ../../samples/richedit/richedit.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
-	touch $@
-../../samples/richedit/makefile.vc: $(SDEPS) ../../samples/richedit/richedit.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
-	touch $@
-../../samples/richedit/makefile.gcc: $(SDEPS) ../../samples/richedit/richedit.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
-	touch $@
-../../samples/richedit/makefile.wat: $(SDEPS) ../../samples/richedit/richedit.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
-	touch $@
-
-../../samples/newgrid/Makefile.in: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl
-	touch $@
-../../samples/newgrid/makefile.bcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-	touch $@
-../../samples/newgrid/makefile.vc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-	touch $@
-../../samples/newgrid/makefile.gcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-	touch $@
-../../samples/newgrid/makefile.wat: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-	touch $@
-
-../../samples/toolbar/Makefile.in: $(SDEPS) ../../samples/toolbar/toolbar.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl
-	touch $@
-../../samples/toolbar/makefile.bcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
-	touch $@
-../../samples/toolbar/makefile.vc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
-	touch $@
-../../samples/toolbar/makefile.gcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
-	touch $@
-../../samples/toolbar/makefile.wat: $(SDEPS) ../../samples/toolbar/toolbar.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
-	touch $@
-
-../../samples/htlbox/Makefile.in: $(SDEPS) ../../samples/htlbox/htlbox.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl
-	touch $@
-../../samples/htlbox/makefile.bcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
-	touch $@
-../../samples/htlbox/makefile.vc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
-	touch $@
-../../samples/htlbox/makefile.gcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
-	touch $@
-../../samples/htlbox/makefile.wat: $(SDEPS) ../../samples/htlbox/htlbox.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+../../samples/keyboard/makefile.wat: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
 	touch $@
 
 ../../samples/layout/Makefile.in: $(SDEPS) ../../samples/layout/layout.bkl
@@ -1464,6 +1165,102 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
 	touch $@
 
+../../samples/listbox/Makefile.in: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl
+	touch $@
+../../samples/listbox/makefile.bcc: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+	touch $@
+../../samples/listbox/makefile.vc: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+	touch $@
+../../samples/listbox/makefile.gcc: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+	touch $@
+../../samples/listbox/makefile.wat: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+	touch $@
+
+../../samples/listctrl/Makefile.in: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl
+	touch $@
+../../samples/listctrl/makefile.bcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+	touch $@
+../../samples/listctrl/makefile.vc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+	touch $@
+../../samples/listctrl/makefile.gcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+	touch $@
+../../samples/listctrl/makefile.wat: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+	touch $@
+
+../../samples/mdi/Makefile.in: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl
+	touch $@
+../../samples/mdi/makefile.bcc: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+	touch $@
+../../samples/mdi/makefile.vc: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+	touch $@
+../../samples/mdi/makefile.gcc: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+	touch $@
+../../samples/mdi/makefile.wat: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+	touch $@
+
+../../samples/memcheck/Makefile.in: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl
+	touch $@
+../../samples/memcheck/makefile.bcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+	touch $@
+../../samples/memcheck/makefile.vc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+	touch $@
+../../samples/memcheck/makefile.gcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+	touch $@
+../../samples/memcheck/makefile.wat: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+	touch $@
+
+../../samples/menu/Makefile.in: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl
+	touch $@
+../../samples/menu/makefile.bcc: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+	touch $@
+../../samples/menu/makefile.vc: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+	touch $@
+../../samples/menu/makefile.gcc: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+	touch $@
+../../samples/menu/makefile.wat: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+	touch $@
+
+../../samples/mfc/Makefile.in: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl
+	touch $@
+../../samples/mfc/makefile.bcc: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+	touch $@
+../../samples/mfc/makefile.vc: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+	touch $@
+../../samples/mfc/makefile.gcc: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+	touch $@
+../../samples/mfc/makefile.wat: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+	touch $@
+
 ../../samples/minifram/Makefile.in: $(SDEPS) ../../samples/minifram/minifram.bkl
 	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minifram/minifram.bkl
 	touch $@
@@ -1480,6 +1277,22 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
 	touch $@
 
+../../samples/minimal/Makefile.in: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl
+	touch $@
+../../samples/minimal/makefile.bcc: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+	touch $@
+../../samples/minimal/makefile.vc: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+	touch $@
+../../samples/minimal/makefile.gcc: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+	touch $@
+../../samples/minimal/makefile.wat: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+	touch $@
+
 ../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile.bkl
 	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile.bkl
 	touch $@
@@ -1496,116 +1309,68 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
 	touch $@
 
-../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl.bkl
+../../samples/multimon/Makefile.in: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl
 	touch $@
-../../samples/opengl/makefile.bcc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/multimon/makefile.bcc: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
 	touch $@
-../../samples/opengl/makefile.vc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/multimon/makefile.vc: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
 	touch $@
-../../samples/opengl/makefile.gcc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/multimon/makefile.gcc: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
 	touch $@
-../../samples/opengl/makefile.wat: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/multimon/makefile.wat: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
 	touch $@
 
-../../samples/scroll/Makefile.in: $(SDEPS) ../../samples/scroll/scroll.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl
+../../samples/nativdlg/Makefile.in: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl
 	touch $@
-../../samples/scroll/makefile.bcc: $(SDEPS) ../../samples/scroll/scroll.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+../../samples/nativdlg/makefile.bcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
 	touch $@
-../../samples/scroll/makefile.vc: $(SDEPS) ../../samples/scroll/scroll.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+../../samples/nativdlg/makefile.vc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
 	touch $@
-../../samples/scroll/makefile.gcc: $(SDEPS) ../../samples/scroll/scroll.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+../../samples/nativdlg/makefile.gcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
 	touch $@
-../../samples/scroll/makefile.wat: $(SDEPS) ../../samples/scroll/scroll.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+../../samples/nativdlg/makefile.wat: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
 	touch $@
 
-../../samples/rotate/Makefile.in: $(SDEPS) ../../samples/rotate/rotate.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl
+../../samples/newgrid/Makefile.in: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl
 	touch $@
-../../samples/rotate/makefile.bcc: $(SDEPS) ../../samples/rotate/rotate.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+../../samples/newgrid/makefile.bcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
 	touch $@
-../../samples/rotate/makefile.vc: $(SDEPS) ../../samples/rotate/rotate.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+../../samples/newgrid/makefile.vc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
 	touch $@
-../../samples/rotate/makefile.gcc: $(SDEPS) ../../samples/rotate/rotate.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+../../samples/newgrid/makefile.gcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
 	touch $@
-../../samples/rotate/makefile.wat: $(SDEPS) ../../samples/rotate/rotate.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+../../samples/newgrid/makefile.wat: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
 	touch $@
 
-../../samples/shaped/Makefile.in: $(SDEPS) ../../samples/shaped/shaped.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl
+../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl
 	touch $@
-../../samples/shaped/makefile.bcc: $(SDEPS) ../../samples/shaped/shaped.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+../../samples/notebook/makefile.bcc: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
 	touch $@
-../../samples/shaped/makefile.vc: $(SDEPS) ../../samples/shaped/shaped.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+../../samples/notebook/makefile.vc: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
 	touch $@
-../../samples/shaped/makefile.gcc: $(SDEPS) ../../samples/shaped/shaped.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+../../samples/notebook/makefile.gcc: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
 	touch $@
-../../samples/shaped/makefile.wat: $(SDEPS) ../../samples/shaped/shaped.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
-	touch $@
-
-../../samples/thread/Makefile.in: $(SDEPS) ../../samples/thread/thread.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl
-	touch $@
-../../samples/thread/makefile.bcc: $(SDEPS) ../../samples/thread/thread.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
-	touch $@
-../../samples/thread/makefile.vc: $(SDEPS) ../../samples/thread/thread.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
-	touch $@
-../../samples/thread/makefile.gcc: $(SDEPS) ../../samples/thread/thread.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
-	touch $@
-../../samples/thread/makefile.wat: $(SDEPS) ../../samples/thread/thread.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
-	touch $@
-
-../../samples/wizard/Makefile.in: $(SDEPS) ../../samples/wizard/wizard.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl
-	touch $@
-../../samples/wizard/makefile.bcc: $(SDEPS) ../../samples/wizard/wizard.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
-	touch $@
-../../samples/wizard/makefile.vc: $(SDEPS) ../../samples/wizard/wizard.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
-	touch $@
-../../samples/wizard/makefile.gcc: $(SDEPS) ../../samples/wizard/wizard.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
-	touch $@
-../../samples/wizard/makefile.wat: $(SDEPS) ../../samples/wizard/wizard.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
-	touch $@
-
-../../samples/printing/Makefile.in: $(SDEPS) ../../samples/printing/printing.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl
-	touch $@
-../../samples/printing/makefile.bcc: $(SDEPS) ../../samples/printing/printing.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
-	touch $@
-../../samples/printing/makefile.vc: $(SDEPS) ../../samples/printing/printing.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
-	touch $@
-../../samples/printing/makefile.gcc: $(SDEPS) ../../samples/printing/printing.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
-	touch $@
-../../samples/printing/makefile.wat: $(SDEPS) ../../samples/printing/printing.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+../../samples/notebook/makefile.wat: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
 	touch $@
 
 ../../samples/oleauto/Makefile.in: $(SDEPS) ../../samples/oleauto/oleauto.bkl
@@ -1624,52 +1389,20 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
 	touch $@
 
-../../samples/wxtest/Makefile.in: $(SDEPS) ../../samples/wxtest/wxtest.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl
+../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl.bkl
 	touch $@
-../../samples/wxtest/makefile.bcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+../../samples/opengl/makefile.bcc: $(SDEPS) ../../samples/opengl/opengl.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
 	touch $@
-../../samples/wxtest/makefile.vc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+../../samples/opengl/makefile.vc: $(SDEPS) ../../samples/opengl/opengl.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
 	touch $@
-../../samples/wxtest/makefile.gcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+../../samples/opengl/makefile.gcc: $(SDEPS) ../../samples/opengl/opengl.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
 	touch $@
-../../samples/wxtest/makefile.wat: $(SDEPS) ../../samples/wxtest/wxtest.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
-	touch $@
-
-../../samples/artprov/Makefile.in: $(SDEPS) ../../samples/artprov/artprov.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl
-	touch $@
-../../samples/artprov/makefile.bcc: $(SDEPS) ../../samples/artprov/artprov.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
-	touch $@
-../../samples/artprov/makefile.vc: $(SDEPS) ../../samples/artprov/artprov.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
-	touch $@
-../../samples/artprov/makefile.gcc: $(SDEPS) ../../samples/artprov/artprov.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
-	touch $@
-../../samples/artprov/makefile.wat: $(SDEPS) ../../samples/artprov/artprov.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
-	touch $@
-
-../../samples/propsize/Makefile.in: $(SDEPS) ../../samples/propsize/propsize.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl
-	touch $@
-../../samples/propsize/makefile.bcc: $(SDEPS) ../../samples/propsize/propsize.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
-	touch $@
-../../samples/propsize/makefile.vc: $(SDEPS) ../../samples/propsize/propsize.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
-	touch $@
-../../samples/propsize/makefile.gcc: $(SDEPS) ../../samples/propsize/propsize.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
-	touch $@
-../../samples/propsize/makefile.wat: $(SDEPS) ../../samples/propsize/propsize.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+../../samples/opengl/makefile.wat: $(SDEPS) ../../samples/opengl/opengl.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
 	touch $@
 
 ../../samples/ownerdrw/Makefile.in: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
@@ -1688,20 +1421,324 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
 	touch $@
 
-../../samples/vscroll/Makefile.in: $(SDEPS) ../../samples/vscroll/vscroll.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl
+../../samples/png/Makefile.in: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl
 	touch $@
-../../samples/vscroll/makefile.bcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+../../samples/png/makefile.bcc: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
 	touch $@
-../../samples/vscroll/makefile.vc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+../../samples/png/makefile.vc: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
 	touch $@
-../../samples/vscroll/makefile.gcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+../../samples/png/makefile.gcc: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
 	touch $@
-../../samples/vscroll/makefile.wat: $(SDEPS) ../../samples/vscroll/vscroll.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+../../samples/png/makefile.wat: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/png/png.bkl
+	touch $@
+
+../../samples/printing/Makefile.in: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl
+	touch $@
+../../samples/printing/makefile.bcc: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+	touch $@
+../../samples/printing/makefile.vc: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+	touch $@
+../../samples/printing/makefile.gcc: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+	touch $@
+../../samples/printing/makefile.wat: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+	touch $@
+
+../../samples/htlbox/Makefile.in: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl
+	touch $@
+../../samples/htlbox/makefile.bcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+	touch $@
+../../samples/htlbox/makefile.vc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+	touch $@
+../../samples/htlbox/makefile.gcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+	touch $@
+../../samples/htlbox/makefile.wat: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+	touch $@
+
+../../samples/propsize/Makefile.in: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl
+	touch $@
+../../samples/propsize/makefile.bcc: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+	touch $@
+../../samples/propsize/makefile.vc: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+	touch $@
+../../samples/propsize/makefile.gcc: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+	touch $@
+../../samples/propsize/makefile.wat: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+	touch $@
+
+../../samples/regtest/Makefile.in: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl
+	touch $@
+../../samples/regtest/makefile.bcc: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+	touch $@
+../../samples/regtest/makefile.vc: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+	touch $@
+../../samples/regtest/makefile.gcc: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+	touch $@
+../../samples/regtest/makefile.wat: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+	touch $@
+
+../../samples/richedit/Makefile.in: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl
+	touch $@
+../../samples/richedit/makefile.bcc: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+	touch $@
+../../samples/richedit/makefile.vc: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+	touch $@
+../../samples/richedit/makefile.gcc: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+	touch $@
+../../samples/richedit/makefile.wat: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+	touch $@
+
+../../samples/rotate/Makefile.in: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl
+	touch $@
+../../samples/rotate/makefile.bcc: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+	touch $@
+../../samples/rotate/makefile.vc: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+	touch $@
+../../samples/rotate/makefile.gcc: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+	touch $@
+../../samples/rotate/makefile.wat: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+	touch $@
+
+../../samples/sashtest/Makefile.in: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl
+	touch $@
+../../samples/sashtest/makefile.bcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+	touch $@
+../../samples/sashtest/makefile.vc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+	touch $@
+../../samples/sashtest/makefile.gcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+	touch $@
+../../samples/sashtest/makefile.wat: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+	touch $@
+
+../../samples/scroll/Makefile.in: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl
+	touch $@
+../../samples/scroll/makefile.bcc: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+	touch $@
+../../samples/scroll/makefile.vc: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+	touch $@
+../../samples/scroll/makefile.gcc: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+	touch $@
+../../samples/scroll/makefile.wat: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+	touch $@
+
+../../samples/scrollsub/Makefile.in: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl
+	touch $@
+../../samples/scrollsub/makefile.bcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+	touch $@
+../../samples/scrollsub/makefile.vc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+	touch $@
+../../samples/scrollsub/makefile.gcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+	touch $@
+../../samples/scrollsub/makefile.wat: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+	touch $@
+
+../../samples/sockets/Makefile.in: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl
+	touch $@
+../../samples/sockets/makefile.bcc: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+	touch $@
+../../samples/sockets/makefile.vc: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+	touch $@
+../../samples/sockets/makefile.gcc: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+	touch $@
+../../samples/sockets/makefile.wat: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+	touch $@
+
+../../samples/splitter/Makefile.in: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl
+	touch $@
+../../samples/splitter/makefile.bcc: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+	touch $@
+../../samples/splitter/makefile.vc: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+	touch $@
+../../samples/splitter/makefile.gcc: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+	touch $@
+../../samples/splitter/makefile.wat: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+	touch $@
+
+../../samples/statbar/Makefile.in: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl
+	touch $@
+../../samples/statbar/makefile.bcc: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+	touch $@
+../../samples/statbar/makefile.vc: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+	touch $@
+../../samples/statbar/makefile.gcc: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+	touch $@
+../../samples/statbar/makefile.wat: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+	touch $@
+
+../../samples/tab/Makefile.in: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl
+	touch $@
+../../samples/tab/makefile.bcc: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+	touch $@
+../../samples/tab/makefile.vc: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+	touch $@
+../../samples/tab/makefile.gcc: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+	touch $@
+../../samples/tab/makefile.wat: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+	touch $@
+
+../../samples/taskbar/Makefile.in: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl
+	touch $@
+../../samples/taskbar/makefile.bcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+	touch $@
+../../samples/taskbar/makefile.vc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+	touch $@
+../../samples/taskbar/makefile.gcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+	touch $@
+../../samples/taskbar/makefile.wat: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+	touch $@
+
+../../samples/text/Makefile.in: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl
+	touch $@
+../../samples/text/makefile.bcc: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
+	touch $@
+../../samples/text/makefile.vc: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
+	touch $@
+../../samples/text/makefile.gcc: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
+	touch $@
+../../samples/text/makefile.wat: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/text/text.bkl
+	touch $@
+
+../../samples/thread/Makefile.in: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl
+	touch $@
+../../samples/thread/makefile.bcc: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+	touch $@
+../../samples/thread/makefile.vc: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+	touch $@
+../../samples/thread/makefile.gcc: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+	touch $@
+../../samples/thread/makefile.wat: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+	touch $@
+
+../../samples/toolbar/Makefile.in: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl
+	touch $@
+../../samples/toolbar/makefile.bcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+	touch $@
+../../samples/toolbar/makefile.vc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+	touch $@
+../../samples/toolbar/makefile.gcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+	touch $@
+../../samples/toolbar/makefile.wat: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+	touch $@
+
+../../samples/treectrl/Makefile.in: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl
+	touch $@
+../../samples/treectrl/makefile.bcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+	touch $@
+../../samples/treectrl/makefile.vc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+	touch $@
+../../samples/treectrl/makefile.gcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+	touch $@
+../../samples/treectrl/makefile.wat: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+	touch $@
+
+../../samples/typetest/Makefile.in: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl
+	touch $@
+../../samples/typetest/makefile.bcc: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+	touch $@
+../../samples/typetest/makefile.vc: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+	touch $@
+../../samples/typetest/makefile.gcc: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+	touch $@
+../../samples/typetest/makefile.wat: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
 	touch $@
 
 ../../samples/validate/Makefile.in: $(SDEPS) ../../samples/validate/validate.bkl
@@ -1736,132 +1773,52 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
 	touch $@
 
-../../samples/keyboard/Makefile.in: $(SDEPS) ../../samples/keyboard/keyboard.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl
+../../samples/wizard/Makefile.in: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl
 	touch $@
-../../samples/keyboard/makefile.bcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+../../samples/wizard/makefile.bcc: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
 	touch $@
-../../samples/keyboard/makefile.vc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+../../samples/wizard/makefile.vc: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
 	touch $@
-../../samples/keyboard/makefile.gcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+../../samples/wizard/makefile.gcc: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
 	touch $@
-../../samples/keyboard/makefile.wat: $(SDEPS) ../../samples/keyboard/keyboard.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+../../samples/wizard/makefile.wat: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
 	touch $@
 
-../../samples/docvwmdi/Makefile.in: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl
+../../samples/wxtest/Makefile.in: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl
 	touch $@
-../../samples/docvwmdi/makefile.bcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+../../samples/wxtest/makefile.bcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
 	touch $@
-../../samples/docvwmdi/makefile.vc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+../../samples/wxtest/makefile.vc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
 	touch $@
-../../samples/docvwmdi/makefile.gcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+../../samples/wxtest/makefile.gcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
 	touch $@
-../../samples/docvwmdi/makefile.wat: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+../../samples/wxtest/makefile.wat: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
 	touch $@
 
-../../samples/scrollsub/Makefile.in: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl
+../../samples/vscroll/Makefile.in: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl
 	touch $@
-../../samples/scrollsub/makefile.bcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+../../samples/vscroll/makefile.bcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
 	touch $@
-../../samples/scrollsub/makefile.vc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+../../samples/vscroll/makefile.vc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
 	touch $@
-../../samples/scrollsub/makefile.gcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+../../samples/vscroll/makefile.gcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
 	touch $@
-../../samples/scrollsub/makefile.wat: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
-	touch $@
-
-../../samples/memcheck/Makefile.in: $(SDEPS) ../../samples/memcheck/memcheck.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl
-	touch $@
-../../samples/memcheck/makefile.bcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
-	touch $@
-../../samples/memcheck/makefile.vc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
-	touch $@
-../../samples/memcheck/makefile.gcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
-	touch $@
-../../samples/memcheck/makefile.wat: $(SDEPS) ../../samples/memcheck/memcheck.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
-	touch $@
-
-../../samples/internat/Makefile.in: $(SDEPS) ../../samples/internat/internat.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl
-	touch $@
-../../samples/internat/makefile.bcc: $(SDEPS) ../../samples/internat/internat.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
-	touch $@
-../../samples/internat/makefile.vc: $(SDEPS) ../../samples/internat/internat.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
-	touch $@
-../../samples/internat/makefile.gcc: $(SDEPS) ../../samples/internat/internat.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
-	touch $@
-../../samples/internat/makefile.wat: $(SDEPS) ../../samples/internat/internat.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
-	touch $@
-
-../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/fl/fl.bkl
-	touch $@
-../../contrib/build/fl/makefile.bcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
-	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
-	touch $@
-../../contrib/build/fl/makefile.vc: $(CDEPS) ../../contrib/build/fl/fl.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
-	touch $@
-../../contrib/build/fl/makefile.gcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
-	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
-	touch $@
-../../contrib/build/fl/makefile.wat: $(CDEPS) ../../contrib/build/fl/fl.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
-	touch $@
-
-../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/stc/stc.bkl
-	touch $@
-../../contrib/build/stc/makefile.bcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
-	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
-	touch $@
-../../contrib/build/stc/makefile.vc: $(CDEPS) ../../contrib/build/stc/stc.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
-	touch $@
-../../contrib/build/stc/makefile.gcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
-	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
-	touch $@
-../../contrib/build/stc/makefile.wat: $(CDEPS) ../../contrib/build/stc/stc.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
-	touch $@
-
-../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
-	touch $@
-../../contrib/build/xrc/makefile.bcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
-	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
-	touch $@
-../../contrib/build/xrc/makefile.vc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
-	touch $@
-../../contrib/build/xrc/makefile.gcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
-	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
-	touch $@
-../../contrib/build/xrc/makefile.wat: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+../../samples/vscroll/makefile.wat: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
 	touch $@
 
 ../../contrib/src/gizmos/Makefile.in: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
@@ -1880,6 +1837,22 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
 	touch $@
 
+../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
+	touch $@
+../../contrib/build/xrc/makefile.bcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+	touch $@
+../../contrib/build/xrc/makefile.vc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+	touch $@
+../../contrib/build/xrc/makefile.gcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+	touch $@
+../../contrib/build/xrc/makefile.wat: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+	touch $@
+
 ../../contrib/src/animate/Makefile.in: $(CDEPS) ../../contrib/build/animate/animate.bkl
 	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/animate/animate.bkl
 	touch $@
@@ -1896,20 +1869,52 @@ Makefile: regenMakefile.py
 	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
 	touch $@
 
-../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/xrc/xrcdemo.bkl
+../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/stc/stc.bkl
 	touch $@
-../../contrib/samples/xrc/makefile.bcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
-	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+../../contrib/build/stc/makefile.bcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
 	touch $@
-../../contrib/samples/xrc/makefile.vc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+../../contrib/build/stc/makefile.vc: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
 	touch $@
-../../contrib/samples/xrc/makefile.gcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
-	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+../../contrib/build/stc/makefile.gcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
 	touch $@
-../../contrib/samples/xrc/makefile.wat: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+../../contrib/build/stc/makefile.wat: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
+	touch $@
+
+../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/fl/fl.bkl
+	touch $@
+../../contrib/build/fl/makefile.bcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+	touch $@
+../../contrib/build/fl/makefile.vc: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+	touch $@
+../../contrib/build/fl/makefile.gcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+	touch $@
+../../contrib/build/fl/makefile.wat: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+	touch $@
+
+../../contrib/src/ogl/Makefile.in: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/ogl/ogl.bkl
+	touch $@
+../../contrib/build/ogl/makefile.bcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fborland -o$@  -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+	touch $@
+../../contrib/build/ogl/makefile.vc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+	touch $@
+../../contrib/build/ogl/makefile.gcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fmingw -o$@  -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+	touch $@
+../../contrib/build/ogl/makefile.wat: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
 	touch $@
 
 ../../contrib/samples/animate/Makefile.in: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
@@ -1927,3 +1932,19 @@ Makefile: regenMakefile.py
 ../../contrib/samples/animate/makefile.wat: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
 	touch $@
+
+../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
+../../contrib/samples/xrc/makefile.bcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
+../../contrib/samples/xrc/makefile.vc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
+../../contrib/samples/xrc/makefile.gcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
+../../contrib/samples/xrc/makefile.wat: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
diff --git a/build/makefile.bcc b/build/makefile.bcc
index 3312dffa67..fde352d746 100644
--- a/build/makefile.bcc
+++ b/build/makefile.bcc
@@ -325,52 +325,53 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.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
+	$(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj \
+	$(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
+	$(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj \
+	$(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj \
+	$(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj \
+	$(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj \
+	$(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj \
+	$(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj \
+	$(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj \
+	$(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj \
+	$(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj \
+	$(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj \
+	$(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj \
+	$(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj \
+	$(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj \
+	$(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj \
+	$(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj \
+	$(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj \
+	$(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj \
+	$(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj \
+	$(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj \
+	$(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj \
+	$(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj \
+	$(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj \
+	$(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj \
+	$(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj \
+	$(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj \
+	$(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj \
+	$(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj \
+	$(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj \
+	$(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj \
+	$(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj \
+	$(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj \
+	$(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj \
+	$(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj \
+	$(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \
@@ -425,52 +426,53 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.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
+	$(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj \
+	$(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
+	$(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj \
+	$(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj \
+	$(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj \
+	$(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj \
+	$(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj \
+	$(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj \
+	$(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj \
+	$(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj \
+	$(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj \
+	$(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj \
+	$(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj \
+	$(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj \
+	$(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj \
+	$(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj \
+	$(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj \
+	$(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj \
+	$(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj \
+	$(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj \
+	$(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj \
+	$(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj \
+	$(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj \
+	$(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj \
+	$(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj \
+	$(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj \
+	$(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj \
+	$(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj \
+	$(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj \
+	$(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj \
+	$(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj \
+	$(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj \
+	$(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj \
+	$(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj \
+	$(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj \
+	$(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \
@@ -526,52 +528,53 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.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
+	$(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj \
+	$(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj \
+	$(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj \
+	$(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
+	$(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
+	$(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj \
+	$(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj \
+	$(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj \
+	$(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj \
+	$(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj \
+	$(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj \
+	$(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj \
+	$(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj \
+	$(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj \
+	$(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj \
+	$(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj \
+	$(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj \
+	$(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj \
+	$(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj \
+	$(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj \
+	$(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj \
+	$(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj \
+	$(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj \
+	$(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj \
+	$(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj \
+	$(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj \
+	$(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj \
+	$(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj \
+	$(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj \
+	$(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj \
+	$(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj \
+	$(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj \
+	$(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj \
+	$(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj \
+	$(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj \
+	$(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj \
+	$(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj \
+	$(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj \
+	$(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj \
+	$(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \
@@ -626,52 +629,53 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.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
+	$(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj \
+	$(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj \
+	$(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj \
+	$(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
+	$(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
+	$(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj \
+	$(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj \
+	$(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj \
+	$(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj \
+	$(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj \
+	$(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj \
+	$(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj \
+	$(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj \
+	$(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj \
+	$(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj \
+	$(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj \
+	$(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj \
+	$(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj \
+	$(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj \
+	$(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj \
+	$(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj \
+	$(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj \
+	$(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj \
+	$(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj \
+	$(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj \
+	$(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj \
+	$(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj \
+	$(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj \
+	$(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj \
+	$(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj \
+	$(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj \
+	$(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj \
+	$(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj \
+	$(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj \
+	$(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj \
+	$(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj \
+	$(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj \
+	$(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj \
+	$(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj \
+	$(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj \
@@ -727,52 +731,53 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.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
+	$(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj \
+	$(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj \
+	$(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj \
+	$(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
+	$(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
+	$(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj \
+	$(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj \
+	$(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj \
+	$(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj \
+	$(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj \
+	$(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj \
+	$(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj \
+	$(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
+	$(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
+	$(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
+	$(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj \
+	$(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj \
+	$(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj \
+	$(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj \
+	$(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
+	$(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
+	$(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
+	$(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj \
+	$(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj \
+	$(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj \
+	$(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
+	$(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
+	$(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
+	$(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
+	$(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
+	$(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj \
+	$(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj \
+	$(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj \
+	$(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj \
+	$(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
+	$(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
+	$(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
+	$(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj \
+	$(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj \
+	$(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj \
@@ -827,52 +832,53 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.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
+	$(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj \
+	$(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj \
+	$(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj \
+	$(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
+	$(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
+	$(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj \
+	$(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj \
+	$(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj \
+	$(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj \
+	$(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj \
+	$(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj \
+	$(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj \
+	$(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
+	$(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
+	$(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
+	$(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj \
+	$(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj \
+	$(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj \
+	$(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj \
+	$(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
+	$(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
+	$(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
+	$(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj \
+	$(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj \
+	$(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj \
+	$(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
+	$(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
+	$(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
+	$(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
+	$(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
+	$(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj \
+	$(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj \
+	$(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj \
+	$(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj \
+	$(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
+	$(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
+	$(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
+	$(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj \
+	$(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj \
+	$(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj \
@@ -928,52 +934,53 @@ ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.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
+	$(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj \
+	$(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
+	$(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj \
+	$(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj \
+	$(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj \
+	$(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj \
+	$(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj \
+	$(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj \
+	$(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
+	$(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
+	$(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
+	$(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
+	$(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
+	$(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
+	$(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
+	$(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
+	$(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
+	$(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
+	$(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj \
+	$(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj \
+	$(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj \
+	$(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
+	$(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
+	$(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
+	$(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
+	$(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
+	$(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
+	$(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
+	$(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
+	$(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
+	$(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
+	$(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
+	$(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
+	$(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj \
+	$(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj \
+	$(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj \
@@ -1028,52 +1035,53 @@ ____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.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
+	$(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj \
+	$(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
+	$(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj \
+	$(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj \
+	$(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj \
+	$(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj \
+	$(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj \
+	$(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj \
+	$(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
+	$(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
+	$(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
+	$(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
+	$(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
+	$(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
+	$(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
+	$(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
+	$(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
+	$(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
+	$(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj \
+	$(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj \
+	$(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj \
+	$(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
+	$(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
+	$(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
+	$(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
+	$(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
+	$(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
+	$(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
+	$(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
+	$(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
+	$(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
+	$(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
+	$(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
+	$(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj \
+	$(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj \
+	$(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
@@ -1995,6 +2003,11 @@ $(OBJS)\coredll_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\coredll_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -3151,6 +3164,11 @@ $(OBJS)\corelib_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\corelib_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -4496,6 +4514,11 @@ $(OBJS)\monodll_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\monodll_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5943,6 +5966,11 @@ $(OBJS)\monolib_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\monolib_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7361,7 +7389,7 @@ $(OBJS)\wxzlib_zutil.obj: ..\src\zlib\zutil.c
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\baselib_dummy.obj $(OBJS)\baselib_dummy.obj $(OBJS)\baselib_appbase.obj $(OBJS)\baselib_clntdata.obj $(OBJS)\baselib_cmdline.obj $(OBJS)\baselib_config.obj $(OBJS)\baselib_datetime.obj $(OBJS)\baselib_datstrm.obj $(OBJS)\baselib_db.obj $(OBJS)\baselib_dbtable.obj $(OBJS)\baselib_dircmn.obj $(OBJS)\baselib_dynarray.obj $(OBJS)\baselib_dynlib.obj $(OBJS)\baselib_dynload.obj $(OBJS)\baselib_encconv.obj $(OBJS)\baselib_extended.obj $(OBJS)\baselib_ffile.obj $(OBJS)\baselib_file.obj $(OBJS)\baselib_fileconf.obj $(OBJS)\baselib_filefn.obj $(OBJS)\baselib_filename.obj $(OBJS)\baselib_filesys.obj $(OBJS)\baselib_fmapbase.obj $(OBJS)\baselib_fs_inet.obj $(OBJS)\baselib_fs_zip.obj $(OBJS)\baselib_ftp.obj $(OBJS)\baselib_hash.obj $(OBJS)\baselib_hashmap.obj $(OBJS)\baselib_http.obj $(OBJS)\baselib_init.obj $(OBJS)\baselib_intl.obj $(OBJS)\baselib_ipcbase.obj $(OBJS)\baselib_list.obj $(OBJS)\baselib_log.obj $(OBJS)\baselib_longlong.obj $(OBJS)\baselib_memory.obj $(OBJS)\baselib_mimecmn.obj $(OBJS)\baselib_module.obj $(OBJS)\baselib_mstream.obj $(OBJS)\baselib_object.obj $(OBJS)\baselib_process.obj $(OBJS)\baselib_protocol.obj $(OBJS)\baselib_regex.obj $(OBJS)\baselib_sckaddr.obj $(OBJS)\baselib_sckfile.obj $(OBJS)\baselib_sckipc.obj $(OBJS)\baselib_sckstrm.obj $(OBJS)\baselib_socket.obj $(OBJS)\baselib_stopwatch.obj $(OBJS)\baselib_strconv.obj $(OBJS)\baselib_stream.obj $(OBJS)\baselib_string.obj $(OBJS)\baselib_sysopt.obj $(OBJS)\baselib_textbuf.obj $(OBJS)\baselib_textfile.obj $(OBJS)\baselib_tokenzr.obj $(OBJS)\baselib_txtstrm.obj $(OBJS)\baselib_unzip.obj $(OBJS)\baselib_url.obj $(OBJS)\baselib_variant.obj $(OBJS)\baselib_wfstream.obj $(OBJS)\baselib_wxchar.obj $(OBJS)\baselib_zipstrm.obj $(OBJS)\baselib_zstream.obj $(OBJS)\baselib_gsocket.obj $(OBJS)\baselib_gsockmsw.obj $(OBJS)\baselib_basemsw.obj $(OBJS)\baselib_dde.obj $(OBJS)\baselib_dir.obj $(OBJS)\baselib_mimetype.obj $(OBJS)\baselib_regconf.obj $(OBJS)\baselib_registry.obj $(OBJS)\baselib_snglinst.obj $(OBJS)\baselib_thread.obj $(OBJS)\baselib_utils.obj $(OBJS)\baselib_utilsexc.obj $(OBJS)\baselib_crashrpt.obj $(OBJS)\baselib_event.obj $(OBJS)\baselib_fs_mem.obj $(OBJS)\baselib_msgout.obj $(OBJS)\baselib_utilscmn.obj $(OBJS)\baselib_main.obj $(OBJS)\baselib_mslu.obj $(OBJS)\baselib_volume.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\baselib_dummy.obj $(OBJS)\baselib_appbase.obj $(OBJS)\baselib_clntdata.obj $(OBJS)\baselib_cmdline.obj $(OBJS)\baselib_config.obj $(OBJS)\baselib_datetime.obj $(OBJS)\baselib_datstrm.obj $(OBJS)\baselib_db.obj $(OBJS)\baselib_dbtable.obj $(OBJS)\baselib_dircmn.obj $(OBJS)\baselib_dynarray.obj $(OBJS)\baselib_dynlib.obj $(OBJS)\baselib_dynload.obj $(OBJS)\baselib_encconv.obj $(OBJS)\baselib_extended.obj $(OBJS)\baselib_ffile.obj $(OBJS)\baselib_file.obj $(OBJS)\baselib_fileconf.obj $(OBJS)\baselib_filefn.obj $(OBJS)\baselib_filename.obj $(OBJS)\baselib_filesys.obj $(OBJS)\baselib_fmapbase.obj $(OBJS)\baselib_fs_inet.obj $(OBJS)\baselib_fs_zip.obj $(OBJS)\baselib_ftp.obj $(OBJS)\baselib_hash.obj $(OBJS)\baselib_hashmap.obj $(OBJS)\baselib_http.obj $(OBJS)\baselib_init.obj $(OBJS)\baselib_intl.obj $(OBJS)\baselib_ipcbase.obj $(OBJS)\baselib_list.obj $(OBJS)\baselib_log.obj $(OBJS)\baselib_longlong.obj $(OBJS)\baselib_memory.obj $(OBJS)\baselib_mimecmn.obj $(OBJS)\baselib_module.obj $(OBJS)\baselib_mstream.obj $(OBJS)\baselib_object.obj $(OBJS)\baselib_process.obj $(OBJS)\baselib_protocol.obj $(OBJS)\baselib_regex.obj $(OBJS)\baselib_sckaddr.obj $(OBJS)\baselib_sckfile.obj $(OBJS)\baselib_sckipc.obj $(OBJS)\baselib_sckstrm.obj $(OBJS)\baselib_socket.obj $(OBJS)\baselib_stopwatch.obj $(OBJS)\baselib_strconv.obj $(OBJS)\baselib_stream.obj $(OBJS)\baselib_string.obj $(OBJS)\baselib_sysopt.obj $(OBJS)\baselib_textbuf.obj $(OBJS)\baselib_textfile.obj $(OBJS)\baselib_tokenzr.obj $(OBJS)\baselib_txtstrm.obj $(OBJS)\baselib_unzip.obj $(OBJS)\baselib_url.obj $(OBJS)\baselib_variant.obj $(OBJS)\baselib_wfstream.obj $(OBJS)\baselib_wxchar.obj $(OBJS)\baselib_zipstrm.obj $(OBJS)\baselib_zstream.obj $(OBJS)\baselib_gsocket.obj $(OBJS)\baselib_gsockmsw.obj $(OBJS)\baselib_basemsw.obj $(OBJS)\baselib_dde.obj $(OBJS)\baselib_dir.obj $(OBJS)\baselib_mimetype.obj $(OBJS)\baselib_regconf.obj $(OBJS)\baselib_registry.obj $(OBJS)\baselib_snglinst.obj $(OBJS)\baselib_thread.obj $(OBJS)\baselib_utils.obj $(OBJS)\baselib_utilsexc.obj $(OBJS)\baselib_crashrpt.obj $(OBJS)\baselib_event.obj $(OBJS)\baselib_fs_mem.obj $(OBJS)\baselib_msgout.obj $(OBJS)\baselib_utilscmn.obj $(OBJS)\baselib_main.obj $(OBJS)\baselib_mslu.obj $(OBJS)\baselib_volume.obj
 |
 !endif
@@ -7401,7 +7429,7 @@ clean:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\corelib_dummy.obj $(OBJS)\corelib_dummy.obj $(OBJS)\corelib_event.obj $(OBJS)\corelib_fs_mem.obj $(OBJS)\corelib_msgout.obj $(OBJS)\corelib_utilscmn.obj $(OBJS)\corelib_main.obj $(OBJS)\corelib_mslu.obj $(OBJS)\corelib_volume.obj $(____CORE_SRC_FILENAMES_3_OBJECTS)
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\corelib_dummy.obj $(OBJS)\corelib_event.obj $(OBJS)\corelib_fs_mem.obj $(OBJS)\corelib_msgout.obj $(OBJS)\corelib_utilscmn.obj $(OBJS)\corelib_main.obj $(OBJS)\corelib_mslu.obj $(OBJS)\corelib_volume.obj $(____CORE_SRC_FILENAMES_3_OBJECTS)
 |
 !endif
@@ -7417,7 +7445,7 @@ clean:
 !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\gllib_dummy.obj $(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj
 |
 !endif
@@ -7433,7 +7461,7 @@ clean:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_helpbest.obj $(OBJS)\htmllib_helpdata.obj $(OBJS)\htmllib_helpfrm.obj $(OBJS)\htmllib_helpctrl.obj $(OBJS)\htmllib_htmlcell.obj $(OBJS)\htmllib_htmlfilt.obj $(OBJS)\htmllib_htmlpars.obj $(OBJS)\htmllib_htmltag.obj $(OBJS)\htmllib_htmlwin.obj $(OBJS)\htmllib_winpars.obj $(OBJS)\htmllib_m_fonts.obj $(OBJS)\htmllib_m_hline.obj $(OBJS)\htmllib_m_image.obj $(OBJS)\htmllib_m_layout.obj $(OBJS)\htmllib_m_links.obj $(OBJS)\htmllib_m_list.obj $(OBJS)\htmllib_m_dflist.obj $(OBJS)\htmllib_m_pre.obj $(OBJS)\htmllib_m_tables.obj $(OBJS)\htmllib_m_style.obj $(OBJS)\htmllib_htmprint.obj $(OBJS)\htmllib_htmllbox.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\htmllib_dummy.obj $(OBJS)\htmllib_helpbest.obj $(OBJS)\htmllib_helpdata.obj $(OBJS)\htmllib_helpfrm.obj $(OBJS)\htmllib_helpctrl.obj $(OBJS)\htmllib_htmlcell.obj $(OBJS)\htmllib_htmlfilt.obj $(OBJS)\htmllib_htmlpars.obj $(OBJS)\htmllib_htmltag.obj $(OBJS)\htmllib_htmlwin.obj $(OBJS)\htmllib_winpars.obj $(OBJS)\htmllib_m_fonts.obj $(OBJS)\htmllib_m_hline.obj $(OBJS)\htmllib_m_image.obj $(OBJS)\htmllib_m_layout.obj $(OBJS)\htmllib_m_links.obj $(OBJS)\htmllib_m_list.obj $(OBJS)\htmllib_m_dflist.obj $(OBJS)\htmllib_m_pre.obj $(OBJS)\htmllib_m_tables.obj $(OBJS)\htmllib_m_style.obj $(OBJS)\htmllib_htmprint.obj $(OBJS)\htmllib_htmllbox.obj
 |
 !endif
@@ -7455,7 +7483,7 @@ clean:
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\monolib_dummy.obj $(OBJS)\monolib_dummy.obj $(OBJS)\monolib_appbase.obj $(OBJS)\monolib_clntdata.obj $(OBJS)\monolib_cmdline.obj $(OBJS)\monolib_config.obj $(OBJS)\monolib_datetime.obj $(OBJS)\monolib_datstrm.obj $(OBJS)\monolib_db.obj $(OBJS)\monolib_dbtable.obj $(OBJS)\monolib_dircmn.obj $(OBJS)\monolib_dynarray.obj $(OBJS)\monolib_dynlib.obj $(OBJS)\monolib_dynload.obj $(OBJS)\monolib_encconv.obj $(OBJS)\monolib_extended.obj $(OBJS)\monolib_ffile.obj $(OBJS)\monolib_file.obj $(OBJS)\monolib_fileconf.obj $(OBJS)\monolib_filefn.obj $(OBJS)\monolib_filename.obj $(OBJS)\monolib_filesys.obj $(OBJS)\monolib_fmapbase.obj $(OBJS)\monolib_fs_inet.obj $(OBJS)\monolib_fs_zip.obj $(OBJS)\monolib_ftp.obj $(OBJS)\monolib_hash.obj $(OBJS)\monolib_hashmap.obj $(OBJS)\monolib_http.obj $(OBJS)\monolib_init.obj $(OBJS)\monolib_intl.obj $(OBJS)\monolib_ipcbase.obj $(OBJS)\monolib_list.obj $(OBJS)\monolib_log.obj $(OBJS)\monolib_longlong.obj $(OBJS)\monolib_memory.obj $(OBJS)\monolib_mimecmn.obj $(OBJS)\monolib_module.obj $(OBJS)\monolib_mstream.obj $(OBJS)\monolib_object.obj $(OBJS)\monolib_process.obj $(OBJS)\monolib_protocol.obj $(OBJS)\monolib_regex.obj $(OBJS)\monolib_sckaddr.obj $(OBJS)\monolib_sckfile.obj $(OBJS)\monolib_sckipc.obj $(OBJS)\monolib_sckstrm.obj $(OBJS)\monolib_socket.obj $(OBJS)\monolib_stopwatch.obj $(OBJS)\monolib_strconv.obj $(OBJS)\monolib_stream.obj $(OBJS)\monolib_string.obj $(OBJS)\monolib_sysopt.obj $(OBJS)\monolib_textbuf.obj $(OBJS)\monolib_textfile.obj $(OBJS)\monolib_tokenzr.obj $(OBJS)\monolib_txtstrm.obj $(OBJS)\monolib_unzip.obj $(OBJS)\monolib_url.obj $(OBJS)\monolib_variant.obj $(OBJS)\monolib_wfstream.obj $(OBJS)\monolib_wxchar.obj $(OBJS)\monolib_zipstrm.obj $(OBJS)\monolib_zstream.obj $(OBJS)\monolib_gsocket.obj $(OBJS)\monolib_gsockmsw.obj $(OBJS)\monolib_basemsw.obj $(OBJS)\monolib_dde.obj $(OBJS)\monolib_dir.obj $(OBJS)\monolib_mimetype.obj $(OBJS)\monolib_regconf.obj $(OBJS)\monolib_registry.obj $(OBJS)\monolib_snglinst.obj $(OBJS)\monolib_thread.obj $(OBJS)\monolib_utils.obj $(OBJS)\monolib_utilsexc.obj $(OBJS)\monolib_crashrpt.obj $(OBJS)\monolib_event.obj $(OBJS)\monolib_fs_mem.obj $(OBJS)\monolib_msgout.obj $(OBJS)\monolib_utilscmn.obj $(OBJS)\monolib_main.obj $(OBJS)\monolib_mslu.obj $(OBJS)\monolib_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS)
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\monolib_dummy.obj $(OBJS)\monolib_appbase.obj $(OBJS)\monolib_clntdata.obj $(OBJS)\monolib_cmdline.obj $(OBJS)\monolib_config.obj $(OBJS)\monolib_datetime.obj $(OBJS)\monolib_datstrm.obj $(OBJS)\monolib_db.obj $(OBJS)\monolib_dbtable.obj $(OBJS)\monolib_dircmn.obj $(OBJS)\monolib_dynarray.obj $(OBJS)\monolib_dynlib.obj $(OBJS)\monolib_dynload.obj $(OBJS)\monolib_encconv.obj $(OBJS)\monolib_extended.obj $(OBJS)\monolib_ffile.obj $(OBJS)\monolib_file.obj $(OBJS)\monolib_fileconf.obj $(OBJS)\monolib_filefn.obj $(OBJS)\monolib_filename.obj $(OBJS)\monolib_filesys.obj $(OBJS)\monolib_fmapbase.obj $(OBJS)\monolib_fs_inet.obj $(OBJS)\monolib_fs_zip.obj $(OBJS)\monolib_ftp.obj $(OBJS)\monolib_hash.obj $(OBJS)\monolib_hashmap.obj $(OBJS)\monolib_http.obj $(OBJS)\monolib_init.obj $(OBJS)\monolib_intl.obj $(OBJS)\monolib_ipcbase.obj $(OBJS)\monolib_list.obj $(OBJS)\monolib_log.obj $(OBJS)\monolib_longlong.obj $(OBJS)\monolib_memory.obj $(OBJS)\monolib_mimecmn.obj $(OBJS)\monolib_module.obj $(OBJS)\monolib_mstream.obj $(OBJS)\monolib_object.obj $(OBJS)\monolib_process.obj $(OBJS)\monolib_protocol.obj $(OBJS)\monolib_regex.obj $(OBJS)\monolib_sckaddr.obj $(OBJS)\monolib_sckfile.obj $(OBJS)\monolib_sckipc.obj $(OBJS)\monolib_sckstrm.obj $(OBJS)\monolib_socket.obj $(OBJS)\monolib_stopwatch.obj $(OBJS)\monolib_strconv.obj $(OBJS)\monolib_stream.obj $(OBJS)\monolib_string.obj $(OBJS)\monolib_sysopt.obj $(OBJS)\monolib_textbuf.obj $(OBJS)\monolib_textfile.obj $(OBJS)\monolib_tokenzr.obj $(OBJS)\monolib_txtstrm.obj $(OBJS)\monolib_unzip.obj $(OBJS)\monolib_url.obj $(OBJS)\monolib_variant.obj $(OBJS)\monolib_wfstream.obj $(OBJS)\monolib_wxchar.obj $(OBJS)\monolib_zipstrm.obj $(OBJS)\monolib_zstream.obj $(OBJS)\monolib_gsocket.obj $(OBJS)\monolib_gsockmsw.obj $(OBJS)\monolib_basemsw.obj $(OBJS)\monolib_dde.obj $(OBJS)\monolib_dir.obj $(OBJS)\monolib_mimetype.obj $(OBJS)\monolib_regconf.obj $(OBJS)\monolib_registry.obj $(OBJS)\monolib_snglinst.obj $(OBJS)\monolib_thread.obj $(OBJS)\monolib_utils.obj $(OBJS)\monolib_utilsexc.obj $(OBJS)\monolib_crashrpt.obj $(OBJS)\monolib_event.obj $(OBJS)\monolib_fs_mem.obj $(OBJS)\monolib_msgout.obj $(OBJS)\monolib_utilscmn.obj $(OBJS)\monolib_main.obj $(OBJS)\monolib_mslu.obj $(OBJS)\monolib_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS)
 |
 !endif
@@ -7470,30 +7498,30 @@ setup_h: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDL
 
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxjpeg_jcomapi.obj $(OBJS)\wxjpeg_jutils.obj $(OBJS)\wxjpeg_jerror.obj $(OBJS)\wxjpeg_jmemmgr.obj $(OBJS)\wxjpeg_jmemnobs.obj $(OBJS)\wxjpeg_jcapimin.obj $(OBJS)\wxjpeg_jcapistd.obj $(OBJS)\wxjpeg_jctrans.obj $(OBJS)\wxjpeg_jcparam.obj $(OBJS)\wxjpeg_jdatadst.obj $(OBJS)\wxjpeg_jcinit.obj $(OBJS)\wxjpeg_jcmaster.obj $(OBJS)\wxjpeg_jcmarker.obj $(OBJS)\wxjpeg_jcmainct.obj $(OBJS)\wxjpeg_jcprepct.obj $(OBJS)\wxjpeg_jccoefct.obj $(OBJS)\wxjpeg_jccolor.obj $(OBJS)\wxjpeg_jcsample.obj $(OBJS)\wxjpeg_jchuff.obj $(OBJS)\wxjpeg_jcphuff.obj $(OBJS)\wxjpeg_jcdctmgr.obj $(OBJS)\wxjpeg_jfdctfst.obj $(OBJS)\wxjpeg_jfdctflt.obj $(OBJS)\wxjpeg_jfdctint.obj $(OBJS)\wxjpeg_jdapimin.obj $(OBJS)\wxjpeg_jdapistd.obj $(OBJS)\wxjpeg_jdtrans.obj $(OBJS)\wxjpeg_jdatasrc.obj $(OBJS)\wxjpeg_jdmaster.obj $(OBJS)\wxjpeg_jdinput.obj $(OBJS)\wxjpeg_jdmarker.obj $(OBJS)\wxjpeg_jdhuff.obj $(OBJS)\wxjpeg_jdphuff.obj $(OBJS)\wxjpeg_jdmainct.obj $(OBJS)\wxjpeg_jdcoefct.obj $(OBJS)\wxjpeg_jdpostct.obj $(OBJS)\wxjpeg_jddctmgr.obj $(OBJS)\wxjpeg_jidctfst.obj $(OBJS)\wxjpeg_jidctflt.obj $(OBJS)\wxjpeg_jidctint.obj $(OBJS)\wxjpeg_jidctred.obj $(OBJS)\wxjpeg_jdsample.obj $(OBJS)\wxjpeg_jdcolor.obj $(OBJS)\wxjpeg_jquant1.obj $(OBJS)\wxjpeg_jquant2.obj $(OBJS)\wxjpeg_jdmerge.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\wxjpeg_jcomapi.obj $(OBJS)\wxjpeg_jutils.obj $(OBJS)\wxjpeg_jerror.obj $(OBJS)\wxjpeg_jmemmgr.obj $(OBJS)\wxjpeg_jmemnobs.obj $(OBJS)\wxjpeg_jcapimin.obj $(OBJS)\wxjpeg_jcapistd.obj $(OBJS)\wxjpeg_jctrans.obj $(OBJS)\wxjpeg_jcparam.obj $(OBJS)\wxjpeg_jdatadst.obj $(OBJS)\wxjpeg_jcinit.obj $(OBJS)\wxjpeg_jcmaster.obj $(OBJS)\wxjpeg_jcmarker.obj $(OBJS)\wxjpeg_jcmainct.obj $(OBJS)\wxjpeg_jcprepct.obj $(OBJS)\wxjpeg_jccoefct.obj $(OBJS)\wxjpeg_jccolor.obj $(OBJS)\wxjpeg_jcsample.obj $(OBJS)\wxjpeg_jchuff.obj $(OBJS)\wxjpeg_jcphuff.obj $(OBJS)\wxjpeg_jcdctmgr.obj $(OBJS)\wxjpeg_jfdctfst.obj $(OBJS)\wxjpeg_jfdctflt.obj $(OBJS)\wxjpeg_jfdctint.obj $(OBJS)\wxjpeg_jdapimin.obj $(OBJS)\wxjpeg_jdapistd.obj $(OBJS)\wxjpeg_jdtrans.obj $(OBJS)\wxjpeg_jdatasrc.obj $(OBJS)\wxjpeg_jdmaster.obj $(OBJS)\wxjpeg_jdinput.obj $(OBJS)\wxjpeg_jdmarker.obj $(OBJS)\wxjpeg_jdhuff.obj $(OBJS)\wxjpeg_jdphuff.obj $(OBJS)\wxjpeg_jdmainct.obj $(OBJS)\wxjpeg_jdcoefct.obj $(OBJS)\wxjpeg_jdpostct.obj $(OBJS)\wxjpeg_jddctmgr.obj $(OBJS)\wxjpeg_jidctfst.obj $(OBJS)\wxjpeg_jidctflt.obj $(OBJS)\wxjpeg_jidctint.obj $(OBJS)\wxjpeg_jidctred.obj $(OBJS)\wxjpeg_jdsample.obj $(OBJS)\wxjpeg_jdcolor.obj $(OBJS)\wxjpeg_jquant1.obj $(OBJS)\wxjpeg_jquant2.obj $(OBJS)\wxjpeg_jdmerge.obj
 |
 
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxpng_png.obj $(OBJS)\wxpng_pngerror.obj $(OBJS)\wxpng_pnggccrd.obj $(OBJS)\wxpng_pngget.obj $(OBJS)\wxpng_pngmem.obj $(OBJS)\wxpng_pngpread.obj $(OBJS)\wxpng_pngread.obj $(OBJS)\wxpng_pngrio.obj $(OBJS)\wxpng_pngrtran.obj $(OBJS)\wxpng_pngrutil.obj $(OBJS)\wxpng_pngset.obj $(OBJS)\wxpng_pngtrans.obj $(OBJS)\wxpng_pngvcrd.obj $(OBJS)\wxpng_pngwio.obj $(OBJS)\wxpng_pngwrite.obj $(OBJS)\wxpng_pngwtran.obj $(OBJS)\wxpng_pngwutil.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\wxpng_png.obj $(OBJS)\wxpng_pngerror.obj $(OBJS)\wxpng_pnggccrd.obj $(OBJS)\wxpng_pngget.obj $(OBJS)\wxpng_pngmem.obj $(OBJS)\wxpng_pngpread.obj $(OBJS)\wxpng_pngread.obj $(OBJS)\wxpng_pngrio.obj $(OBJS)\wxpng_pngrtran.obj $(OBJS)\wxpng_pngrutil.obj $(OBJS)\wxpng_pngset.obj $(OBJS)\wxpng_pngtrans.obj $(OBJS)\wxpng_pngvcrd.obj $(OBJS)\wxpng_pngwio.obj $(OBJS)\wxpng_pngwrite.obj $(OBJS)\wxpng_pngwtran.obj $(OBJS)\wxpng_pngwutil.obj
 |
 
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxregex_regcomp.obj $(OBJS)\wxregex_regexec.obj $(OBJS)\wxregex_regerror.obj $(OBJS)\wxregex_regfree.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\wxregex_regcomp.obj $(OBJS)\wxregex_regexec.obj $(OBJS)\wxregex_regerror.obj $(OBJS)\wxregex_regfree.obj
 |
 
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxtiff_tif_win32.obj $(OBJS)\wxtiff_tif_aux.obj $(OBJS)\wxtiff_tif_close.obj $(OBJS)\wxtiff_tif_codec.obj $(OBJS)\wxtiff_tif_compress.obj $(OBJS)\wxtiff_tif_dir.obj $(OBJS)\wxtiff_tif_dirinfo.obj $(OBJS)\wxtiff_tif_dirread.obj $(OBJS)\wxtiff_tif_dirwrite.obj $(OBJS)\wxtiff_tif_dumpmode.obj $(OBJS)\wxtiff_tif_error.obj $(OBJS)\wxtiff_tif_fax3.obj $(OBJS)\wxtiff_tif_fax3sm.obj $(OBJS)\wxtiff_tif_getimage.obj $(OBJS)\wxtiff_tif_jpeg.obj $(OBJS)\wxtiff_tif_flush.obj $(OBJS)\wxtiff_tif_lzw.obj $(OBJS)\wxtiff_tif_luv.obj $(OBJS)\wxtiff_tif_next.obj $(OBJS)\wxtiff_tif_open.obj $(OBJS)\wxtiff_tif_packbits.obj $(OBJS)\wxtiff_tif_pixarlog.obj $(OBJS)\wxtiff_tif_predict.obj $(OBJS)\wxtiff_tif_print.obj $(OBJS)\wxtiff_tif_read.obj $(OBJS)\wxtiff_tif_swab.obj $(OBJS)\wxtiff_tif_strip.obj $(OBJS)\wxtiff_tif_thunder.obj $(OBJS)\wxtiff_tif_tile.obj $(OBJS)\wxtiff_tif_version.obj $(OBJS)\wxtiff_tif_warning.obj $(OBJS)\wxtiff_tif_write.obj $(OBJS)\wxtiff_tif_zip.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\wxtiff_tif_win32.obj $(OBJS)\wxtiff_tif_aux.obj $(OBJS)\wxtiff_tif_close.obj $(OBJS)\wxtiff_tif_codec.obj $(OBJS)\wxtiff_tif_compress.obj $(OBJS)\wxtiff_tif_dir.obj $(OBJS)\wxtiff_tif_dirinfo.obj $(OBJS)\wxtiff_tif_dirread.obj $(OBJS)\wxtiff_tif_dirwrite.obj $(OBJS)\wxtiff_tif_dumpmode.obj $(OBJS)\wxtiff_tif_error.obj $(OBJS)\wxtiff_tif_fax3.obj $(OBJS)\wxtiff_tif_fax3sm.obj $(OBJS)\wxtiff_tif_getimage.obj $(OBJS)\wxtiff_tif_jpeg.obj $(OBJS)\wxtiff_tif_flush.obj $(OBJS)\wxtiff_tif_lzw.obj $(OBJS)\wxtiff_tif_luv.obj $(OBJS)\wxtiff_tif_next.obj $(OBJS)\wxtiff_tif_open.obj $(OBJS)\wxtiff_tif_packbits.obj $(OBJS)\wxtiff_tif_pixarlog.obj $(OBJS)\wxtiff_tif_predict.obj $(OBJS)\wxtiff_tif_print.obj $(OBJS)\wxtiff_tif_read.obj $(OBJS)\wxtiff_tif_swab.obj $(OBJS)\wxtiff_tif_strip.obj $(OBJS)\wxtiff_tif_thunder.obj $(OBJS)\wxtiff_tif_tile.obj $(OBJS)\wxtiff_tif_version.obj $(OBJS)\wxtiff_tif_warning.obj $(OBJS)\wxtiff_tif_write.obj $(OBJS)\wxtiff_tif_zip.obj
 |
 
 ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\wxzlib_adler32.obj $(OBJS)\wxzlib_compress.obj $(OBJS)\wxzlib_crc32.obj $(OBJS)\wxzlib_gzio.obj $(OBJS)\wxzlib_uncompr.obj $(OBJS)\wxzlib_deflate.obj $(OBJS)\wxzlib_trees.obj $(OBJS)\wxzlib_zutil.obj $(OBJS)\wxzlib_inflate.obj $(OBJS)\wxzlib_infblock.obj $(OBJS)\wxzlib_inftrees.obj $(OBJS)\wxzlib_infcodes.obj $(OBJS)\wxzlib_infutil.obj $(OBJS)\wxzlib_inffast.obj
 	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
+	tlib /a $@ @&&|
 	$(OBJS)\wxzlib_adler32.obj $(OBJS)\wxzlib_compress.obj $(OBJS)\wxzlib_crc32.obj $(OBJS)\wxzlib_gzio.obj $(OBJS)\wxzlib_uncompr.obj $(OBJS)\wxzlib_deflate.obj $(OBJS)\wxzlib_trees.obj $(OBJS)\wxzlib_zutil.obj $(OBJS)\wxzlib_inflate.obj $(OBJS)\wxzlib_infblock.obj $(OBJS)\wxzlib_inftrees.obj $(OBJS)\wxzlib_infcodes.obj $(OBJS)\wxzlib_infutil.obj $(OBJS)\wxzlib_inffast.obj
 |
diff --git a/build/makefile.gcc b/build/makefile.gcc
index a103694140..1eff52276a 100644
--- a/build/makefile.gcc
+++ b/build/makefile.gcc
@@ -139,42 +139,42 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
-____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.o $(OBJS)\monolib_bitmap.o $(OBJS)\monolib_brush.o $(OBJS)\monolib_caret.o $(OBJS)\monolib_clipbrd.o $(OBJS)\monolib_colour.o $(OBJS)\monolib_cursor.o $(OBJS)\monolib_data.o $(OBJS)\monolib_dc.o $(OBJS)\monolib_dcclient.o $(OBJS)\monolib_dcmemory.o $(OBJS)\monolib_dcprint.o $(OBJS)\monolib_dcscreen.o $(OBJS)\monolib_dialup.o $(OBJS)\monolib_dib.o $(OBJS)\monolib_dirdlg.o $(OBJS)\monolib_display.o $(OBJS)\monolib_enhmeta.o $(OBJS)\monolib_evtloop.o $(OBJS)\monolib_font.o $(OBJS)\monolib_fontenum.o $(OBJS)\monolib_fontutil.o $(OBJS)\monolib_gdiimage.o $(OBJS)\monolib_gdiobj.o $(OBJS)\monolib_helpchm.o $(OBJS)\monolib_helpwin.o $(OBJS)\monolib_icon.o $(OBJS)\monolib_joystick.o $(OBJS)\monolib_minifram.o $(OBJS)\monolib_palette.o $(OBJS)\monolib_pen.o $(OBJS)\monolib_popupwin.o $(OBJS)\monolib_region.o $(OBJS)\monolib_settings.o $(OBJS)\monolib_taskbarcmn.o $(OBJS)\monolib_taskbar.o $(OBJS)\monolib_timer.o $(OBJS)\monolib_tooltip.o $(OBJS)\monolib_toplevel.o $(OBJS)\monolib_utilsgui.o $(OBJS)\monolib_wave.o $(OBJS)\monolib_window.o $(OBJS)\monolib_automtn.o $(OBJS)\monolib_dataobj.o $(OBJS)\monolib_dropsrc.o $(OBJS)\monolib_droptgt.o $(OBJS)\monolib_oleutils.o $(OBJS)\monolib_uuid.o $(OBJS)\monolib_statusbr.o $(OBJS)\monolib_uxtheme.o $(OBJS)\monolib_access.o $(OBJS)\monolib_accel.o $(OBJS)\monolib_bmpbuttn.o $(OBJS)\monolib_button.o $(OBJS)\monolib_checkbox.o $(OBJS)\monolib_checklst.o $(OBJS)\monolib_choice.o $(OBJS)\monolib_colordlg.o $(OBJS)\monolib_combobox.o $(OBJS)\monolib_control.o $(OBJS)\monolib_dialog.o $(OBJS)\monolib_dragimag.o $(OBJS)\monolib_fdrepdlg.o $(OBJS)\monolib_filedlg.o $(OBJS)\monolib_fontdlg.o $(OBJS)\monolib_frame.o $(OBJS)\monolib_gauge95.o $(OBJS)\monolib_imaglist.o $(OBJS)\monolib_iniconf.o $(OBJS)\monolib_listbox.o $(OBJS)\monolib_listctrl.o $(OBJS)\monolib_mdi.o $(OBJS)\monolib_menu.o $(OBJS)\monolib_menuitem.o $(OBJS)\monolib_metafile.o $(OBJS)\monolib_msgdlg.o $(OBJS)\monolib_nativdlg.o $(OBJS)\monolib_notebook.o $(OBJS)\monolib_ownerdrw.o $(OBJS)\monolib_penwin.o $(OBJS)\monolib_printdlg.o $(OBJS)\monolib_printwin.o $(OBJS)\monolib_radiobox.o $(OBJS)\monolib_radiobut.o $(OBJS)\monolib_scrolbar.o $(OBJS)\monolib_slider95.o $(OBJS)\monolib_spinbutt.o $(OBJS)\monolib_spinctrl.o $(OBJS)\monolib_statbmp.o $(OBJS)\monolib_statbox.o $(OBJS)\monolib_statbr95.o $(OBJS)\monolib_statline.o $(OBJS)\monolib_stattext.o $(OBJS)\monolib_tabctrl.o $(OBJS)\monolib_tbar95.o $(OBJS)\monolib_textctrl.o $(OBJS)\monolib_tglbtn.o $(OBJS)\monolib_treectrl.o $(OBJS)\monolib_selstore.o $(OBJS)\monolib_busyinfo.o $(OBJS)\monolib_calctrl.o $(OBJS)\monolib_choicdgg.o $(OBJS)\monolib_dcbuffer.o $(OBJS)\monolib_dcpsg.o $(OBJS)\monolib_dirctrlg.o $(OBJS)\monolib_grid.o $(OBJS)\monolib_gridctrl.o $(OBJS)\monolib_gridsel.o $(OBJS)\monolib_laywin.o $(OBJS)\monolib_logg.o $(OBJS)\monolib_numdlgg.o $(OBJS)\monolib_panelg.o $(OBJS)\monolib_progdlgg.o $(OBJS)\monolib_sashwin.o $(OBJS)\monolib_scrlwing.o $(OBJS)\monolib_spinctlg.o $(OBJS)\monolib_splash.o $(OBJS)\monolib_splitter.o $(OBJS)\monolib_tbarsmpl.o $(OBJS)\monolib_textdlgg.o $(OBJS)\monolib_tipdlg.o $(OBJS)\monolib_tipwin.o $(OBJS)\monolib_treectlg.o $(OBJS)\monolib_vlbox.o $(OBJS)\monolib_vscroll.o $(OBJS)\monolib_wizard.o $(OBJS)\monolib_appcmn.o $(OBJS)\monolib_fontmap.o $(OBJS)\monolib_accesscmn.o $(OBJS)\monolib_artprov.o $(OBJS)\monolib_artstd.o $(OBJS)\monolib_bmpbase.o $(OBJS)\monolib_choiccmn.o $(OBJS)\monolib_clipcmn.o $(OBJS)\monolib_cmdproc.o $(OBJS)\monolib_cmndata.o $(OBJS)\monolib_containr.o $(OBJS)\monolib_cshelp.o $(OBJS)\monolib_ctrlcmn.o $(OBJS)\monolib_ctrlsub.o $(OBJS)\monolib_datacmn.o $(OBJS)\monolib_dbgrid.o $(OBJS)\monolib_dcbase.o $(OBJS)\monolib_dlgcmn.o $(OBJS)\monolib_dndcmn.o $(OBJS)\monolib_dobjcmn.o $(OBJS)\monolib_docmdi.o $(OBJS)\monolib_docview.o $(OBJS)\monolib_dpycmn.o $(OBJS)\monolib_dseldlg.o $(OBJS)\monolib_effects.o $(OBJS)\monolib_fddlgcmn.o $(OBJS)\monolib_fldlgcmn.o $(OBJS)\monolib_fontcmn.o $(OBJS)\monolib_framecmn.o $(OBJS)\monolib_timercmn.o $(OBJS)\monolib_toplvcmn.o $(OBJS)\monolib_gaugecmn.o $(OBJS)\monolib_gdicmn.o $(OBJS)\monolib_geometry.o $(OBJS)\monolib_gifdecod.o $(OBJS)\monolib_helpbase.o $(OBJS)\monolib_iconbndl.o $(OBJS)\monolib_imagall.o $(OBJS)\monolib_imagbmp.o $(OBJS)\monolib_image.o $(OBJS)\monolib_imaggif.o $(OBJS)\monolib_imagiff.o $(OBJS)\monolib_imagjpeg.o $(OBJS)\monolib_imagpcx.o $(OBJS)\monolib_imagpng.o $(OBJS)\monolib_imagpnm.o $(OBJS)\monolib_imagtiff.o $(OBJS)\monolib_imagxpm.o $(OBJS)\monolib_imagfill.o $(OBJS)\monolib_layout.o $(OBJS)\monolib_lboxcmn.o $(OBJS)\monolib_matrix.o $(OBJS)\monolib_menucmn.o $(OBJS)\monolib_nbkbase.o $(OBJS)\monolib_paper.o $(OBJS)\monolib_popupcmn.o $(OBJS)\monolib_prntbase.o $(OBJS)\monolib_quantize.o $(OBJS)\monolib_radiocmn.o $(OBJS)\monolib_rgncmn.o $(OBJS)\monolib_settcmn.o $(OBJS)\monolib_sizer.o $(OBJS)\monolib_statbar.o $(OBJS)\monolib_tbarbase.o $(OBJS)\monolib_textcmn.o $(OBJS)\monolib_treebase.o $(OBJS)\monolib_valgen.o $(OBJS)\monolib_validate.o $(OBJS)\monolib_valtext.o $(OBJS)\monolib_wincmn.o $(OBJS)\monolib_xpmdecod.o
+____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.o $(OBJS)\monolib_bitmap.o $(OBJS)\monolib_brush.o $(OBJS)\monolib_caret.o $(OBJS)\monolib_clipbrd.o $(OBJS)\monolib_colour.o $(OBJS)\monolib_cursor.o $(OBJS)\monolib_data.o $(OBJS)\monolib_dc.o $(OBJS)\monolib_dcclient.o $(OBJS)\monolib_dcmemory.o $(OBJS)\monolib_dcprint.o $(OBJS)\monolib_dcscreen.o $(OBJS)\monolib_dialup.o $(OBJS)\monolib_dib.o $(OBJS)\monolib_dirdlg.o $(OBJS)\monolib_display.o $(OBJS)\monolib_enhmeta.o $(OBJS)\monolib_evtloop.o $(OBJS)\monolib_font.o $(OBJS)\monolib_fontenum.o $(OBJS)\monolib_fontutil.o $(OBJS)\monolib_gdiimage.o $(OBJS)\monolib_gdiobj.o $(OBJS)\monolib_helpchm.o $(OBJS)\monolib_helpwin.o $(OBJS)\monolib_icon.o $(OBJS)\monolib_joystick.o $(OBJS)\monolib_minifram.o $(OBJS)\monolib_palette.o $(OBJS)\monolib_pen.o $(OBJS)\monolib_popupwin.o $(OBJS)\monolib_region.o $(OBJS)\monolib_settings.o $(OBJS)\monolib_taskbarcmn.o $(OBJS)\monolib_taskbar.o $(OBJS)\monolib_timer.o $(OBJS)\monolib_tooltip.o $(OBJS)\monolib_toplevel.o $(OBJS)\monolib_utilsgui.o $(OBJS)\monolib_wave.o $(OBJS)\monolib_window.o $(OBJS)\monolib_automtn.o $(OBJS)\monolib_dataobj.o $(OBJS)\monolib_dropsrc.o $(OBJS)\monolib_droptgt.o $(OBJS)\monolib_oleutils.o $(OBJS)\monolib_uuid.o $(OBJS)\monolib_statusbr.o $(OBJS)\monolib_uxtheme.o $(OBJS)\monolib_access.o $(OBJS)\monolib_accel.o $(OBJS)\monolib_bmpbuttn.o $(OBJS)\monolib_button.o $(OBJS)\monolib_checkbox.o $(OBJS)\monolib_checklst.o $(OBJS)\monolib_choice.o $(OBJS)\monolib_colordlg.o $(OBJS)\monolib_combobox.o $(OBJS)\monolib_control.o $(OBJS)\monolib_dialog.o $(OBJS)\monolib_dragimag.o $(OBJS)\monolib_fdrepdlg.o $(OBJS)\monolib_filedlg.o $(OBJS)\monolib_fontdlg.o $(OBJS)\monolib_frame.o $(OBJS)\monolib_gauge95.o $(OBJS)\monolib_imaglist.o $(OBJS)\monolib_iniconf.o $(OBJS)\monolib_listbox.o $(OBJS)\monolib_listctrl.o $(OBJS)\monolib_mdi.o $(OBJS)\monolib_menu.o $(OBJS)\monolib_menuitem.o $(OBJS)\monolib_metafile.o $(OBJS)\monolib_msgdlg.o $(OBJS)\monolib_nativdlg.o $(OBJS)\monolib_notebook.o $(OBJS)\monolib_ownerdrw.o $(OBJS)\monolib_penwin.o $(OBJS)\monolib_printdlg.o $(OBJS)\monolib_printwin.o $(OBJS)\monolib_radiobox.o $(OBJS)\monolib_radiobut.o $(OBJS)\monolib_scrolbar.o $(OBJS)\monolib_slider95.o $(OBJS)\monolib_spinbutt.o $(OBJS)\monolib_spinctrl.o $(OBJS)\monolib_statbmp.o $(OBJS)\monolib_statbox.o $(OBJS)\monolib_statbr95.o $(OBJS)\monolib_statline.o $(OBJS)\monolib_stattext.o $(OBJS)\monolib_tabctrl.o $(OBJS)\monolib_tbar95.o $(OBJS)\monolib_textctrl.o $(OBJS)\monolib_tglbtn.o $(OBJS)\monolib_treectrl.o $(OBJS)\monolib_selstore.o $(OBJS)\monolib_busyinfo.o $(OBJS)\monolib_calctrl.o $(OBJS)\monolib_choicdgg.o $(OBJS)\monolib_dcbuffer.o $(OBJS)\monolib_dcpsg.o $(OBJS)\monolib_dirctrlg.o $(OBJS)\monolib_dragimgg.o $(OBJS)\monolib_grid.o $(OBJS)\monolib_gridctrl.o $(OBJS)\monolib_gridsel.o $(OBJS)\monolib_laywin.o $(OBJS)\monolib_logg.o $(OBJS)\monolib_numdlgg.o $(OBJS)\monolib_panelg.o $(OBJS)\monolib_progdlgg.o $(OBJS)\monolib_sashwin.o $(OBJS)\monolib_scrlwing.o $(OBJS)\monolib_spinctlg.o $(OBJS)\monolib_splash.o $(OBJS)\monolib_splitter.o $(OBJS)\monolib_tbarsmpl.o $(OBJS)\monolib_textdlgg.o $(OBJS)\monolib_tipdlg.o $(OBJS)\monolib_tipwin.o $(OBJS)\monolib_treectlg.o $(OBJS)\monolib_vlbox.o $(OBJS)\monolib_vscroll.o $(OBJS)\monolib_wizard.o $(OBJS)\monolib_appcmn.o $(OBJS)\monolib_fontmap.o $(OBJS)\monolib_accesscmn.o $(OBJS)\monolib_artprov.o $(OBJS)\monolib_artstd.o $(OBJS)\monolib_bmpbase.o $(OBJS)\monolib_choiccmn.o $(OBJS)\monolib_clipcmn.o $(OBJS)\monolib_cmdproc.o $(OBJS)\monolib_cmndata.o $(OBJS)\monolib_containr.o $(OBJS)\monolib_cshelp.o $(OBJS)\monolib_ctrlcmn.o $(OBJS)\monolib_ctrlsub.o $(OBJS)\monolib_datacmn.o $(OBJS)\monolib_dbgrid.o $(OBJS)\monolib_dcbase.o $(OBJS)\monolib_dlgcmn.o $(OBJS)\monolib_dndcmn.o $(OBJS)\monolib_dobjcmn.o $(OBJS)\monolib_docmdi.o $(OBJS)\monolib_docview.o $(OBJS)\monolib_dpycmn.o $(OBJS)\monolib_dseldlg.o $(OBJS)\monolib_effects.o $(OBJS)\monolib_fddlgcmn.o $(OBJS)\monolib_fldlgcmn.o $(OBJS)\monolib_fontcmn.o $(OBJS)\monolib_framecmn.o $(OBJS)\monolib_timercmn.o $(OBJS)\monolib_toplvcmn.o $(OBJS)\monolib_gaugecmn.o $(OBJS)\monolib_gdicmn.o $(OBJS)\monolib_geometry.o $(OBJS)\monolib_gifdecod.o $(OBJS)\monolib_helpbase.o $(OBJS)\monolib_iconbndl.o $(OBJS)\monolib_imagall.o $(OBJS)\monolib_imagbmp.o $(OBJS)\monolib_image.o $(OBJS)\monolib_imaggif.o $(OBJS)\monolib_imagiff.o $(OBJS)\monolib_imagjpeg.o $(OBJS)\monolib_imagpcx.o $(OBJS)\monolib_imagpng.o $(OBJS)\monolib_imagpnm.o $(OBJS)\monolib_imagtiff.o $(OBJS)\monolib_imagxpm.o $(OBJS)\monolib_imagfill.o $(OBJS)\monolib_layout.o $(OBJS)\monolib_lboxcmn.o $(OBJS)\monolib_matrix.o $(OBJS)\monolib_menucmn.o $(OBJS)\monolib_nbkbase.o $(OBJS)\monolib_paper.o $(OBJS)\monolib_popupcmn.o $(OBJS)\monolib_prntbase.o $(OBJS)\monolib_quantize.o $(OBJS)\monolib_radiocmn.o $(OBJS)\monolib_rgncmn.o $(OBJS)\monolib_settcmn.o $(OBJS)\monolib_sizer.o $(OBJS)\monolib_statbar.o $(OBJS)\monolib_tbarbase.o $(OBJS)\monolib_textcmn.o $(OBJS)\monolib_treebase.o $(OBJS)\monolib_valgen.o $(OBJS)\monolib_validate.o $(OBJS)\monolib_valtext.o $(OBJS)\monolib_wincmn.o $(OBJS)\monolib_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
-____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.o $(OBJS)\monolib_bitmap.o $(OBJS)\monolib_brush.o $(OBJS)\monolib_caret.o $(OBJS)\monolib_clipbrd.o $(OBJS)\monolib_colour.o $(OBJS)\monolib_cursor.o $(OBJS)\monolib_data.o $(OBJS)\monolib_dc.o $(OBJS)\monolib_dcclient.o $(OBJS)\monolib_dcmemory.o $(OBJS)\monolib_dcprint.o $(OBJS)\monolib_dcscreen.o $(OBJS)\monolib_dialup.o $(OBJS)\monolib_dib.o $(OBJS)\monolib_dirdlg.o $(OBJS)\monolib_display.o $(OBJS)\monolib_enhmeta.o $(OBJS)\monolib_evtloop.o $(OBJS)\monolib_font.o $(OBJS)\monolib_fontenum.o $(OBJS)\monolib_fontutil.o $(OBJS)\monolib_gdiimage.o $(OBJS)\monolib_gdiobj.o $(OBJS)\monolib_helpchm.o $(OBJS)\monolib_helpwin.o $(OBJS)\monolib_icon.o $(OBJS)\monolib_joystick.o $(OBJS)\monolib_minifram.o $(OBJS)\monolib_palette.o $(OBJS)\monolib_pen.o $(OBJS)\monolib_popupwin.o $(OBJS)\monolib_region.o $(OBJS)\monolib_settings.o $(OBJS)\monolib_taskbarcmn.o $(OBJS)\monolib_taskbar.o $(OBJS)\monolib_timer.o $(OBJS)\monolib_tooltip.o $(OBJS)\monolib_toplevel.o $(OBJS)\monolib_utilsgui.o $(OBJS)\monolib_wave.o $(OBJS)\monolib_window.o $(OBJS)\monolib_automtn.o $(OBJS)\monolib_dataobj.o $(OBJS)\monolib_dropsrc.o $(OBJS)\monolib_droptgt.o $(OBJS)\monolib_oleutils.o $(OBJS)\monolib_uuid.o $(OBJS)\monolib_textctrl.o $(OBJS)\monolib_bmpbuttn.o $(OBJS)\monolib_button.o $(OBJS)\monolib_checkbox.o $(OBJS)\monolib_checklst.o $(OBJS)\monolib_choice.o $(OBJS)\monolib_colschem.o $(OBJS)\monolib_combobox.o $(OBJS)\monolib_control.o $(OBJS)\monolib_dialog.o $(OBJS)\monolib_framuniv.o $(OBJS)\monolib_topluniv.o $(OBJS)\monolib_gauge.o $(OBJS)\monolib_inpcons.o $(OBJS)\monolib_inphand.o $(OBJS)\monolib_listbox.o $(OBJS)\monolib_menu.o $(OBJS)\monolib_notebook.o $(OBJS)\monolib_radiobox.o $(OBJS)\monolib_radiobut.o $(OBJS)\monolib_renderer.o $(OBJS)\monolib_scrarrow.o $(OBJS)\monolib_scrolbar.o $(OBJS)\monolib_scrthumb.o $(OBJS)\monolib_slider.o $(OBJS)\monolib_spinbutt.o $(OBJS)\monolib_statbmp.o $(OBJS)\monolib_statbox.o $(OBJS)\monolib_statline.o $(OBJS)\monolib_stattext.o $(OBJS)\monolib_statusbr.o $(OBJS)\monolib_toolbar.o $(OBJS)\monolib_theme.o $(OBJS)\monolib_winuniv.o $(OBJS)\monolib_mdig.o $(OBJS)\monolib_imaglist.o $(OBJS)\monolib_colrdlgg.o $(OBJS)\monolib_listctrl.o $(OBJS)\monolib_filedlgg.o $(OBJS)\monolib_dirdlgg.o $(OBJS)\monolib_prntdlgg.o $(OBJS)\monolib_accel.o $(OBJS)\monolib_msgdlgg.o $(OBJS)\monolib_fdrepdlg.o $(OBJS)\monolib_fontdlgg.o $(OBJS)\monolib_tabg.o $(OBJS)\monolib_gtk.o $(OBJS)\monolib_win32.o $(OBJS)\monolib_metal.o $(OBJS)\monolib_selstore.o $(OBJS)\monolib_busyinfo.o $(OBJS)\monolib_calctrl.o $(OBJS)\monolib_choicdgg.o $(OBJS)\monolib_dcbuffer.o $(OBJS)\monolib_dcpsg.o $(OBJS)\monolib_dirctrlg.o $(OBJS)\monolib_grid.o $(OBJS)\monolib_gridctrl.o $(OBJS)\monolib_gridsel.o $(OBJS)\monolib_laywin.o $(OBJS)\monolib_logg.o $(OBJS)\monolib_numdlgg.o $(OBJS)\monolib_panelg.o $(OBJS)\monolib_progdlgg.o $(OBJS)\monolib_sashwin.o $(OBJS)\monolib_scrlwing.o $(OBJS)\monolib_spinctlg.o $(OBJS)\monolib_splash.o $(OBJS)\monolib_splitter.o $(OBJS)\monolib_tbarsmpl.o $(OBJS)\monolib_textdlgg.o $(OBJS)\monolib_tipdlg.o $(OBJS)\monolib_tipwin.o $(OBJS)\monolib_treectlg.o $(OBJS)\monolib_vlbox.o $(OBJS)\monolib_vscroll.o $(OBJS)\monolib_wizard.o $(OBJS)\monolib_appcmn.o $(OBJS)\monolib_fontmap.o $(OBJS)\monolib_accesscmn.o $(OBJS)\monolib_artprov.o $(OBJS)\monolib_artstd.o $(OBJS)\monolib_bmpbase.o $(OBJS)\monolib_choiccmn.o $(OBJS)\monolib_clipcmn.o $(OBJS)\monolib_cmdproc.o $(OBJS)\monolib_cmndata.o $(OBJS)\monolib_containr.o $(OBJS)\monolib_cshelp.o $(OBJS)\monolib_ctrlcmn.o $(OBJS)\monolib_ctrlsub.o $(OBJS)\monolib_datacmn.o $(OBJS)\monolib_dbgrid.o $(OBJS)\monolib_dcbase.o $(OBJS)\monolib_dlgcmn.o $(OBJS)\monolib_dndcmn.o $(OBJS)\monolib_dobjcmn.o $(OBJS)\monolib_docmdi.o $(OBJS)\monolib_docview.o $(OBJS)\monolib_dpycmn.o $(OBJS)\monolib_dseldlg.o $(OBJS)\monolib_effects.o $(OBJS)\monolib_fddlgcmn.o $(OBJS)\monolib_fldlgcmn.o $(OBJS)\monolib_fontcmn.o $(OBJS)\monolib_framecmn.o $(OBJS)\monolib_timercmn.o $(OBJS)\monolib_toplvcmn.o $(OBJS)\monolib_gaugecmn.o $(OBJS)\monolib_gdicmn.o $(OBJS)\monolib_geometry.o $(OBJS)\monolib_gifdecod.o $(OBJS)\monolib_helpbase.o $(OBJS)\monolib_iconbndl.o $(OBJS)\monolib_imagall.o $(OBJS)\monolib_imagbmp.o $(OBJS)\monolib_image.o $(OBJS)\monolib_imaggif.o $(OBJS)\monolib_imagiff.o $(OBJS)\monolib_imagjpeg.o $(OBJS)\monolib_imagpcx.o $(OBJS)\monolib_imagpng.o $(OBJS)\monolib_imagpnm.o $(OBJS)\monolib_imagtiff.o $(OBJS)\monolib_imagxpm.o $(OBJS)\monolib_imagfill.o $(OBJS)\monolib_layout.o $(OBJS)\monolib_lboxcmn.o $(OBJS)\monolib_matrix.o $(OBJS)\monolib_menucmn.o $(OBJS)\monolib_nbkbase.o $(OBJS)\monolib_paper.o $(OBJS)\monolib_popupcmn.o $(OBJS)\monolib_prntbase.o $(OBJS)\monolib_quantize.o $(OBJS)\monolib_radiocmn.o $(OBJS)\monolib_rgncmn.o $(OBJS)\monolib_settcmn.o $(OBJS)\monolib_sizer.o $(OBJS)\monolib_statbar.o $(OBJS)\monolib_tbarbase.o $(OBJS)\monolib_textcmn.o $(OBJS)\monolib_treebase.o $(OBJS)\monolib_valgen.o $(OBJS)\monolib_validate.o $(OBJS)\monolib_valtext.o $(OBJS)\monolib_wincmn.o $(OBJS)\monolib_xpmdecod.o
+____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.o $(OBJS)\monolib_bitmap.o $(OBJS)\monolib_brush.o $(OBJS)\monolib_caret.o $(OBJS)\monolib_clipbrd.o $(OBJS)\monolib_colour.o $(OBJS)\monolib_cursor.o $(OBJS)\monolib_data.o $(OBJS)\monolib_dc.o $(OBJS)\monolib_dcclient.o $(OBJS)\monolib_dcmemory.o $(OBJS)\monolib_dcprint.o $(OBJS)\monolib_dcscreen.o $(OBJS)\monolib_dialup.o $(OBJS)\monolib_dib.o $(OBJS)\monolib_dirdlg.o $(OBJS)\monolib_display.o $(OBJS)\monolib_enhmeta.o $(OBJS)\monolib_evtloop.o $(OBJS)\monolib_font.o $(OBJS)\monolib_fontenum.o $(OBJS)\monolib_fontutil.o $(OBJS)\monolib_gdiimage.o $(OBJS)\monolib_gdiobj.o $(OBJS)\monolib_helpchm.o $(OBJS)\monolib_helpwin.o $(OBJS)\monolib_icon.o $(OBJS)\monolib_joystick.o $(OBJS)\monolib_minifram.o $(OBJS)\monolib_palette.o $(OBJS)\monolib_pen.o $(OBJS)\monolib_popupwin.o $(OBJS)\monolib_region.o $(OBJS)\monolib_settings.o $(OBJS)\monolib_taskbarcmn.o $(OBJS)\monolib_taskbar.o $(OBJS)\monolib_timer.o $(OBJS)\monolib_tooltip.o $(OBJS)\monolib_toplevel.o $(OBJS)\monolib_utilsgui.o $(OBJS)\monolib_wave.o $(OBJS)\monolib_window.o $(OBJS)\monolib_automtn.o $(OBJS)\monolib_dataobj.o $(OBJS)\monolib_dropsrc.o $(OBJS)\monolib_droptgt.o $(OBJS)\monolib_oleutils.o $(OBJS)\monolib_uuid.o $(OBJS)\monolib_textctrl.o $(OBJS)\monolib_bmpbuttn.o $(OBJS)\monolib_button.o $(OBJS)\monolib_checkbox.o $(OBJS)\monolib_checklst.o $(OBJS)\monolib_choice.o $(OBJS)\monolib_colschem.o $(OBJS)\monolib_combobox.o $(OBJS)\monolib_control.o $(OBJS)\monolib_dialog.o $(OBJS)\monolib_framuniv.o $(OBJS)\monolib_topluniv.o $(OBJS)\monolib_gauge.o $(OBJS)\monolib_inpcons.o $(OBJS)\monolib_inphand.o $(OBJS)\monolib_listbox.o $(OBJS)\monolib_menu.o $(OBJS)\monolib_notebook.o $(OBJS)\monolib_radiobox.o $(OBJS)\monolib_radiobut.o $(OBJS)\monolib_renderer.o $(OBJS)\monolib_scrarrow.o $(OBJS)\monolib_scrolbar.o $(OBJS)\monolib_scrthumb.o $(OBJS)\monolib_slider.o $(OBJS)\monolib_spinbutt.o $(OBJS)\monolib_statbmp.o $(OBJS)\monolib_statbox.o $(OBJS)\monolib_statline.o $(OBJS)\monolib_stattext.o $(OBJS)\monolib_statusbr.o $(OBJS)\monolib_toolbar.o $(OBJS)\monolib_theme.o $(OBJS)\monolib_winuniv.o $(OBJS)\monolib_mdig.o $(OBJS)\monolib_imaglist.o $(OBJS)\monolib_colrdlgg.o $(OBJS)\monolib_listctrl.o $(OBJS)\monolib_filedlgg.o $(OBJS)\monolib_dirdlgg.o $(OBJS)\monolib_prntdlgg.o $(OBJS)\monolib_accel.o $(OBJS)\monolib_msgdlgg.o $(OBJS)\monolib_fdrepdlg.o $(OBJS)\monolib_fontdlgg.o $(OBJS)\monolib_tabg.o $(OBJS)\monolib_gtk.o $(OBJS)\monolib_win32.o $(OBJS)\monolib_metal.o $(OBJS)\monolib_selstore.o $(OBJS)\monolib_busyinfo.o $(OBJS)\monolib_calctrl.o $(OBJS)\monolib_choicdgg.o $(OBJS)\monolib_dcbuffer.o $(OBJS)\monolib_dcpsg.o $(OBJS)\monolib_dirctrlg.o $(OBJS)\monolib_dragimgg.o $(OBJS)\monolib_grid.o $(OBJS)\monolib_gridctrl.o $(OBJS)\monolib_gridsel.o $(OBJS)\monolib_laywin.o $(OBJS)\monolib_logg.o $(OBJS)\monolib_numdlgg.o $(OBJS)\monolib_panelg.o $(OBJS)\monolib_progdlgg.o $(OBJS)\monolib_sashwin.o $(OBJS)\monolib_scrlwing.o $(OBJS)\monolib_spinctlg.o $(OBJS)\monolib_splash.o $(OBJS)\monolib_splitter.o $(OBJS)\monolib_tbarsmpl.o $(OBJS)\monolib_textdlgg.o $(OBJS)\monolib_tipdlg.o $(OBJS)\monolib_tipwin.o $(OBJS)\monolib_treectlg.o $(OBJS)\monolib_vlbox.o $(OBJS)\monolib_vscroll.o $(OBJS)\monolib_wizard.o $(OBJS)\monolib_appcmn.o $(OBJS)\monolib_fontmap.o $(OBJS)\monolib_accesscmn.o $(OBJS)\monolib_artprov.o $(OBJS)\monolib_artstd.o $(OBJS)\monolib_bmpbase.o $(OBJS)\monolib_choiccmn.o $(OBJS)\monolib_clipcmn.o $(OBJS)\monolib_cmdproc.o $(OBJS)\monolib_cmndata.o $(OBJS)\monolib_containr.o $(OBJS)\monolib_cshelp.o $(OBJS)\monolib_ctrlcmn.o $(OBJS)\monolib_ctrlsub.o $(OBJS)\monolib_datacmn.o $(OBJS)\monolib_dbgrid.o $(OBJS)\monolib_dcbase.o $(OBJS)\monolib_dlgcmn.o $(OBJS)\monolib_dndcmn.o $(OBJS)\monolib_dobjcmn.o $(OBJS)\monolib_docmdi.o $(OBJS)\monolib_docview.o $(OBJS)\monolib_dpycmn.o $(OBJS)\monolib_dseldlg.o $(OBJS)\monolib_effects.o $(OBJS)\monolib_fddlgcmn.o $(OBJS)\monolib_fldlgcmn.o $(OBJS)\monolib_fontcmn.o $(OBJS)\monolib_framecmn.o $(OBJS)\monolib_timercmn.o $(OBJS)\monolib_toplvcmn.o $(OBJS)\monolib_gaugecmn.o $(OBJS)\monolib_gdicmn.o $(OBJS)\monolib_geometry.o $(OBJS)\monolib_gifdecod.o $(OBJS)\monolib_helpbase.o $(OBJS)\monolib_iconbndl.o $(OBJS)\monolib_imagall.o $(OBJS)\monolib_imagbmp.o $(OBJS)\monolib_image.o $(OBJS)\monolib_imaggif.o $(OBJS)\monolib_imagiff.o $(OBJS)\monolib_imagjpeg.o $(OBJS)\monolib_imagpcx.o $(OBJS)\monolib_imagpng.o $(OBJS)\monolib_imagpnm.o $(OBJS)\monolib_imagtiff.o $(OBJS)\monolib_imagxpm.o $(OBJS)\monolib_imagfill.o $(OBJS)\monolib_layout.o $(OBJS)\monolib_lboxcmn.o $(OBJS)\monolib_matrix.o $(OBJS)\monolib_menucmn.o $(OBJS)\monolib_nbkbase.o $(OBJS)\monolib_paper.o $(OBJS)\monolib_popupcmn.o $(OBJS)\monolib_prntbase.o $(OBJS)\monolib_quantize.o $(OBJS)\monolib_radiocmn.o $(OBJS)\monolib_rgncmn.o $(OBJS)\monolib_settcmn.o $(OBJS)\monolib_sizer.o $(OBJS)\monolib_statbar.o $(OBJS)\monolib_tbarbase.o $(OBJS)\monolib_textcmn.o $(OBJS)\monolib_treebase.o $(OBJS)\monolib_valgen.o $(OBJS)\monolib_validate.o $(OBJS)\monolib_valtext.o $(OBJS)\monolib_wincmn.o $(OBJS)\monolib_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
-____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.o $(OBJS)\coredll_bitmap.o $(OBJS)\coredll_brush.o $(OBJS)\coredll_caret.o $(OBJS)\coredll_clipbrd.o $(OBJS)\coredll_colour.o $(OBJS)\coredll_cursor.o $(OBJS)\coredll_data.o $(OBJS)\coredll_dc.o $(OBJS)\coredll_dcclient.o $(OBJS)\coredll_dcmemory.o $(OBJS)\coredll_dcprint.o $(OBJS)\coredll_dcscreen.o $(OBJS)\coredll_dialup.o $(OBJS)\coredll_dib.o $(OBJS)\coredll_dirdlg.o $(OBJS)\coredll_display.o $(OBJS)\coredll_enhmeta.o $(OBJS)\coredll_evtloop.o $(OBJS)\coredll_font.o $(OBJS)\coredll_fontenum.o $(OBJS)\coredll_fontutil.o $(OBJS)\coredll_gdiimage.o $(OBJS)\coredll_gdiobj.o $(OBJS)\coredll_helpchm.o $(OBJS)\coredll_helpwin.o $(OBJS)\coredll_icon.o $(OBJS)\coredll_joystick.o $(OBJS)\coredll_minifram.o $(OBJS)\coredll_palette.o $(OBJS)\coredll_pen.o $(OBJS)\coredll_popupwin.o $(OBJS)\coredll_region.o $(OBJS)\coredll_settings.o $(OBJS)\coredll_taskbarcmn.o $(OBJS)\coredll_taskbar.o $(OBJS)\coredll_timer.o $(OBJS)\coredll_tooltip.o $(OBJS)\coredll_toplevel.o $(OBJS)\coredll_utilsgui.o $(OBJS)\coredll_wave.o $(OBJS)\coredll_window.o $(OBJS)\coredll_automtn.o $(OBJS)\coredll_dataobj.o $(OBJS)\coredll_dropsrc.o $(OBJS)\coredll_droptgt.o $(OBJS)\coredll_oleutils.o $(OBJS)\coredll_uuid.o $(OBJS)\coredll_statusbr.o $(OBJS)\coredll_uxtheme.o $(OBJS)\coredll_access.o $(OBJS)\coredll_accel.o $(OBJS)\coredll_bmpbuttn.o $(OBJS)\coredll_button.o $(OBJS)\coredll_checkbox.o $(OBJS)\coredll_checklst.o $(OBJS)\coredll_choice.o $(OBJS)\coredll_colordlg.o $(OBJS)\coredll_combobox.o $(OBJS)\coredll_control.o $(OBJS)\coredll_dialog.o $(OBJS)\coredll_dragimag.o $(OBJS)\coredll_fdrepdlg.o $(OBJS)\coredll_filedlg.o $(OBJS)\coredll_fontdlg.o $(OBJS)\coredll_frame.o $(OBJS)\coredll_gauge95.o $(OBJS)\coredll_imaglist.o $(OBJS)\coredll_iniconf.o $(OBJS)\coredll_listbox.o $(OBJS)\coredll_listctrl.o $(OBJS)\coredll_mdi.o $(OBJS)\coredll_menu.o $(OBJS)\coredll_menuitem.o $(OBJS)\coredll_metafile.o $(OBJS)\coredll_msgdlg.o $(OBJS)\coredll_nativdlg.o $(OBJS)\coredll_notebook.o $(OBJS)\coredll_ownerdrw.o $(OBJS)\coredll_penwin.o $(OBJS)\coredll_printdlg.o $(OBJS)\coredll_printwin.o $(OBJS)\coredll_radiobox.o $(OBJS)\coredll_radiobut.o $(OBJS)\coredll_scrolbar.o $(OBJS)\coredll_slider95.o $(OBJS)\coredll_spinbutt.o $(OBJS)\coredll_spinctrl.o $(OBJS)\coredll_statbmp.o $(OBJS)\coredll_statbox.o $(OBJS)\coredll_statbr95.o $(OBJS)\coredll_statline.o $(OBJS)\coredll_stattext.o $(OBJS)\coredll_tabctrl.o $(OBJS)\coredll_tbar95.o $(OBJS)\coredll_textctrl.o $(OBJS)\coredll_tglbtn.o $(OBJS)\coredll_treectrl.o $(OBJS)\coredll_selstore.o $(OBJS)\coredll_busyinfo.o $(OBJS)\coredll_calctrl.o $(OBJS)\coredll_choicdgg.o $(OBJS)\coredll_dcbuffer.o $(OBJS)\coredll_dcpsg.o $(OBJS)\coredll_dirctrlg.o $(OBJS)\coredll_grid.o $(OBJS)\coredll_gridctrl.o $(OBJS)\coredll_gridsel.o $(OBJS)\coredll_laywin.o $(OBJS)\coredll_logg.o $(OBJS)\coredll_numdlgg.o $(OBJS)\coredll_panelg.o $(OBJS)\coredll_progdlgg.o $(OBJS)\coredll_sashwin.o $(OBJS)\coredll_scrlwing.o $(OBJS)\coredll_spinctlg.o $(OBJS)\coredll_splash.o $(OBJS)\coredll_splitter.o $(OBJS)\coredll_tbarsmpl.o $(OBJS)\coredll_textdlgg.o $(OBJS)\coredll_tipdlg.o $(OBJS)\coredll_tipwin.o $(OBJS)\coredll_treectlg.o $(OBJS)\coredll_vlbox.o $(OBJS)\coredll_vscroll.o $(OBJS)\coredll_wizard.o $(OBJS)\coredll_appcmn.o $(OBJS)\coredll_fontmap.o $(OBJS)\coredll_accesscmn.o $(OBJS)\coredll_artprov.o $(OBJS)\coredll_artstd.o $(OBJS)\coredll_bmpbase.o $(OBJS)\coredll_choiccmn.o $(OBJS)\coredll_clipcmn.o $(OBJS)\coredll_cmdproc.o $(OBJS)\coredll_cmndata.o $(OBJS)\coredll_containr.o $(OBJS)\coredll_cshelp.o $(OBJS)\coredll_ctrlcmn.o $(OBJS)\coredll_ctrlsub.o $(OBJS)\coredll_datacmn.o $(OBJS)\coredll_dbgrid.o $(OBJS)\coredll_dcbase.o $(OBJS)\coredll_dlgcmn.o $(OBJS)\coredll_dndcmn.o $(OBJS)\coredll_dobjcmn.o $(OBJS)\coredll_docmdi.o $(OBJS)\coredll_docview.o $(OBJS)\coredll_dpycmn.o $(OBJS)\coredll_dseldlg.o $(OBJS)\coredll_effects.o $(OBJS)\coredll_fddlgcmn.o $(OBJS)\coredll_fldlgcmn.o $(OBJS)\coredll_fontcmn.o $(OBJS)\coredll_framecmn.o $(OBJS)\coredll_timercmn.o $(OBJS)\coredll_toplvcmn.o $(OBJS)\coredll_gaugecmn.o $(OBJS)\coredll_gdicmn.o $(OBJS)\coredll_geometry.o $(OBJS)\coredll_gifdecod.o $(OBJS)\coredll_helpbase.o $(OBJS)\coredll_iconbndl.o $(OBJS)\coredll_imagall.o $(OBJS)\coredll_imagbmp.o $(OBJS)\coredll_image.o $(OBJS)\coredll_imaggif.o $(OBJS)\coredll_imagiff.o $(OBJS)\coredll_imagjpeg.o $(OBJS)\coredll_imagpcx.o $(OBJS)\coredll_imagpng.o $(OBJS)\coredll_imagpnm.o $(OBJS)\coredll_imagtiff.o $(OBJS)\coredll_imagxpm.o $(OBJS)\coredll_imagfill.o $(OBJS)\coredll_layout.o $(OBJS)\coredll_lboxcmn.o $(OBJS)\coredll_matrix.o $(OBJS)\coredll_menucmn.o $(OBJS)\coredll_nbkbase.o $(OBJS)\coredll_paper.o $(OBJS)\coredll_popupcmn.o $(OBJS)\coredll_prntbase.o $(OBJS)\coredll_quantize.o $(OBJS)\coredll_radiocmn.o $(OBJS)\coredll_rgncmn.o $(OBJS)\coredll_settcmn.o $(OBJS)\coredll_sizer.o $(OBJS)\coredll_statbar.o $(OBJS)\coredll_tbarbase.o $(OBJS)\coredll_textcmn.o $(OBJS)\coredll_treebase.o $(OBJS)\coredll_valgen.o $(OBJS)\coredll_validate.o $(OBJS)\coredll_valtext.o $(OBJS)\coredll_wincmn.o $(OBJS)\coredll_xpmdecod.o
+____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.o $(OBJS)\coredll_bitmap.o $(OBJS)\coredll_brush.o $(OBJS)\coredll_caret.o $(OBJS)\coredll_clipbrd.o $(OBJS)\coredll_colour.o $(OBJS)\coredll_cursor.o $(OBJS)\coredll_data.o $(OBJS)\coredll_dc.o $(OBJS)\coredll_dcclient.o $(OBJS)\coredll_dcmemory.o $(OBJS)\coredll_dcprint.o $(OBJS)\coredll_dcscreen.o $(OBJS)\coredll_dialup.o $(OBJS)\coredll_dib.o $(OBJS)\coredll_dirdlg.o $(OBJS)\coredll_display.o $(OBJS)\coredll_enhmeta.o $(OBJS)\coredll_evtloop.o $(OBJS)\coredll_font.o $(OBJS)\coredll_fontenum.o $(OBJS)\coredll_fontutil.o $(OBJS)\coredll_gdiimage.o $(OBJS)\coredll_gdiobj.o $(OBJS)\coredll_helpchm.o $(OBJS)\coredll_helpwin.o $(OBJS)\coredll_icon.o $(OBJS)\coredll_joystick.o $(OBJS)\coredll_minifram.o $(OBJS)\coredll_palette.o $(OBJS)\coredll_pen.o $(OBJS)\coredll_popupwin.o $(OBJS)\coredll_region.o $(OBJS)\coredll_settings.o $(OBJS)\coredll_taskbarcmn.o $(OBJS)\coredll_taskbar.o $(OBJS)\coredll_timer.o $(OBJS)\coredll_tooltip.o $(OBJS)\coredll_toplevel.o $(OBJS)\coredll_utilsgui.o $(OBJS)\coredll_wave.o $(OBJS)\coredll_window.o $(OBJS)\coredll_automtn.o $(OBJS)\coredll_dataobj.o $(OBJS)\coredll_dropsrc.o $(OBJS)\coredll_droptgt.o $(OBJS)\coredll_oleutils.o $(OBJS)\coredll_uuid.o $(OBJS)\coredll_statusbr.o $(OBJS)\coredll_uxtheme.o $(OBJS)\coredll_access.o $(OBJS)\coredll_accel.o $(OBJS)\coredll_bmpbuttn.o $(OBJS)\coredll_button.o $(OBJS)\coredll_checkbox.o $(OBJS)\coredll_checklst.o $(OBJS)\coredll_choice.o $(OBJS)\coredll_colordlg.o $(OBJS)\coredll_combobox.o $(OBJS)\coredll_control.o $(OBJS)\coredll_dialog.o $(OBJS)\coredll_dragimag.o $(OBJS)\coredll_fdrepdlg.o $(OBJS)\coredll_filedlg.o $(OBJS)\coredll_fontdlg.o $(OBJS)\coredll_frame.o $(OBJS)\coredll_gauge95.o $(OBJS)\coredll_imaglist.o $(OBJS)\coredll_iniconf.o $(OBJS)\coredll_listbox.o $(OBJS)\coredll_listctrl.o $(OBJS)\coredll_mdi.o $(OBJS)\coredll_menu.o $(OBJS)\coredll_menuitem.o $(OBJS)\coredll_metafile.o $(OBJS)\coredll_msgdlg.o $(OBJS)\coredll_nativdlg.o $(OBJS)\coredll_notebook.o $(OBJS)\coredll_ownerdrw.o $(OBJS)\coredll_penwin.o $(OBJS)\coredll_printdlg.o $(OBJS)\coredll_printwin.o $(OBJS)\coredll_radiobox.o $(OBJS)\coredll_radiobut.o $(OBJS)\coredll_scrolbar.o $(OBJS)\coredll_slider95.o $(OBJS)\coredll_spinbutt.o $(OBJS)\coredll_spinctrl.o $(OBJS)\coredll_statbmp.o $(OBJS)\coredll_statbox.o $(OBJS)\coredll_statbr95.o $(OBJS)\coredll_statline.o $(OBJS)\coredll_stattext.o $(OBJS)\coredll_tabctrl.o $(OBJS)\coredll_tbar95.o $(OBJS)\coredll_textctrl.o $(OBJS)\coredll_tglbtn.o $(OBJS)\coredll_treectrl.o $(OBJS)\coredll_selstore.o $(OBJS)\coredll_busyinfo.o $(OBJS)\coredll_calctrl.o $(OBJS)\coredll_choicdgg.o $(OBJS)\coredll_dcbuffer.o $(OBJS)\coredll_dcpsg.o $(OBJS)\coredll_dirctrlg.o $(OBJS)\coredll_dragimgg.o $(OBJS)\coredll_grid.o $(OBJS)\coredll_gridctrl.o $(OBJS)\coredll_gridsel.o $(OBJS)\coredll_laywin.o $(OBJS)\coredll_logg.o $(OBJS)\coredll_numdlgg.o $(OBJS)\coredll_panelg.o $(OBJS)\coredll_progdlgg.o $(OBJS)\coredll_sashwin.o $(OBJS)\coredll_scrlwing.o $(OBJS)\coredll_spinctlg.o $(OBJS)\coredll_splash.o $(OBJS)\coredll_splitter.o $(OBJS)\coredll_tbarsmpl.o $(OBJS)\coredll_textdlgg.o $(OBJS)\coredll_tipdlg.o $(OBJS)\coredll_tipwin.o $(OBJS)\coredll_treectlg.o $(OBJS)\coredll_vlbox.o $(OBJS)\coredll_vscroll.o $(OBJS)\coredll_wizard.o $(OBJS)\coredll_appcmn.o $(OBJS)\coredll_fontmap.o $(OBJS)\coredll_accesscmn.o $(OBJS)\coredll_artprov.o $(OBJS)\coredll_artstd.o $(OBJS)\coredll_bmpbase.o $(OBJS)\coredll_choiccmn.o $(OBJS)\coredll_clipcmn.o $(OBJS)\coredll_cmdproc.o $(OBJS)\coredll_cmndata.o $(OBJS)\coredll_containr.o $(OBJS)\coredll_cshelp.o $(OBJS)\coredll_ctrlcmn.o $(OBJS)\coredll_ctrlsub.o $(OBJS)\coredll_datacmn.o $(OBJS)\coredll_dbgrid.o $(OBJS)\coredll_dcbase.o $(OBJS)\coredll_dlgcmn.o $(OBJS)\coredll_dndcmn.o $(OBJS)\coredll_dobjcmn.o $(OBJS)\coredll_docmdi.o $(OBJS)\coredll_docview.o $(OBJS)\coredll_dpycmn.o $(OBJS)\coredll_dseldlg.o $(OBJS)\coredll_effects.o $(OBJS)\coredll_fddlgcmn.o $(OBJS)\coredll_fldlgcmn.o $(OBJS)\coredll_fontcmn.o $(OBJS)\coredll_framecmn.o $(OBJS)\coredll_timercmn.o $(OBJS)\coredll_toplvcmn.o $(OBJS)\coredll_gaugecmn.o $(OBJS)\coredll_gdicmn.o $(OBJS)\coredll_geometry.o $(OBJS)\coredll_gifdecod.o $(OBJS)\coredll_helpbase.o $(OBJS)\coredll_iconbndl.o $(OBJS)\coredll_imagall.o $(OBJS)\coredll_imagbmp.o $(OBJS)\coredll_image.o $(OBJS)\coredll_imaggif.o $(OBJS)\coredll_imagiff.o $(OBJS)\coredll_imagjpeg.o $(OBJS)\coredll_imagpcx.o $(OBJS)\coredll_imagpng.o $(OBJS)\coredll_imagpnm.o $(OBJS)\coredll_imagtiff.o $(OBJS)\coredll_imagxpm.o $(OBJS)\coredll_imagfill.o $(OBJS)\coredll_layout.o $(OBJS)\coredll_lboxcmn.o $(OBJS)\coredll_matrix.o $(OBJS)\coredll_menucmn.o $(OBJS)\coredll_nbkbase.o $(OBJS)\coredll_paper.o $(OBJS)\coredll_popupcmn.o $(OBJS)\coredll_prntbase.o $(OBJS)\coredll_quantize.o $(OBJS)\coredll_radiocmn.o $(OBJS)\coredll_rgncmn.o $(OBJS)\coredll_settcmn.o $(OBJS)\coredll_sizer.o $(OBJS)\coredll_statbar.o $(OBJS)\coredll_tbarbase.o $(OBJS)\coredll_textcmn.o $(OBJS)\coredll_treebase.o $(OBJS)\coredll_valgen.o $(OBJS)\coredll_validate.o $(OBJS)\coredll_valtext.o $(OBJS)\coredll_wincmn.o $(OBJS)\coredll_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
-____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.o $(OBJS)\coredll_bitmap.o $(OBJS)\coredll_brush.o $(OBJS)\coredll_caret.o $(OBJS)\coredll_clipbrd.o $(OBJS)\coredll_colour.o $(OBJS)\coredll_cursor.o $(OBJS)\coredll_data.o $(OBJS)\coredll_dc.o $(OBJS)\coredll_dcclient.o $(OBJS)\coredll_dcmemory.o $(OBJS)\coredll_dcprint.o $(OBJS)\coredll_dcscreen.o $(OBJS)\coredll_dialup.o $(OBJS)\coredll_dib.o $(OBJS)\coredll_dirdlg.o $(OBJS)\coredll_display.o $(OBJS)\coredll_enhmeta.o $(OBJS)\coredll_evtloop.o $(OBJS)\coredll_font.o $(OBJS)\coredll_fontenum.o $(OBJS)\coredll_fontutil.o $(OBJS)\coredll_gdiimage.o $(OBJS)\coredll_gdiobj.o $(OBJS)\coredll_helpchm.o $(OBJS)\coredll_helpwin.o $(OBJS)\coredll_icon.o $(OBJS)\coredll_joystick.o $(OBJS)\coredll_minifram.o $(OBJS)\coredll_palette.o $(OBJS)\coredll_pen.o $(OBJS)\coredll_popupwin.o $(OBJS)\coredll_region.o $(OBJS)\coredll_settings.o $(OBJS)\coredll_taskbarcmn.o $(OBJS)\coredll_taskbar.o $(OBJS)\coredll_timer.o $(OBJS)\coredll_tooltip.o $(OBJS)\coredll_toplevel.o $(OBJS)\coredll_utilsgui.o $(OBJS)\coredll_wave.o $(OBJS)\coredll_window.o $(OBJS)\coredll_automtn.o $(OBJS)\coredll_dataobj.o $(OBJS)\coredll_dropsrc.o $(OBJS)\coredll_droptgt.o $(OBJS)\coredll_oleutils.o $(OBJS)\coredll_uuid.o $(OBJS)\coredll_textctrl.o $(OBJS)\coredll_bmpbuttn.o $(OBJS)\coredll_button.o $(OBJS)\coredll_checkbox.o $(OBJS)\coredll_checklst.o $(OBJS)\coredll_choice.o $(OBJS)\coredll_colschem.o $(OBJS)\coredll_combobox.o $(OBJS)\coredll_control.o $(OBJS)\coredll_dialog.o $(OBJS)\coredll_framuniv.o $(OBJS)\coredll_topluniv.o $(OBJS)\coredll_gauge.o $(OBJS)\coredll_inpcons.o $(OBJS)\coredll_inphand.o $(OBJS)\coredll_listbox.o $(OBJS)\coredll_menu.o $(OBJS)\coredll_notebook.o $(OBJS)\coredll_radiobox.o $(OBJS)\coredll_radiobut.o $(OBJS)\coredll_renderer.o $(OBJS)\coredll_scrarrow.o $(OBJS)\coredll_scrolbar.o $(OBJS)\coredll_scrthumb.o $(OBJS)\coredll_slider.o $(OBJS)\coredll_spinbutt.o $(OBJS)\coredll_statbmp.o $(OBJS)\coredll_statbox.o $(OBJS)\coredll_statline.o $(OBJS)\coredll_stattext.o $(OBJS)\coredll_statusbr.o $(OBJS)\coredll_toolbar.o $(OBJS)\coredll_theme.o $(OBJS)\coredll_winuniv.o $(OBJS)\coredll_mdig.o $(OBJS)\coredll_imaglist.o $(OBJS)\coredll_colrdlgg.o $(OBJS)\coredll_listctrl.o $(OBJS)\coredll_filedlgg.o $(OBJS)\coredll_dirdlgg.o $(OBJS)\coredll_prntdlgg.o $(OBJS)\coredll_accel.o $(OBJS)\coredll_msgdlgg.o $(OBJS)\coredll_fdrepdlg.o $(OBJS)\coredll_fontdlgg.o $(OBJS)\coredll_tabg.o $(OBJS)\coredll_gtk.o $(OBJS)\coredll_win32.o $(OBJS)\coredll_metal.o $(OBJS)\coredll_selstore.o $(OBJS)\coredll_busyinfo.o $(OBJS)\coredll_calctrl.o $(OBJS)\coredll_choicdgg.o $(OBJS)\coredll_dcbuffer.o $(OBJS)\coredll_dcpsg.o $(OBJS)\coredll_dirctrlg.o $(OBJS)\coredll_grid.o $(OBJS)\coredll_gridctrl.o $(OBJS)\coredll_gridsel.o $(OBJS)\coredll_laywin.o $(OBJS)\coredll_logg.o $(OBJS)\coredll_numdlgg.o $(OBJS)\coredll_panelg.o $(OBJS)\coredll_progdlgg.o $(OBJS)\coredll_sashwin.o $(OBJS)\coredll_scrlwing.o $(OBJS)\coredll_spinctlg.o $(OBJS)\coredll_splash.o $(OBJS)\coredll_splitter.o $(OBJS)\coredll_tbarsmpl.o $(OBJS)\coredll_textdlgg.o $(OBJS)\coredll_tipdlg.o $(OBJS)\coredll_tipwin.o $(OBJS)\coredll_treectlg.o $(OBJS)\coredll_vlbox.o $(OBJS)\coredll_vscroll.o $(OBJS)\coredll_wizard.o $(OBJS)\coredll_appcmn.o $(OBJS)\coredll_fontmap.o $(OBJS)\coredll_accesscmn.o $(OBJS)\coredll_artprov.o $(OBJS)\coredll_artstd.o $(OBJS)\coredll_bmpbase.o $(OBJS)\coredll_choiccmn.o $(OBJS)\coredll_clipcmn.o $(OBJS)\coredll_cmdproc.o $(OBJS)\coredll_cmndata.o $(OBJS)\coredll_containr.o $(OBJS)\coredll_cshelp.o $(OBJS)\coredll_ctrlcmn.o $(OBJS)\coredll_ctrlsub.o $(OBJS)\coredll_datacmn.o $(OBJS)\coredll_dbgrid.o $(OBJS)\coredll_dcbase.o $(OBJS)\coredll_dlgcmn.o $(OBJS)\coredll_dndcmn.o $(OBJS)\coredll_dobjcmn.o $(OBJS)\coredll_docmdi.o $(OBJS)\coredll_docview.o $(OBJS)\coredll_dpycmn.o $(OBJS)\coredll_dseldlg.o $(OBJS)\coredll_effects.o $(OBJS)\coredll_fddlgcmn.o $(OBJS)\coredll_fldlgcmn.o $(OBJS)\coredll_fontcmn.o $(OBJS)\coredll_framecmn.o $(OBJS)\coredll_timercmn.o $(OBJS)\coredll_toplvcmn.o $(OBJS)\coredll_gaugecmn.o $(OBJS)\coredll_gdicmn.o $(OBJS)\coredll_geometry.o $(OBJS)\coredll_gifdecod.o $(OBJS)\coredll_helpbase.o $(OBJS)\coredll_iconbndl.o $(OBJS)\coredll_imagall.o $(OBJS)\coredll_imagbmp.o $(OBJS)\coredll_image.o $(OBJS)\coredll_imaggif.o $(OBJS)\coredll_imagiff.o $(OBJS)\coredll_imagjpeg.o $(OBJS)\coredll_imagpcx.o $(OBJS)\coredll_imagpng.o $(OBJS)\coredll_imagpnm.o $(OBJS)\coredll_imagtiff.o $(OBJS)\coredll_imagxpm.o $(OBJS)\coredll_imagfill.o $(OBJS)\coredll_layout.o $(OBJS)\coredll_lboxcmn.o $(OBJS)\coredll_matrix.o $(OBJS)\coredll_menucmn.o $(OBJS)\coredll_nbkbase.o $(OBJS)\coredll_paper.o $(OBJS)\coredll_popupcmn.o $(OBJS)\coredll_prntbase.o $(OBJS)\coredll_quantize.o $(OBJS)\coredll_radiocmn.o $(OBJS)\coredll_rgncmn.o $(OBJS)\coredll_settcmn.o $(OBJS)\coredll_sizer.o $(OBJS)\coredll_statbar.o $(OBJS)\coredll_tbarbase.o $(OBJS)\coredll_textcmn.o $(OBJS)\coredll_treebase.o $(OBJS)\coredll_valgen.o $(OBJS)\coredll_validate.o $(OBJS)\coredll_valtext.o $(OBJS)\coredll_wincmn.o $(OBJS)\coredll_xpmdecod.o
+____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.o $(OBJS)\coredll_bitmap.o $(OBJS)\coredll_brush.o $(OBJS)\coredll_caret.o $(OBJS)\coredll_clipbrd.o $(OBJS)\coredll_colour.o $(OBJS)\coredll_cursor.o $(OBJS)\coredll_data.o $(OBJS)\coredll_dc.o $(OBJS)\coredll_dcclient.o $(OBJS)\coredll_dcmemory.o $(OBJS)\coredll_dcprint.o $(OBJS)\coredll_dcscreen.o $(OBJS)\coredll_dialup.o $(OBJS)\coredll_dib.o $(OBJS)\coredll_dirdlg.o $(OBJS)\coredll_display.o $(OBJS)\coredll_enhmeta.o $(OBJS)\coredll_evtloop.o $(OBJS)\coredll_font.o $(OBJS)\coredll_fontenum.o $(OBJS)\coredll_fontutil.o $(OBJS)\coredll_gdiimage.o $(OBJS)\coredll_gdiobj.o $(OBJS)\coredll_helpchm.o $(OBJS)\coredll_helpwin.o $(OBJS)\coredll_icon.o $(OBJS)\coredll_joystick.o $(OBJS)\coredll_minifram.o $(OBJS)\coredll_palette.o $(OBJS)\coredll_pen.o $(OBJS)\coredll_popupwin.o $(OBJS)\coredll_region.o $(OBJS)\coredll_settings.o $(OBJS)\coredll_taskbarcmn.o $(OBJS)\coredll_taskbar.o $(OBJS)\coredll_timer.o $(OBJS)\coredll_tooltip.o $(OBJS)\coredll_toplevel.o $(OBJS)\coredll_utilsgui.o $(OBJS)\coredll_wave.o $(OBJS)\coredll_window.o $(OBJS)\coredll_automtn.o $(OBJS)\coredll_dataobj.o $(OBJS)\coredll_dropsrc.o $(OBJS)\coredll_droptgt.o $(OBJS)\coredll_oleutils.o $(OBJS)\coredll_uuid.o $(OBJS)\coredll_textctrl.o $(OBJS)\coredll_bmpbuttn.o $(OBJS)\coredll_button.o $(OBJS)\coredll_checkbox.o $(OBJS)\coredll_checklst.o $(OBJS)\coredll_choice.o $(OBJS)\coredll_colschem.o $(OBJS)\coredll_combobox.o $(OBJS)\coredll_control.o $(OBJS)\coredll_dialog.o $(OBJS)\coredll_framuniv.o $(OBJS)\coredll_topluniv.o $(OBJS)\coredll_gauge.o $(OBJS)\coredll_inpcons.o $(OBJS)\coredll_inphand.o $(OBJS)\coredll_listbox.o $(OBJS)\coredll_menu.o $(OBJS)\coredll_notebook.o $(OBJS)\coredll_radiobox.o $(OBJS)\coredll_radiobut.o $(OBJS)\coredll_renderer.o $(OBJS)\coredll_scrarrow.o $(OBJS)\coredll_scrolbar.o $(OBJS)\coredll_scrthumb.o $(OBJS)\coredll_slider.o $(OBJS)\coredll_spinbutt.o $(OBJS)\coredll_statbmp.o $(OBJS)\coredll_statbox.o $(OBJS)\coredll_statline.o $(OBJS)\coredll_stattext.o $(OBJS)\coredll_statusbr.o $(OBJS)\coredll_toolbar.o $(OBJS)\coredll_theme.o $(OBJS)\coredll_winuniv.o $(OBJS)\coredll_mdig.o $(OBJS)\coredll_imaglist.o $(OBJS)\coredll_colrdlgg.o $(OBJS)\coredll_listctrl.o $(OBJS)\coredll_filedlgg.o $(OBJS)\coredll_dirdlgg.o $(OBJS)\coredll_prntdlgg.o $(OBJS)\coredll_accel.o $(OBJS)\coredll_msgdlgg.o $(OBJS)\coredll_fdrepdlg.o $(OBJS)\coredll_fontdlgg.o $(OBJS)\coredll_tabg.o $(OBJS)\coredll_gtk.o $(OBJS)\coredll_win32.o $(OBJS)\coredll_metal.o $(OBJS)\coredll_selstore.o $(OBJS)\coredll_busyinfo.o $(OBJS)\coredll_calctrl.o $(OBJS)\coredll_choicdgg.o $(OBJS)\coredll_dcbuffer.o $(OBJS)\coredll_dcpsg.o $(OBJS)\coredll_dirctrlg.o $(OBJS)\coredll_dragimgg.o $(OBJS)\coredll_grid.o $(OBJS)\coredll_gridctrl.o $(OBJS)\coredll_gridsel.o $(OBJS)\coredll_laywin.o $(OBJS)\coredll_logg.o $(OBJS)\coredll_numdlgg.o $(OBJS)\coredll_panelg.o $(OBJS)\coredll_progdlgg.o $(OBJS)\coredll_sashwin.o $(OBJS)\coredll_scrlwing.o $(OBJS)\coredll_spinctlg.o $(OBJS)\coredll_splash.o $(OBJS)\coredll_splitter.o $(OBJS)\coredll_tbarsmpl.o $(OBJS)\coredll_textdlgg.o $(OBJS)\coredll_tipdlg.o $(OBJS)\coredll_tipwin.o $(OBJS)\coredll_treectlg.o $(OBJS)\coredll_vlbox.o $(OBJS)\coredll_vscroll.o $(OBJS)\coredll_wizard.o $(OBJS)\coredll_appcmn.o $(OBJS)\coredll_fontmap.o $(OBJS)\coredll_accesscmn.o $(OBJS)\coredll_artprov.o $(OBJS)\coredll_artstd.o $(OBJS)\coredll_bmpbase.o $(OBJS)\coredll_choiccmn.o $(OBJS)\coredll_clipcmn.o $(OBJS)\coredll_cmdproc.o $(OBJS)\coredll_cmndata.o $(OBJS)\coredll_containr.o $(OBJS)\coredll_cshelp.o $(OBJS)\coredll_ctrlcmn.o $(OBJS)\coredll_ctrlsub.o $(OBJS)\coredll_datacmn.o $(OBJS)\coredll_dbgrid.o $(OBJS)\coredll_dcbase.o $(OBJS)\coredll_dlgcmn.o $(OBJS)\coredll_dndcmn.o $(OBJS)\coredll_dobjcmn.o $(OBJS)\coredll_docmdi.o $(OBJS)\coredll_docview.o $(OBJS)\coredll_dpycmn.o $(OBJS)\coredll_dseldlg.o $(OBJS)\coredll_effects.o $(OBJS)\coredll_fddlgcmn.o $(OBJS)\coredll_fldlgcmn.o $(OBJS)\coredll_fontcmn.o $(OBJS)\coredll_framecmn.o $(OBJS)\coredll_timercmn.o $(OBJS)\coredll_toplvcmn.o $(OBJS)\coredll_gaugecmn.o $(OBJS)\coredll_gdicmn.o $(OBJS)\coredll_geometry.o $(OBJS)\coredll_gifdecod.o $(OBJS)\coredll_helpbase.o $(OBJS)\coredll_iconbndl.o $(OBJS)\coredll_imagall.o $(OBJS)\coredll_imagbmp.o $(OBJS)\coredll_image.o $(OBJS)\coredll_imaggif.o $(OBJS)\coredll_imagiff.o $(OBJS)\coredll_imagjpeg.o $(OBJS)\coredll_imagpcx.o $(OBJS)\coredll_imagpng.o $(OBJS)\coredll_imagpnm.o $(OBJS)\coredll_imagtiff.o $(OBJS)\coredll_imagxpm.o $(OBJS)\coredll_imagfill.o $(OBJS)\coredll_layout.o $(OBJS)\coredll_lboxcmn.o $(OBJS)\coredll_matrix.o $(OBJS)\coredll_menucmn.o $(OBJS)\coredll_nbkbase.o $(OBJS)\coredll_paper.o $(OBJS)\coredll_popupcmn.o $(OBJS)\coredll_prntbase.o $(OBJS)\coredll_quantize.o $(OBJS)\coredll_radiocmn.o $(OBJS)\coredll_rgncmn.o $(OBJS)\coredll_settcmn.o $(OBJS)\coredll_sizer.o $(OBJS)\coredll_statbar.o $(OBJS)\coredll_tbarbase.o $(OBJS)\coredll_textcmn.o $(OBJS)\coredll_treebase.o $(OBJS)\coredll_valgen.o $(OBJS)\coredll_validate.o $(OBJS)\coredll_valtext.o $(OBJS)\coredll_wincmn.o $(OBJS)\coredll_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.o $(OBJS)\corelib_bitmap.o $(OBJS)\corelib_brush.o $(OBJS)\corelib_caret.o $(OBJS)\corelib_clipbrd.o $(OBJS)\corelib_colour.o $(OBJS)\corelib_cursor.o $(OBJS)\corelib_data.o $(OBJS)\corelib_dc.o $(OBJS)\corelib_dcclient.o $(OBJS)\corelib_dcmemory.o $(OBJS)\corelib_dcprint.o $(OBJS)\corelib_dcscreen.o $(OBJS)\corelib_dialup.o $(OBJS)\corelib_dib.o $(OBJS)\corelib_dirdlg.o $(OBJS)\corelib_display.o $(OBJS)\corelib_enhmeta.o $(OBJS)\corelib_evtloop.o $(OBJS)\corelib_font.o $(OBJS)\corelib_fontenum.o $(OBJS)\corelib_fontutil.o $(OBJS)\corelib_gdiimage.o $(OBJS)\corelib_gdiobj.o $(OBJS)\corelib_helpchm.o $(OBJS)\corelib_helpwin.o $(OBJS)\corelib_icon.o $(OBJS)\corelib_joystick.o $(OBJS)\corelib_minifram.o $(OBJS)\corelib_palette.o $(OBJS)\corelib_pen.o $(OBJS)\corelib_popupwin.o $(OBJS)\corelib_region.o $(OBJS)\corelib_settings.o $(OBJS)\corelib_taskbarcmn.o $(OBJS)\corelib_taskbar.o $(OBJS)\corelib_timer.o $(OBJS)\corelib_tooltip.o $(OBJS)\corelib_toplevel.o $(OBJS)\corelib_utilsgui.o $(OBJS)\corelib_wave.o $(OBJS)\corelib_window.o $(OBJS)\corelib_automtn.o $(OBJS)\corelib_dataobj.o $(OBJS)\corelib_dropsrc.o $(OBJS)\corelib_droptgt.o $(OBJS)\corelib_oleutils.o $(OBJS)\corelib_uuid.o $(OBJS)\corelib_statusbr.o $(OBJS)\corelib_uxtheme.o $(OBJS)\corelib_access.o $(OBJS)\corelib_accel.o $(OBJS)\corelib_bmpbuttn.o $(OBJS)\corelib_button.o $(OBJS)\corelib_checkbox.o $(OBJS)\corelib_checklst.o $(OBJS)\corelib_choice.o $(OBJS)\corelib_colordlg.o $(OBJS)\corelib_combobox.o $(OBJS)\corelib_control.o $(OBJS)\corelib_dialog.o $(OBJS)\corelib_dragimag.o $(OBJS)\corelib_fdrepdlg.o $(OBJS)\corelib_filedlg.o $(OBJS)\corelib_fontdlg.o $(OBJS)\corelib_frame.o $(OBJS)\corelib_gauge95.o $(OBJS)\corelib_imaglist.o $(OBJS)\corelib_iniconf.o $(OBJS)\corelib_listbox.o $(OBJS)\corelib_listctrl.o $(OBJS)\corelib_mdi.o $(OBJS)\corelib_menu.o $(OBJS)\corelib_menuitem.o $(OBJS)\corelib_metafile.o $(OBJS)\corelib_msgdlg.o $(OBJS)\corelib_nativdlg.o $(OBJS)\corelib_notebook.o $(OBJS)\corelib_ownerdrw.o $(OBJS)\corelib_penwin.o $(OBJS)\corelib_printdlg.o $(OBJS)\corelib_printwin.o $(OBJS)\corelib_radiobox.o $(OBJS)\corelib_radiobut.o $(OBJS)\corelib_scrolbar.o $(OBJS)\corelib_slider95.o $(OBJS)\corelib_spinbutt.o $(OBJS)\corelib_spinctrl.o $(OBJS)\corelib_statbmp.o $(OBJS)\corelib_statbox.o $(OBJS)\corelib_statbr95.o $(OBJS)\corelib_statline.o $(OBJS)\corelib_stattext.o $(OBJS)\corelib_tabctrl.o $(OBJS)\corelib_tbar95.o $(OBJS)\corelib_textctrl.o $(OBJS)\corelib_tglbtn.o $(OBJS)\corelib_treectrl.o $(OBJS)\corelib_selstore.o $(OBJS)\corelib_busyinfo.o $(OBJS)\corelib_calctrl.o $(OBJS)\corelib_choicdgg.o $(OBJS)\corelib_dcbuffer.o $(OBJS)\corelib_dcpsg.o $(OBJS)\corelib_dirctrlg.o $(OBJS)\corelib_grid.o $(OBJS)\corelib_gridctrl.o $(OBJS)\corelib_gridsel.o $(OBJS)\corelib_laywin.o $(OBJS)\corelib_logg.o $(OBJS)\corelib_numdlgg.o $(OBJS)\corelib_panelg.o $(OBJS)\corelib_progdlgg.o $(OBJS)\corelib_sashwin.o $(OBJS)\corelib_scrlwing.o $(OBJS)\corelib_spinctlg.o $(OBJS)\corelib_splash.o $(OBJS)\corelib_splitter.o $(OBJS)\corelib_tbarsmpl.o $(OBJS)\corelib_textdlgg.o $(OBJS)\corelib_tipdlg.o $(OBJS)\corelib_tipwin.o $(OBJS)\corelib_treectlg.o $(OBJS)\corelib_vlbox.o $(OBJS)\corelib_vscroll.o $(OBJS)\corelib_wizard.o $(OBJS)\corelib_appcmn.o $(OBJS)\corelib_fontmap.o $(OBJS)\corelib_accesscmn.o $(OBJS)\corelib_artprov.o $(OBJS)\corelib_artstd.o $(OBJS)\corelib_bmpbase.o $(OBJS)\corelib_choiccmn.o $(OBJS)\corelib_clipcmn.o $(OBJS)\corelib_cmdproc.o $(OBJS)\corelib_cmndata.o $(OBJS)\corelib_containr.o $(OBJS)\corelib_cshelp.o $(OBJS)\corelib_ctrlcmn.o $(OBJS)\corelib_ctrlsub.o $(OBJS)\corelib_datacmn.o $(OBJS)\corelib_dbgrid.o $(OBJS)\corelib_dcbase.o $(OBJS)\corelib_dlgcmn.o $(OBJS)\corelib_dndcmn.o $(OBJS)\corelib_dobjcmn.o $(OBJS)\corelib_docmdi.o $(OBJS)\corelib_docview.o $(OBJS)\corelib_dpycmn.o $(OBJS)\corelib_dseldlg.o $(OBJS)\corelib_effects.o $(OBJS)\corelib_fddlgcmn.o $(OBJS)\corelib_fldlgcmn.o $(OBJS)\corelib_fontcmn.o $(OBJS)\corelib_framecmn.o $(OBJS)\corelib_timercmn.o $(OBJS)\corelib_toplvcmn.o $(OBJS)\corelib_gaugecmn.o $(OBJS)\corelib_gdicmn.o $(OBJS)\corelib_geometry.o $(OBJS)\corelib_gifdecod.o $(OBJS)\corelib_helpbase.o $(OBJS)\corelib_iconbndl.o $(OBJS)\corelib_imagall.o $(OBJS)\corelib_imagbmp.o $(OBJS)\corelib_image.o $(OBJS)\corelib_imaggif.o $(OBJS)\corelib_imagiff.o $(OBJS)\corelib_imagjpeg.o $(OBJS)\corelib_imagpcx.o $(OBJS)\corelib_imagpng.o $(OBJS)\corelib_imagpnm.o $(OBJS)\corelib_imagtiff.o $(OBJS)\corelib_imagxpm.o $(OBJS)\corelib_imagfill.o $(OBJS)\corelib_layout.o $(OBJS)\corelib_lboxcmn.o $(OBJS)\corelib_matrix.o $(OBJS)\corelib_menucmn.o $(OBJS)\corelib_nbkbase.o $(OBJS)\corelib_paper.o $(OBJS)\corelib_popupcmn.o $(OBJS)\corelib_prntbase.o $(OBJS)\corelib_quantize.o $(OBJS)\corelib_radiocmn.o $(OBJS)\corelib_rgncmn.o $(OBJS)\corelib_settcmn.o $(OBJS)\corelib_sizer.o $(OBJS)\corelib_statbar.o $(OBJS)\corelib_tbarbase.o $(OBJS)\corelib_textcmn.o $(OBJS)\corelib_treebase.o $(OBJS)\corelib_valgen.o $(OBJS)\corelib_validate.o $(OBJS)\corelib_valtext.o $(OBJS)\corelib_wincmn.o $(OBJS)\corelib_xpmdecod.o
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.o $(OBJS)\corelib_bitmap.o $(OBJS)\corelib_brush.o $(OBJS)\corelib_caret.o $(OBJS)\corelib_clipbrd.o $(OBJS)\corelib_colour.o $(OBJS)\corelib_cursor.o $(OBJS)\corelib_data.o $(OBJS)\corelib_dc.o $(OBJS)\corelib_dcclient.o $(OBJS)\corelib_dcmemory.o $(OBJS)\corelib_dcprint.o $(OBJS)\corelib_dcscreen.o $(OBJS)\corelib_dialup.o $(OBJS)\corelib_dib.o $(OBJS)\corelib_dirdlg.o $(OBJS)\corelib_display.o $(OBJS)\corelib_enhmeta.o $(OBJS)\corelib_evtloop.o $(OBJS)\corelib_font.o $(OBJS)\corelib_fontenum.o $(OBJS)\corelib_fontutil.o $(OBJS)\corelib_gdiimage.o $(OBJS)\corelib_gdiobj.o $(OBJS)\corelib_helpchm.o $(OBJS)\corelib_helpwin.o $(OBJS)\corelib_icon.o $(OBJS)\corelib_joystick.o $(OBJS)\corelib_minifram.o $(OBJS)\corelib_palette.o $(OBJS)\corelib_pen.o $(OBJS)\corelib_popupwin.o $(OBJS)\corelib_region.o $(OBJS)\corelib_settings.o $(OBJS)\corelib_taskbarcmn.o $(OBJS)\corelib_taskbar.o $(OBJS)\corelib_timer.o $(OBJS)\corelib_tooltip.o $(OBJS)\corelib_toplevel.o $(OBJS)\corelib_utilsgui.o $(OBJS)\corelib_wave.o $(OBJS)\corelib_window.o $(OBJS)\corelib_automtn.o $(OBJS)\corelib_dataobj.o $(OBJS)\corelib_dropsrc.o $(OBJS)\corelib_droptgt.o $(OBJS)\corelib_oleutils.o $(OBJS)\corelib_uuid.o $(OBJS)\corelib_statusbr.o $(OBJS)\corelib_uxtheme.o $(OBJS)\corelib_access.o $(OBJS)\corelib_accel.o $(OBJS)\corelib_bmpbuttn.o $(OBJS)\corelib_button.o $(OBJS)\corelib_checkbox.o $(OBJS)\corelib_checklst.o $(OBJS)\corelib_choice.o $(OBJS)\corelib_colordlg.o $(OBJS)\corelib_combobox.o $(OBJS)\corelib_control.o $(OBJS)\corelib_dialog.o $(OBJS)\corelib_dragimag.o $(OBJS)\corelib_fdrepdlg.o $(OBJS)\corelib_filedlg.o $(OBJS)\corelib_fontdlg.o $(OBJS)\corelib_frame.o $(OBJS)\corelib_gauge95.o $(OBJS)\corelib_imaglist.o $(OBJS)\corelib_iniconf.o $(OBJS)\corelib_listbox.o $(OBJS)\corelib_listctrl.o $(OBJS)\corelib_mdi.o $(OBJS)\corelib_menu.o $(OBJS)\corelib_menuitem.o $(OBJS)\corelib_metafile.o $(OBJS)\corelib_msgdlg.o $(OBJS)\corelib_nativdlg.o $(OBJS)\corelib_notebook.o $(OBJS)\corelib_ownerdrw.o $(OBJS)\corelib_penwin.o $(OBJS)\corelib_printdlg.o $(OBJS)\corelib_printwin.o $(OBJS)\corelib_radiobox.o $(OBJS)\corelib_radiobut.o $(OBJS)\corelib_scrolbar.o $(OBJS)\corelib_slider95.o $(OBJS)\corelib_spinbutt.o $(OBJS)\corelib_spinctrl.o $(OBJS)\corelib_statbmp.o $(OBJS)\corelib_statbox.o $(OBJS)\corelib_statbr95.o $(OBJS)\corelib_statline.o $(OBJS)\corelib_stattext.o $(OBJS)\corelib_tabctrl.o $(OBJS)\corelib_tbar95.o $(OBJS)\corelib_textctrl.o $(OBJS)\corelib_tglbtn.o $(OBJS)\corelib_treectrl.o $(OBJS)\corelib_selstore.o $(OBJS)\corelib_busyinfo.o $(OBJS)\corelib_calctrl.o $(OBJS)\corelib_choicdgg.o $(OBJS)\corelib_dcbuffer.o $(OBJS)\corelib_dcpsg.o $(OBJS)\corelib_dirctrlg.o $(OBJS)\corelib_dragimgg.o $(OBJS)\corelib_grid.o $(OBJS)\corelib_gridctrl.o $(OBJS)\corelib_gridsel.o $(OBJS)\corelib_laywin.o $(OBJS)\corelib_logg.o $(OBJS)\corelib_numdlgg.o $(OBJS)\corelib_panelg.o $(OBJS)\corelib_progdlgg.o $(OBJS)\corelib_sashwin.o $(OBJS)\corelib_scrlwing.o $(OBJS)\corelib_spinctlg.o $(OBJS)\corelib_splash.o $(OBJS)\corelib_splitter.o $(OBJS)\corelib_tbarsmpl.o $(OBJS)\corelib_textdlgg.o $(OBJS)\corelib_tipdlg.o $(OBJS)\corelib_tipwin.o $(OBJS)\corelib_treectlg.o $(OBJS)\corelib_vlbox.o $(OBJS)\corelib_vscroll.o $(OBJS)\corelib_wizard.o $(OBJS)\corelib_appcmn.o $(OBJS)\corelib_fontmap.o $(OBJS)\corelib_accesscmn.o $(OBJS)\corelib_artprov.o $(OBJS)\corelib_artstd.o $(OBJS)\corelib_bmpbase.o $(OBJS)\corelib_choiccmn.o $(OBJS)\corelib_clipcmn.o $(OBJS)\corelib_cmdproc.o $(OBJS)\corelib_cmndata.o $(OBJS)\corelib_containr.o $(OBJS)\corelib_cshelp.o $(OBJS)\corelib_ctrlcmn.o $(OBJS)\corelib_ctrlsub.o $(OBJS)\corelib_datacmn.o $(OBJS)\corelib_dbgrid.o $(OBJS)\corelib_dcbase.o $(OBJS)\corelib_dlgcmn.o $(OBJS)\corelib_dndcmn.o $(OBJS)\corelib_dobjcmn.o $(OBJS)\corelib_docmdi.o $(OBJS)\corelib_docview.o $(OBJS)\corelib_dpycmn.o $(OBJS)\corelib_dseldlg.o $(OBJS)\corelib_effects.o $(OBJS)\corelib_fddlgcmn.o $(OBJS)\corelib_fldlgcmn.o $(OBJS)\corelib_fontcmn.o $(OBJS)\corelib_framecmn.o $(OBJS)\corelib_timercmn.o $(OBJS)\corelib_toplvcmn.o $(OBJS)\corelib_gaugecmn.o $(OBJS)\corelib_gdicmn.o $(OBJS)\corelib_geometry.o $(OBJS)\corelib_gifdecod.o $(OBJS)\corelib_helpbase.o $(OBJS)\corelib_iconbndl.o $(OBJS)\corelib_imagall.o $(OBJS)\corelib_imagbmp.o $(OBJS)\corelib_image.o $(OBJS)\corelib_imaggif.o $(OBJS)\corelib_imagiff.o $(OBJS)\corelib_imagjpeg.o $(OBJS)\corelib_imagpcx.o $(OBJS)\corelib_imagpng.o $(OBJS)\corelib_imagpnm.o $(OBJS)\corelib_imagtiff.o $(OBJS)\corelib_imagxpm.o $(OBJS)\corelib_imagfill.o $(OBJS)\corelib_layout.o $(OBJS)\corelib_lboxcmn.o $(OBJS)\corelib_matrix.o $(OBJS)\corelib_menucmn.o $(OBJS)\corelib_nbkbase.o $(OBJS)\corelib_paper.o $(OBJS)\corelib_popupcmn.o $(OBJS)\corelib_prntbase.o $(OBJS)\corelib_quantize.o $(OBJS)\corelib_radiocmn.o $(OBJS)\corelib_rgncmn.o $(OBJS)\corelib_settcmn.o $(OBJS)\corelib_sizer.o $(OBJS)\corelib_statbar.o $(OBJS)\corelib_tbarbase.o $(OBJS)\corelib_textcmn.o $(OBJS)\corelib_treebase.o $(OBJS)\corelib_valgen.o $(OBJS)\corelib_validate.o $(OBJS)\corelib_valtext.o $(OBJS)\corelib_wincmn.o $(OBJS)\corelib_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.o $(OBJS)\corelib_bitmap.o $(OBJS)\corelib_brush.o $(OBJS)\corelib_caret.o $(OBJS)\corelib_clipbrd.o $(OBJS)\corelib_colour.o $(OBJS)\corelib_cursor.o $(OBJS)\corelib_data.o $(OBJS)\corelib_dc.o $(OBJS)\corelib_dcclient.o $(OBJS)\corelib_dcmemory.o $(OBJS)\corelib_dcprint.o $(OBJS)\corelib_dcscreen.o $(OBJS)\corelib_dialup.o $(OBJS)\corelib_dib.o $(OBJS)\corelib_dirdlg.o $(OBJS)\corelib_display.o $(OBJS)\corelib_enhmeta.o $(OBJS)\corelib_evtloop.o $(OBJS)\corelib_font.o $(OBJS)\corelib_fontenum.o $(OBJS)\corelib_fontutil.o $(OBJS)\corelib_gdiimage.o $(OBJS)\corelib_gdiobj.o $(OBJS)\corelib_helpchm.o $(OBJS)\corelib_helpwin.o $(OBJS)\corelib_icon.o $(OBJS)\corelib_joystick.o $(OBJS)\corelib_minifram.o $(OBJS)\corelib_palette.o $(OBJS)\corelib_pen.o $(OBJS)\corelib_popupwin.o $(OBJS)\corelib_region.o $(OBJS)\corelib_settings.o $(OBJS)\corelib_taskbarcmn.o $(OBJS)\corelib_taskbar.o $(OBJS)\corelib_timer.o $(OBJS)\corelib_tooltip.o $(OBJS)\corelib_toplevel.o $(OBJS)\corelib_utilsgui.o $(OBJS)\corelib_wave.o $(OBJS)\corelib_window.o $(OBJS)\corelib_automtn.o $(OBJS)\corelib_dataobj.o $(OBJS)\corelib_dropsrc.o $(OBJS)\corelib_droptgt.o $(OBJS)\corelib_oleutils.o $(OBJS)\corelib_uuid.o $(OBJS)\corelib_textctrl.o $(OBJS)\corelib_bmpbuttn.o $(OBJS)\corelib_button.o $(OBJS)\corelib_checkbox.o $(OBJS)\corelib_checklst.o $(OBJS)\corelib_choice.o $(OBJS)\corelib_colschem.o $(OBJS)\corelib_combobox.o $(OBJS)\corelib_control.o $(OBJS)\corelib_dialog.o $(OBJS)\corelib_framuniv.o $(OBJS)\corelib_topluniv.o $(OBJS)\corelib_gauge.o $(OBJS)\corelib_inpcons.o $(OBJS)\corelib_inphand.o $(OBJS)\corelib_listbox.o $(OBJS)\corelib_menu.o $(OBJS)\corelib_notebook.o $(OBJS)\corelib_radiobox.o $(OBJS)\corelib_radiobut.o $(OBJS)\corelib_renderer.o $(OBJS)\corelib_scrarrow.o $(OBJS)\corelib_scrolbar.o $(OBJS)\corelib_scrthumb.o $(OBJS)\corelib_slider.o $(OBJS)\corelib_spinbutt.o $(OBJS)\corelib_statbmp.o $(OBJS)\corelib_statbox.o $(OBJS)\corelib_statline.o $(OBJS)\corelib_stattext.o $(OBJS)\corelib_statusbr.o $(OBJS)\corelib_toolbar.o $(OBJS)\corelib_theme.o $(OBJS)\corelib_winuniv.o $(OBJS)\corelib_mdig.o $(OBJS)\corelib_imaglist.o $(OBJS)\corelib_colrdlgg.o $(OBJS)\corelib_listctrl.o $(OBJS)\corelib_filedlgg.o $(OBJS)\corelib_dirdlgg.o $(OBJS)\corelib_prntdlgg.o $(OBJS)\corelib_accel.o $(OBJS)\corelib_msgdlgg.o $(OBJS)\corelib_fdrepdlg.o $(OBJS)\corelib_fontdlgg.o $(OBJS)\corelib_tabg.o $(OBJS)\corelib_gtk.o $(OBJS)\corelib_win32.o $(OBJS)\corelib_metal.o $(OBJS)\corelib_selstore.o $(OBJS)\corelib_busyinfo.o $(OBJS)\corelib_calctrl.o $(OBJS)\corelib_choicdgg.o $(OBJS)\corelib_dcbuffer.o $(OBJS)\corelib_dcpsg.o $(OBJS)\corelib_dirctrlg.o $(OBJS)\corelib_grid.o $(OBJS)\corelib_gridctrl.o $(OBJS)\corelib_gridsel.o $(OBJS)\corelib_laywin.o $(OBJS)\corelib_logg.o $(OBJS)\corelib_numdlgg.o $(OBJS)\corelib_panelg.o $(OBJS)\corelib_progdlgg.o $(OBJS)\corelib_sashwin.o $(OBJS)\corelib_scrlwing.o $(OBJS)\corelib_spinctlg.o $(OBJS)\corelib_splash.o $(OBJS)\corelib_splitter.o $(OBJS)\corelib_tbarsmpl.o $(OBJS)\corelib_textdlgg.o $(OBJS)\corelib_tipdlg.o $(OBJS)\corelib_tipwin.o $(OBJS)\corelib_treectlg.o $(OBJS)\corelib_vlbox.o $(OBJS)\corelib_vscroll.o $(OBJS)\corelib_wizard.o $(OBJS)\corelib_appcmn.o $(OBJS)\corelib_fontmap.o $(OBJS)\corelib_accesscmn.o $(OBJS)\corelib_artprov.o $(OBJS)\corelib_artstd.o $(OBJS)\corelib_bmpbase.o $(OBJS)\corelib_choiccmn.o $(OBJS)\corelib_clipcmn.o $(OBJS)\corelib_cmdproc.o $(OBJS)\corelib_cmndata.o $(OBJS)\corelib_containr.o $(OBJS)\corelib_cshelp.o $(OBJS)\corelib_ctrlcmn.o $(OBJS)\corelib_ctrlsub.o $(OBJS)\corelib_datacmn.o $(OBJS)\corelib_dbgrid.o $(OBJS)\corelib_dcbase.o $(OBJS)\corelib_dlgcmn.o $(OBJS)\corelib_dndcmn.o $(OBJS)\corelib_dobjcmn.o $(OBJS)\corelib_docmdi.o $(OBJS)\corelib_docview.o $(OBJS)\corelib_dpycmn.o $(OBJS)\corelib_dseldlg.o $(OBJS)\corelib_effects.o $(OBJS)\corelib_fddlgcmn.o $(OBJS)\corelib_fldlgcmn.o $(OBJS)\corelib_fontcmn.o $(OBJS)\corelib_framecmn.o $(OBJS)\corelib_timercmn.o $(OBJS)\corelib_toplvcmn.o $(OBJS)\corelib_gaugecmn.o $(OBJS)\corelib_gdicmn.o $(OBJS)\corelib_geometry.o $(OBJS)\corelib_gifdecod.o $(OBJS)\corelib_helpbase.o $(OBJS)\corelib_iconbndl.o $(OBJS)\corelib_imagall.o $(OBJS)\corelib_imagbmp.o $(OBJS)\corelib_image.o $(OBJS)\corelib_imaggif.o $(OBJS)\corelib_imagiff.o $(OBJS)\corelib_imagjpeg.o $(OBJS)\corelib_imagpcx.o $(OBJS)\corelib_imagpng.o $(OBJS)\corelib_imagpnm.o $(OBJS)\corelib_imagtiff.o $(OBJS)\corelib_imagxpm.o $(OBJS)\corelib_imagfill.o $(OBJS)\corelib_layout.o $(OBJS)\corelib_lboxcmn.o $(OBJS)\corelib_matrix.o $(OBJS)\corelib_menucmn.o $(OBJS)\corelib_nbkbase.o $(OBJS)\corelib_paper.o $(OBJS)\corelib_popupcmn.o $(OBJS)\corelib_prntbase.o $(OBJS)\corelib_quantize.o $(OBJS)\corelib_radiocmn.o $(OBJS)\corelib_rgncmn.o $(OBJS)\corelib_settcmn.o $(OBJS)\corelib_sizer.o $(OBJS)\corelib_statbar.o $(OBJS)\corelib_tbarbase.o $(OBJS)\corelib_textcmn.o $(OBJS)\corelib_treebase.o $(OBJS)\corelib_valgen.o $(OBJS)\corelib_validate.o $(OBJS)\corelib_valtext.o $(OBJS)\corelib_wincmn.o $(OBJS)\corelib_xpmdecod.o
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.o $(OBJS)\corelib_bitmap.o $(OBJS)\corelib_brush.o $(OBJS)\corelib_caret.o $(OBJS)\corelib_clipbrd.o $(OBJS)\corelib_colour.o $(OBJS)\corelib_cursor.o $(OBJS)\corelib_data.o $(OBJS)\corelib_dc.o $(OBJS)\corelib_dcclient.o $(OBJS)\corelib_dcmemory.o $(OBJS)\corelib_dcprint.o $(OBJS)\corelib_dcscreen.o $(OBJS)\corelib_dialup.o $(OBJS)\corelib_dib.o $(OBJS)\corelib_dirdlg.o $(OBJS)\corelib_display.o $(OBJS)\corelib_enhmeta.o $(OBJS)\corelib_evtloop.o $(OBJS)\corelib_font.o $(OBJS)\corelib_fontenum.o $(OBJS)\corelib_fontutil.o $(OBJS)\corelib_gdiimage.o $(OBJS)\corelib_gdiobj.o $(OBJS)\corelib_helpchm.o $(OBJS)\corelib_helpwin.o $(OBJS)\corelib_icon.o $(OBJS)\corelib_joystick.o $(OBJS)\corelib_minifram.o $(OBJS)\corelib_palette.o $(OBJS)\corelib_pen.o $(OBJS)\corelib_popupwin.o $(OBJS)\corelib_region.o $(OBJS)\corelib_settings.o $(OBJS)\corelib_taskbarcmn.o $(OBJS)\corelib_taskbar.o $(OBJS)\corelib_timer.o $(OBJS)\corelib_tooltip.o $(OBJS)\corelib_toplevel.o $(OBJS)\corelib_utilsgui.o $(OBJS)\corelib_wave.o $(OBJS)\corelib_window.o $(OBJS)\corelib_automtn.o $(OBJS)\corelib_dataobj.o $(OBJS)\corelib_dropsrc.o $(OBJS)\corelib_droptgt.o $(OBJS)\corelib_oleutils.o $(OBJS)\corelib_uuid.o $(OBJS)\corelib_textctrl.o $(OBJS)\corelib_bmpbuttn.o $(OBJS)\corelib_button.o $(OBJS)\corelib_checkbox.o $(OBJS)\corelib_checklst.o $(OBJS)\corelib_choice.o $(OBJS)\corelib_colschem.o $(OBJS)\corelib_combobox.o $(OBJS)\corelib_control.o $(OBJS)\corelib_dialog.o $(OBJS)\corelib_framuniv.o $(OBJS)\corelib_topluniv.o $(OBJS)\corelib_gauge.o $(OBJS)\corelib_inpcons.o $(OBJS)\corelib_inphand.o $(OBJS)\corelib_listbox.o $(OBJS)\corelib_menu.o $(OBJS)\corelib_notebook.o $(OBJS)\corelib_radiobox.o $(OBJS)\corelib_radiobut.o $(OBJS)\corelib_renderer.o $(OBJS)\corelib_scrarrow.o $(OBJS)\corelib_scrolbar.o $(OBJS)\corelib_scrthumb.o $(OBJS)\corelib_slider.o $(OBJS)\corelib_spinbutt.o $(OBJS)\corelib_statbmp.o $(OBJS)\corelib_statbox.o $(OBJS)\corelib_statline.o $(OBJS)\corelib_stattext.o $(OBJS)\corelib_statusbr.o $(OBJS)\corelib_toolbar.o $(OBJS)\corelib_theme.o $(OBJS)\corelib_winuniv.o $(OBJS)\corelib_mdig.o $(OBJS)\corelib_imaglist.o $(OBJS)\corelib_colrdlgg.o $(OBJS)\corelib_listctrl.o $(OBJS)\corelib_filedlgg.o $(OBJS)\corelib_dirdlgg.o $(OBJS)\corelib_prntdlgg.o $(OBJS)\corelib_accel.o $(OBJS)\corelib_msgdlgg.o $(OBJS)\corelib_fdrepdlg.o $(OBJS)\corelib_fontdlgg.o $(OBJS)\corelib_tabg.o $(OBJS)\corelib_gtk.o $(OBJS)\corelib_win32.o $(OBJS)\corelib_metal.o $(OBJS)\corelib_selstore.o $(OBJS)\corelib_busyinfo.o $(OBJS)\corelib_calctrl.o $(OBJS)\corelib_choicdgg.o $(OBJS)\corelib_dcbuffer.o $(OBJS)\corelib_dcpsg.o $(OBJS)\corelib_dirctrlg.o $(OBJS)\corelib_dragimgg.o $(OBJS)\corelib_grid.o $(OBJS)\corelib_gridctrl.o $(OBJS)\corelib_gridsel.o $(OBJS)\corelib_laywin.o $(OBJS)\corelib_logg.o $(OBJS)\corelib_numdlgg.o $(OBJS)\corelib_panelg.o $(OBJS)\corelib_progdlgg.o $(OBJS)\corelib_sashwin.o $(OBJS)\corelib_scrlwing.o $(OBJS)\corelib_spinctlg.o $(OBJS)\corelib_splash.o $(OBJS)\corelib_splitter.o $(OBJS)\corelib_tbarsmpl.o $(OBJS)\corelib_textdlgg.o $(OBJS)\corelib_tipdlg.o $(OBJS)\corelib_tipwin.o $(OBJS)\corelib_treectlg.o $(OBJS)\corelib_vlbox.o $(OBJS)\corelib_vscroll.o $(OBJS)\corelib_wizard.o $(OBJS)\corelib_appcmn.o $(OBJS)\corelib_fontmap.o $(OBJS)\corelib_accesscmn.o $(OBJS)\corelib_artprov.o $(OBJS)\corelib_artstd.o $(OBJS)\corelib_bmpbase.o $(OBJS)\corelib_choiccmn.o $(OBJS)\corelib_clipcmn.o $(OBJS)\corelib_cmdproc.o $(OBJS)\corelib_cmndata.o $(OBJS)\corelib_containr.o $(OBJS)\corelib_cshelp.o $(OBJS)\corelib_ctrlcmn.o $(OBJS)\corelib_ctrlsub.o $(OBJS)\corelib_datacmn.o $(OBJS)\corelib_dbgrid.o $(OBJS)\corelib_dcbase.o $(OBJS)\corelib_dlgcmn.o $(OBJS)\corelib_dndcmn.o $(OBJS)\corelib_dobjcmn.o $(OBJS)\corelib_docmdi.o $(OBJS)\corelib_docview.o $(OBJS)\corelib_dpycmn.o $(OBJS)\corelib_dseldlg.o $(OBJS)\corelib_effects.o $(OBJS)\corelib_fddlgcmn.o $(OBJS)\corelib_fldlgcmn.o $(OBJS)\corelib_fontcmn.o $(OBJS)\corelib_framecmn.o $(OBJS)\corelib_timercmn.o $(OBJS)\corelib_toplvcmn.o $(OBJS)\corelib_gaugecmn.o $(OBJS)\corelib_gdicmn.o $(OBJS)\corelib_geometry.o $(OBJS)\corelib_gifdecod.o $(OBJS)\corelib_helpbase.o $(OBJS)\corelib_iconbndl.o $(OBJS)\corelib_imagall.o $(OBJS)\corelib_imagbmp.o $(OBJS)\corelib_image.o $(OBJS)\corelib_imaggif.o $(OBJS)\corelib_imagiff.o $(OBJS)\corelib_imagjpeg.o $(OBJS)\corelib_imagpcx.o $(OBJS)\corelib_imagpng.o $(OBJS)\corelib_imagpnm.o $(OBJS)\corelib_imagtiff.o $(OBJS)\corelib_imagxpm.o $(OBJS)\corelib_imagfill.o $(OBJS)\corelib_layout.o $(OBJS)\corelib_lboxcmn.o $(OBJS)\corelib_matrix.o $(OBJS)\corelib_menucmn.o $(OBJS)\corelib_nbkbase.o $(OBJS)\corelib_paper.o $(OBJS)\corelib_popupcmn.o $(OBJS)\corelib_prntbase.o $(OBJS)\corelib_quantize.o $(OBJS)\corelib_radiocmn.o $(OBJS)\corelib_rgncmn.o $(OBJS)\corelib_settcmn.o $(OBJS)\corelib_sizer.o $(OBJS)\corelib_statbar.o $(OBJS)\corelib_tbarbase.o $(OBJS)\corelib_textcmn.o $(OBJS)\corelib_treebase.o $(OBJS)\corelib_valgen.o $(OBJS)\corelib_validate.o $(OBJS)\corelib_valtext.o $(OBJS)\corelib_wincmn.o $(OBJS)\corelib_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
-____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.o $(OBJS)\monodll_bitmap.o $(OBJS)\monodll_brush.o $(OBJS)\monodll_caret.o $(OBJS)\monodll_clipbrd.o $(OBJS)\monodll_colour.o $(OBJS)\monodll_cursor.o $(OBJS)\monodll_data.o $(OBJS)\monodll_dc.o $(OBJS)\monodll_dcclient.o $(OBJS)\monodll_dcmemory.o $(OBJS)\monodll_dcprint.o $(OBJS)\monodll_dcscreen.o $(OBJS)\monodll_dialup.o $(OBJS)\monodll_dib.o $(OBJS)\monodll_dirdlg.o $(OBJS)\monodll_display.o $(OBJS)\monodll_enhmeta.o $(OBJS)\monodll_evtloop.o $(OBJS)\monodll_font.o $(OBJS)\monodll_fontenum.o $(OBJS)\monodll_fontutil.o $(OBJS)\monodll_gdiimage.o $(OBJS)\monodll_gdiobj.o $(OBJS)\monodll_helpchm.o $(OBJS)\monodll_helpwin.o $(OBJS)\monodll_icon.o $(OBJS)\monodll_joystick.o $(OBJS)\monodll_minifram.o $(OBJS)\monodll_palette.o $(OBJS)\monodll_pen.o $(OBJS)\monodll_popupwin.o $(OBJS)\monodll_region.o $(OBJS)\monodll_settings.o $(OBJS)\monodll_taskbarcmn.o $(OBJS)\monodll_taskbar.o $(OBJS)\monodll_timer.o $(OBJS)\monodll_tooltip.o $(OBJS)\monodll_toplevel.o $(OBJS)\monodll_utilsgui.o $(OBJS)\monodll_wave.o $(OBJS)\monodll_window.o $(OBJS)\monodll_automtn.o $(OBJS)\monodll_dataobj.o $(OBJS)\monodll_dropsrc.o $(OBJS)\monodll_droptgt.o $(OBJS)\monodll_oleutils.o $(OBJS)\monodll_uuid.o $(OBJS)\monodll_statusbr.o $(OBJS)\monodll_uxtheme.o $(OBJS)\monodll_access.o $(OBJS)\monodll_accel.o $(OBJS)\monodll_bmpbuttn.o $(OBJS)\monodll_button.o $(OBJS)\monodll_checkbox.o $(OBJS)\monodll_checklst.o $(OBJS)\monodll_choice.o $(OBJS)\monodll_colordlg.o $(OBJS)\monodll_combobox.o $(OBJS)\monodll_control.o $(OBJS)\monodll_dialog.o $(OBJS)\monodll_dragimag.o $(OBJS)\monodll_fdrepdlg.o $(OBJS)\monodll_filedlg.o $(OBJS)\monodll_fontdlg.o $(OBJS)\monodll_frame.o $(OBJS)\monodll_gauge95.o $(OBJS)\monodll_imaglist.o $(OBJS)\monodll_iniconf.o $(OBJS)\monodll_listbox.o $(OBJS)\monodll_listctrl.o $(OBJS)\monodll_mdi.o $(OBJS)\monodll_menu.o $(OBJS)\monodll_menuitem.o $(OBJS)\monodll_metafile.o $(OBJS)\monodll_msgdlg.o $(OBJS)\monodll_nativdlg.o $(OBJS)\monodll_notebook.o $(OBJS)\monodll_ownerdrw.o $(OBJS)\monodll_penwin.o $(OBJS)\monodll_printdlg.o $(OBJS)\monodll_printwin.o $(OBJS)\monodll_radiobox.o $(OBJS)\monodll_radiobut.o $(OBJS)\monodll_scrolbar.o $(OBJS)\monodll_slider95.o $(OBJS)\monodll_spinbutt.o $(OBJS)\monodll_spinctrl.o $(OBJS)\monodll_statbmp.o $(OBJS)\monodll_statbox.o $(OBJS)\monodll_statbr95.o $(OBJS)\monodll_statline.o $(OBJS)\monodll_stattext.o $(OBJS)\monodll_tabctrl.o $(OBJS)\monodll_tbar95.o $(OBJS)\monodll_textctrl.o $(OBJS)\monodll_tglbtn.o $(OBJS)\monodll_treectrl.o $(OBJS)\monodll_selstore.o $(OBJS)\monodll_busyinfo.o $(OBJS)\monodll_calctrl.o $(OBJS)\monodll_choicdgg.o $(OBJS)\monodll_dcbuffer.o $(OBJS)\monodll_dcpsg.o $(OBJS)\monodll_dirctrlg.o $(OBJS)\monodll_grid.o $(OBJS)\monodll_gridctrl.o $(OBJS)\monodll_gridsel.o $(OBJS)\monodll_laywin.o $(OBJS)\monodll_logg.o $(OBJS)\monodll_numdlgg.o $(OBJS)\monodll_panelg.o $(OBJS)\monodll_progdlgg.o $(OBJS)\monodll_sashwin.o $(OBJS)\monodll_scrlwing.o $(OBJS)\monodll_spinctlg.o $(OBJS)\monodll_splash.o $(OBJS)\monodll_splitter.o $(OBJS)\monodll_tbarsmpl.o $(OBJS)\monodll_textdlgg.o $(OBJS)\monodll_tipdlg.o $(OBJS)\monodll_tipwin.o $(OBJS)\monodll_treectlg.o $(OBJS)\monodll_vlbox.o $(OBJS)\monodll_vscroll.o $(OBJS)\monodll_wizard.o $(OBJS)\monodll_appcmn.o $(OBJS)\monodll_fontmap.o $(OBJS)\monodll_accesscmn.o $(OBJS)\monodll_artprov.o $(OBJS)\monodll_artstd.o $(OBJS)\monodll_bmpbase.o $(OBJS)\monodll_choiccmn.o $(OBJS)\monodll_clipcmn.o $(OBJS)\monodll_cmdproc.o $(OBJS)\monodll_cmndata.o $(OBJS)\monodll_containr.o $(OBJS)\monodll_cshelp.o $(OBJS)\monodll_ctrlcmn.o $(OBJS)\monodll_ctrlsub.o $(OBJS)\monodll_datacmn.o $(OBJS)\monodll_dbgrid.o $(OBJS)\monodll_dcbase.o $(OBJS)\monodll_dlgcmn.o $(OBJS)\monodll_dndcmn.o $(OBJS)\monodll_dobjcmn.o $(OBJS)\monodll_docmdi.o $(OBJS)\monodll_docview.o $(OBJS)\monodll_dpycmn.o $(OBJS)\monodll_dseldlg.o $(OBJS)\monodll_effects.o $(OBJS)\monodll_fddlgcmn.o $(OBJS)\monodll_fldlgcmn.o $(OBJS)\monodll_fontcmn.o $(OBJS)\monodll_framecmn.o $(OBJS)\monodll_timercmn.o $(OBJS)\monodll_toplvcmn.o $(OBJS)\monodll_gaugecmn.o $(OBJS)\monodll_gdicmn.o $(OBJS)\monodll_geometry.o $(OBJS)\monodll_gifdecod.o $(OBJS)\monodll_helpbase.o $(OBJS)\monodll_iconbndl.o $(OBJS)\monodll_imagall.o $(OBJS)\monodll_imagbmp.o $(OBJS)\monodll_image.o $(OBJS)\monodll_imaggif.o $(OBJS)\monodll_imagiff.o $(OBJS)\monodll_imagjpeg.o $(OBJS)\monodll_imagpcx.o $(OBJS)\monodll_imagpng.o $(OBJS)\monodll_imagpnm.o $(OBJS)\monodll_imagtiff.o $(OBJS)\monodll_imagxpm.o $(OBJS)\monodll_imagfill.o $(OBJS)\monodll_layout.o $(OBJS)\monodll_lboxcmn.o $(OBJS)\monodll_matrix.o $(OBJS)\monodll_menucmn.o $(OBJS)\monodll_nbkbase.o $(OBJS)\monodll_paper.o $(OBJS)\monodll_popupcmn.o $(OBJS)\monodll_prntbase.o $(OBJS)\monodll_quantize.o $(OBJS)\monodll_radiocmn.o $(OBJS)\monodll_rgncmn.o $(OBJS)\monodll_settcmn.o $(OBJS)\monodll_sizer.o $(OBJS)\monodll_statbar.o $(OBJS)\monodll_tbarbase.o $(OBJS)\monodll_textcmn.o $(OBJS)\monodll_treebase.o $(OBJS)\monodll_valgen.o $(OBJS)\monodll_validate.o $(OBJS)\monodll_valtext.o $(OBJS)\monodll_wincmn.o $(OBJS)\monodll_xpmdecod.o
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.o $(OBJS)\monodll_bitmap.o $(OBJS)\monodll_brush.o $(OBJS)\monodll_caret.o $(OBJS)\monodll_clipbrd.o $(OBJS)\monodll_colour.o $(OBJS)\monodll_cursor.o $(OBJS)\monodll_data.o $(OBJS)\monodll_dc.o $(OBJS)\monodll_dcclient.o $(OBJS)\monodll_dcmemory.o $(OBJS)\monodll_dcprint.o $(OBJS)\monodll_dcscreen.o $(OBJS)\monodll_dialup.o $(OBJS)\monodll_dib.o $(OBJS)\monodll_dirdlg.o $(OBJS)\monodll_display.o $(OBJS)\monodll_enhmeta.o $(OBJS)\monodll_evtloop.o $(OBJS)\monodll_font.o $(OBJS)\monodll_fontenum.o $(OBJS)\monodll_fontutil.o $(OBJS)\monodll_gdiimage.o $(OBJS)\monodll_gdiobj.o $(OBJS)\monodll_helpchm.o $(OBJS)\monodll_helpwin.o $(OBJS)\monodll_icon.o $(OBJS)\monodll_joystick.o $(OBJS)\monodll_minifram.o $(OBJS)\monodll_palette.o $(OBJS)\monodll_pen.o $(OBJS)\monodll_popupwin.o $(OBJS)\monodll_region.o $(OBJS)\monodll_settings.o $(OBJS)\monodll_taskbarcmn.o $(OBJS)\monodll_taskbar.o $(OBJS)\monodll_timer.o $(OBJS)\monodll_tooltip.o $(OBJS)\monodll_toplevel.o $(OBJS)\monodll_utilsgui.o $(OBJS)\monodll_wave.o $(OBJS)\monodll_window.o $(OBJS)\monodll_automtn.o $(OBJS)\monodll_dataobj.o $(OBJS)\monodll_dropsrc.o $(OBJS)\monodll_droptgt.o $(OBJS)\monodll_oleutils.o $(OBJS)\monodll_uuid.o $(OBJS)\monodll_statusbr.o $(OBJS)\monodll_uxtheme.o $(OBJS)\monodll_access.o $(OBJS)\monodll_accel.o $(OBJS)\monodll_bmpbuttn.o $(OBJS)\monodll_button.o $(OBJS)\monodll_checkbox.o $(OBJS)\monodll_checklst.o $(OBJS)\monodll_choice.o $(OBJS)\monodll_colordlg.o $(OBJS)\monodll_combobox.o $(OBJS)\monodll_control.o $(OBJS)\monodll_dialog.o $(OBJS)\monodll_dragimag.o $(OBJS)\monodll_fdrepdlg.o $(OBJS)\monodll_filedlg.o $(OBJS)\monodll_fontdlg.o $(OBJS)\monodll_frame.o $(OBJS)\monodll_gauge95.o $(OBJS)\monodll_imaglist.o $(OBJS)\monodll_iniconf.o $(OBJS)\monodll_listbox.o $(OBJS)\monodll_listctrl.o $(OBJS)\monodll_mdi.o $(OBJS)\monodll_menu.o $(OBJS)\monodll_menuitem.o $(OBJS)\monodll_metafile.o $(OBJS)\monodll_msgdlg.o $(OBJS)\monodll_nativdlg.o $(OBJS)\monodll_notebook.o $(OBJS)\monodll_ownerdrw.o $(OBJS)\monodll_penwin.o $(OBJS)\monodll_printdlg.o $(OBJS)\monodll_printwin.o $(OBJS)\monodll_radiobox.o $(OBJS)\monodll_radiobut.o $(OBJS)\monodll_scrolbar.o $(OBJS)\monodll_slider95.o $(OBJS)\monodll_spinbutt.o $(OBJS)\monodll_spinctrl.o $(OBJS)\monodll_statbmp.o $(OBJS)\monodll_statbox.o $(OBJS)\monodll_statbr95.o $(OBJS)\monodll_statline.o $(OBJS)\monodll_stattext.o $(OBJS)\monodll_tabctrl.o $(OBJS)\monodll_tbar95.o $(OBJS)\monodll_textctrl.o $(OBJS)\monodll_tglbtn.o $(OBJS)\monodll_treectrl.o $(OBJS)\monodll_selstore.o $(OBJS)\monodll_busyinfo.o $(OBJS)\monodll_calctrl.o $(OBJS)\monodll_choicdgg.o $(OBJS)\monodll_dcbuffer.o $(OBJS)\monodll_dcpsg.o $(OBJS)\monodll_dirctrlg.o $(OBJS)\monodll_dragimgg.o $(OBJS)\monodll_grid.o $(OBJS)\monodll_gridctrl.o $(OBJS)\monodll_gridsel.o $(OBJS)\monodll_laywin.o $(OBJS)\monodll_logg.o $(OBJS)\monodll_numdlgg.o $(OBJS)\monodll_panelg.o $(OBJS)\monodll_progdlgg.o $(OBJS)\monodll_sashwin.o $(OBJS)\monodll_scrlwing.o $(OBJS)\monodll_spinctlg.o $(OBJS)\monodll_splash.o $(OBJS)\monodll_splitter.o $(OBJS)\monodll_tbarsmpl.o $(OBJS)\monodll_textdlgg.o $(OBJS)\monodll_tipdlg.o $(OBJS)\monodll_tipwin.o $(OBJS)\monodll_treectlg.o $(OBJS)\monodll_vlbox.o $(OBJS)\monodll_vscroll.o $(OBJS)\monodll_wizard.o $(OBJS)\monodll_appcmn.o $(OBJS)\monodll_fontmap.o $(OBJS)\monodll_accesscmn.o $(OBJS)\monodll_artprov.o $(OBJS)\monodll_artstd.o $(OBJS)\monodll_bmpbase.o $(OBJS)\monodll_choiccmn.o $(OBJS)\monodll_clipcmn.o $(OBJS)\monodll_cmdproc.o $(OBJS)\monodll_cmndata.o $(OBJS)\monodll_containr.o $(OBJS)\monodll_cshelp.o $(OBJS)\monodll_ctrlcmn.o $(OBJS)\monodll_ctrlsub.o $(OBJS)\monodll_datacmn.o $(OBJS)\monodll_dbgrid.o $(OBJS)\monodll_dcbase.o $(OBJS)\monodll_dlgcmn.o $(OBJS)\monodll_dndcmn.o $(OBJS)\monodll_dobjcmn.o $(OBJS)\monodll_docmdi.o $(OBJS)\monodll_docview.o $(OBJS)\monodll_dpycmn.o $(OBJS)\monodll_dseldlg.o $(OBJS)\monodll_effects.o $(OBJS)\monodll_fddlgcmn.o $(OBJS)\monodll_fldlgcmn.o $(OBJS)\monodll_fontcmn.o $(OBJS)\monodll_framecmn.o $(OBJS)\monodll_timercmn.o $(OBJS)\monodll_toplvcmn.o $(OBJS)\monodll_gaugecmn.o $(OBJS)\monodll_gdicmn.o $(OBJS)\monodll_geometry.o $(OBJS)\monodll_gifdecod.o $(OBJS)\monodll_helpbase.o $(OBJS)\monodll_iconbndl.o $(OBJS)\monodll_imagall.o $(OBJS)\monodll_imagbmp.o $(OBJS)\monodll_image.o $(OBJS)\monodll_imaggif.o $(OBJS)\monodll_imagiff.o $(OBJS)\monodll_imagjpeg.o $(OBJS)\monodll_imagpcx.o $(OBJS)\monodll_imagpng.o $(OBJS)\monodll_imagpnm.o $(OBJS)\monodll_imagtiff.o $(OBJS)\monodll_imagxpm.o $(OBJS)\monodll_imagfill.o $(OBJS)\monodll_layout.o $(OBJS)\monodll_lboxcmn.o $(OBJS)\monodll_matrix.o $(OBJS)\monodll_menucmn.o $(OBJS)\monodll_nbkbase.o $(OBJS)\monodll_paper.o $(OBJS)\monodll_popupcmn.o $(OBJS)\monodll_prntbase.o $(OBJS)\monodll_quantize.o $(OBJS)\monodll_radiocmn.o $(OBJS)\monodll_rgncmn.o $(OBJS)\monodll_settcmn.o $(OBJS)\monodll_sizer.o $(OBJS)\monodll_statbar.o $(OBJS)\monodll_tbarbase.o $(OBJS)\monodll_textcmn.o $(OBJS)\monodll_treebase.o $(OBJS)\monodll_valgen.o $(OBJS)\monodll_validate.o $(OBJS)\monodll_valtext.o $(OBJS)\monodll_wincmn.o $(OBJS)\monodll_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
-____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.o $(OBJS)\monodll_bitmap.o $(OBJS)\monodll_brush.o $(OBJS)\monodll_caret.o $(OBJS)\monodll_clipbrd.o $(OBJS)\monodll_colour.o $(OBJS)\monodll_cursor.o $(OBJS)\monodll_data.o $(OBJS)\monodll_dc.o $(OBJS)\monodll_dcclient.o $(OBJS)\monodll_dcmemory.o $(OBJS)\monodll_dcprint.o $(OBJS)\monodll_dcscreen.o $(OBJS)\monodll_dialup.o $(OBJS)\monodll_dib.o $(OBJS)\monodll_dirdlg.o $(OBJS)\monodll_display.o $(OBJS)\monodll_enhmeta.o $(OBJS)\monodll_evtloop.o $(OBJS)\monodll_font.o $(OBJS)\monodll_fontenum.o $(OBJS)\monodll_fontutil.o $(OBJS)\monodll_gdiimage.o $(OBJS)\monodll_gdiobj.o $(OBJS)\monodll_helpchm.o $(OBJS)\monodll_helpwin.o $(OBJS)\monodll_icon.o $(OBJS)\monodll_joystick.o $(OBJS)\monodll_minifram.o $(OBJS)\monodll_palette.o $(OBJS)\monodll_pen.o $(OBJS)\monodll_popupwin.o $(OBJS)\monodll_region.o $(OBJS)\monodll_settings.o $(OBJS)\monodll_taskbarcmn.o $(OBJS)\monodll_taskbar.o $(OBJS)\monodll_timer.o $(OBJS)\monodll_tooltip.o $(OBJS)\monodll_toplevel.o $(OBJS)\monodll_utilsgui.o $(OBJS)\monodll_wave.o $(OBJS)\monodll_window.o $(OBJS)\monodll_automtn.o $(OBJS)\monodll_dataobj.o $(OBJS)\monodll_dropsrc.o $(OBJS)\monodll_droptgt.o $(OBJS)\monodll_oleutils.o $(OBJS)\monodll_uuid.o $(OBJS)\monodll_textctrl.o $(OBJS)\monodll_bmpbuttn.o $(OBJS)\monodll_button.o $(OBJS)\monodll_checkbox.o $(OBJS)\monodll_checklst.o $(OBJS)\monodll_choice.o $(OBJS)\monodll_colschem.o $(OBJS)\monodll_combobox.o $(OBJS)\monodll_control.o $(OBJS)\monodll_dialog.o $(OBJS)\monodll_framuniv.o $(OBJS)\monodll_topluniv.o $(OBJS)\monodll_gauge.o $(OBJS)\monodll_inpcons.o $(OBJS)\monodll_inphand.o $(OBJS)\monodll_listbox.o $(OBJS)\monodll_menu.o $(OBJS)\monodll_notebook.o $(OBJS)\monodll_radiobox.o $(OBJS)\monodll_radiobut.o $(OBJS)\monodll_renderer.o $(OBJS)\monodll_scrarrow.o $(OBJS)\monodll_scrolbar.o $(OBJS)\monodll_scrthumb.o $(OBJS)\monodll_slider.o $(OBJS)\monodll_spinbutt.o $(OBJS)\monodll_statbmp.o $(OBJS)\monodll_statbox.o $(OBJS)\monodll_statline.o $(OBJS)\monodll_stattext.o $(OBJS)\monodll_statusbr.o $(OBJS)\monodll_toolbar.o $(OBJS)\monodll_theme.o $(OBJS)\monodll_winuniv.o $(OBJS)\monodll_mdig.o $(OBJS)\monodll_imaglist.o $(OBJS)\monodll_colrdlgg.o $(OBJS)\monodll_listctrl.o $(OBJS)\monodll_filedlgg.o $(OBJS)\monodll_dirdlgg.o $(OBJS)\monodll_prntdlgg.o $(OBJS)\monodll_accel.o $(OBJS)\monodll_msgdlgg.o $(OBJS)\monodll_fdrepdlg.o $(OBJS)\monodll_fontdlgg.o $(OBJS)\monodll_tabg.o $(OBJS)\monodll_gtk.o $(OBJS)\monodll_win32.o $(OBJS)\monodll_metal.o $(OBJS)\monodll_selstore.o $(OBJS)\monodll_busyinfo.o $(OBJS)\monodll_calctrl.o $(OBJS)\monodll_choicdgg.o $(OBJS)\monodll_dcbuffer.o $(OBJS)\monodll_dcpsg.o $(OBJS)\monodll_dirctrlg.o $(OBJS)\monodll_grid.o $(OBJS)\monodll_gridctrl.o $(OBJS)\monodll_gridsel.o $(OBJS)\monodll_laywin.o $(OBJS)\monodll_logg.o $(OBJS)\monodll_numdlgg.o $(OBJS)\monodll_panelg.o $(OBJS)\monodll_progdlgg.o $(OBJS)\monodll_sashwin.o $(OBJS)\monodll_scrlwing.o $(OBJS)\monodll_spinctlg.o $(OBJS)\monodll_splash.o $(OBJS)\monodll_splitter.o $(OBJS)\monodll_tbarsmpl.o $(OBJS)\monodll_textdlgg.o $(OBJS)\monodll_tipdlg.o $(OBJS)\monodll_tipwin.o $(OBJS)\monodll_treectlg.o $(OBJS)\monodll_vlbox.o $(OBJS)\monodll_vscroll.o $(OBJS)\monodll_wizard.o $(OBJS)\monodll_appcmn.o $(OBJS)\monodll_fontmap.o $(OBJS)\monodll_accesscmn.o $(OBJS)\monodll_artprov.o $(OBJS)\monodll_artstd.o $(OBJS)\monodll_bmpbase.o $(OBJS)\monodll_choiccmn.o $(OBJS)\monodll_clipcmn.o $(OBJS)\monodll_cmdproc.o $(OBJS)\monodll_cmndata.o $(OBJS)\monodll_containr.o $(OBJS)\monodll_cshelp.o $(OBJS)\monodll_ctrlcmn.o $(OBJS)\monodll_ctrlsub.o $(OBJS)\monodll_datacmn.o $(OBJS)\monodll_dbgrid.o $(OBJS)\monodll_dcbase.o $(OBJS)\monodll_dlgcmn.o $(OBJS)\monodll_dndcmn.o $(OBJS)\monodll_dobjcmn.o $(OBJS)\monodll_docmdi.o $(OBJS)\monodll_docview.o $(OBJS)\monodll_dpycmn.o $(OBJS)\monodll_dseldlg.o $(OBJS)\monodll_effects.o $(OBJS)\monodll_fddlgcmn.o $(OBJS)\monodll_fldlgcmn.o $(OBJS)\monodll_fontcmn.o $(OBJS)\monodll_framecmn.o $(OBJS)\monodll_timercmn.o $(OBJS)\monodll_toplvcmn.o $(OBJS)\monodll_gaugecmn.o $(OBJS)\monodll_gdicmn.o $(OBJS)\monodll_geometry.o $(OBJS)\monodll_gifdecod.o $(OBJS)\monodll_helpbase.o $(OBJS)\monodll_iconbndl.o $(OBJS)\monodll_imagall.o $(OBJS)\monodll_imagbmp.o $(OBJS)\monodll_image.o $(OBJS)\monodll_imaggif.o $(OBJS)\monodll_imagiff.o $(OBJS)\monodll_imagjpeg.o $(OBJS)\monodll_imagpcx.o $(OBJS)\monodll_imagpng.o $(OBJS)\monodll_imagpnm.o $(OBJS)\monodll_imagtiff.o $(OBJS)\monodll_imagxpm.o $(OBJS)\monodll_imagfill.o $(OBJS)\monodll_layout.o $(OBJS)\monodll_lboxcmn.o $(OBJS)\monodll_matrix.o $(OBJS)\monodll_menucmn.o $(OBJS)\monodll_nbkbase.o $(OBJS)\monodll_paper.o $(OBJS)\monodll_popupcmn.o $(OBJS)\monodll_prntbase.o $(OBJS)\monodll_quantize.o $(OBJS)\monodll_radiocmn.o $(OBJS)\monodll_rgncmn.o $(OBJS)\monodll_settcmn.o $(OBJS)\monodll_sizer.o $(OBJS)\monodll_statbar.o $(OBJS)\monodll_tbarbase.o $(OBJS)\monodll_textcmn.o $(OBJS)\monodll_treebase.o $(OBJS)\monodll_valgen.o $(OBJS)\monodll_validate.o $(OBJS)\monodll_valtext.o $(OBJS)\monodll_wincmn.o $(OBJS)\monodll_xpmdecod.o
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.o $(OBJS)\monodll_bitmap.o $(OBJS)\monodll_brush.o $(OBJS)\monodll_caret.o $(OBJS)\monodll_clipbrd.o $(OBJS)\monodll_colour.o $(OBJS)\monodll_cursor.o $(OBJS)\monodll_data.o $(OBJS)\monodll_dc.o $(OBJS)\monodll_dcclient.o $(OBJS)\monodll_dcmemory.o $(OBJS)\monodll_dcprint.o $(OBJS)\monodll_dcscreen.o $(OBJS)\monodll_dialup.o $(OBJS)\monodll_dib.o $(OBJS)\monodll_dirdlg.o $(OBJS)\monodll_display.o $(OBJS)\monodll_enhmeta.o $(OBJS)\monodll_evtloop.o $(OBJS)\monodll_font.o $(OBJS)\monodll_fontenum.o $(OBJS)\monodll_fontutil.o $(OBJS)\monodll_gdiimage.o $(OBJS)\monodll_gdiobj.o $(OBJS)\monodll_helpchm.o $(OBJS)\monodll_helpwin.o $(OBJS)\monodll_icon.o $(OBJS)\monodll_joystick.o $(OBJS)\monodll_minifram.o $(OBJS)\monodll_palette.o $(OBJS)\monodll_pen.o $(OBJS)\monodll_popupwin.o $(OBJS)\monodll_region.o $(OBJS)\monodll_settings.o $(OBJS)\monodll_taskbarcmn.o $(OBJS)\monodll_taskbar.o $(OBJS)\monodll_timer.o $(OBJS)\monodll_tooltip.o $(OBJS)\monodll_toplevel.o $(OBJS)\monodll_utilsgui.o $(OBJS)\monodll_wave.o $(OBJS)\monodll_window.o $(OBJS)\monodll_automtn.o $(OBJS)\monodll_dataobj.o $(OBJS)\monodll_dropsrc.o $(OBJS)\monodll_droptgt.o $(OBJS)\monodll_oleutils.o $(OBJS)\monodll_uuid.o $(OBJS)\monodll_textctrl.o $(OBJS)\monodll_bmpbuttn.o $(OBJS)\monodll_button.o $(OBJS)\monodll_checkbox.o $(OBJS)\monodll_checklst.o $(OBJS)\monodll_choice.o $(OBJS)\monodll_colschem.o $(OBJS)\monodll_combobox.o $(OBJS)\monodll_control.o $(OBJS)\monodll_dialog.o $(OBJS)\monodll_framuniv.o $(OBJS)\monodll_topluniv.o $(OBJS)\monodll_gauge.o $(OBJS)\monodll_inpcons.o $(OBJS)\monodll_inphand.o $(OBJS)\monodll_listbox.o $(OBJS)\monodll_menu.o $(OBJS)\monodll_notebook.o $(OBJS)\monodll_radiobox.o $(OBJS)\monodll_radiobut.o $(OBJS)\monodll_renderer.o $(OBJS)\monodll_scrarrow.o $(OBJS)\monodll_scrolbar.o $(OBJS)\monodll_scrthumb.o $(OBJS)\monodll_slider.o $(OBJS)\monodll_spinbutt.o $(OBJS)\monodll_statbmp.o $(OBJS)\monodll_statbox.o $(OBJS)\monodll_statline.o $(OBJS)\monodll_stattext.o $(OBJS)\monodll_statusbr.o $(OBJS)\monodll_toolbar.o $(OBJS)\monodll_theme.o $(OBJS)\monodll_winuniv.o $(OBJS)\monodll_mdig.o $(OBJS)\monodll_imaglist.o $(OBJS)\monodll_colrdlgg.o $(OBJS)\monodll_listctrl.o $(OBJS)\monodll_filedlgg.o $(OBJS)\monodll_dirdlgg.o $(OBJS)\monodll_prntdlgg.o $(OBJS)\monodll_accel.o $(OBJS)\monodll_msgdlgg.o $(OBJS)\monodll_fdrepdlg.o $(OBJS)\monodll_fontdlgg.o $(OBJS)\monodll_tabg.o $(OBJS)\monodll_gtk.o $(OBJS)\monodll_win32.o $(OBJS)\monodll_metal.o $(OBJS)\monodll_selstore.o $(OBJS)\monodll_busyinfo.o $(OBJS)\monodll_calctrl.o $(OBJS)\monodll_choicdgg.o $(OBJS)\monodll_dcbuffer.o $(OBJS)\monodll_dcpsg.o $(OBJS)\monodll_dirctrlg.o $(OBJS)\monodll_dragimgg.o $(OBJS)\monodll_grid.o $(OBJS)\monodll_gridctrl.o $(OBJS)\monodll_gridsel.o $(OBJS)\monodll_laywin.o $(OBJS)\monodll_logg.o $(OBJS)\monodll_numdlgg.o $(OBJS)\monodll_panelg.o $(OBJS)\monodll_progdlgg.o $(OBJS)\monodll_sashwin.o $(OBJS)\monodll_scrlwing.o $(OBJS)\monodll_spinctlg.o $(OBJS)\monodll_splash.o $(OBJS)\monodll_splitter.o $(OBJS)\monodll_tbarsmpl.o $(OBJS)\monodll_textdlgg.o $(OBJS)\monodll_tipdlg.o $(OBJS)\monodll_tipwin.o $(OBJS)\monodll_treectlg.o $(OBJS)\monodll_vlbox.o $(OBJS)\monodll_vscroll.o $(OBJS)\monodll_wizard.o $(OBJS)\monodll_appcmn.o $(OBJS)\monodll_fontmap.o $(OBJS)\monodll_accesscmn.o $(OBJS)\monodll_artprov.o $(OBJS)\monodll_artstd.o $(OBJS)\monodll_bmpbase.o $(OBJS)\monodll_choiccmn.o $(OBJS)\monodll_clipcmn.o $(OBJS)\monodll_cmdproc.o $(OBJS)\monodll_cmndata.o $(OBJS)\monodll_containr.o $(OBJS)\monodll_cshelp.o $(OBJS)\monodll_ctrlcmn.o $(OBJS)\monodll_ctrlsub.o $(OBJS)\monodll_datacmn.o $(OBJS)\monodll_dbgrid.o $(OBJS)\monodll_dcbase.o $(OBJS)\monodll_dlgcmn.o $(OBJS)\monodll_dndcmn.o $(OBJS)\monodll_dobjcmn.o $(OBJS)\monodll_docmdi.o $(OBJS)\monodll_docview.o $(OBJS)\monodll_dpycmn.o $(OBJS)\monodll_dseldlg.o $(OBJS)\monodll_effects.o $(OBJS)\monodll_fddlgcmn.o $(OBJS)\monodll_fldlgcmn.o $(OBJS)\monodll_fontcmn.o $(OBJS)\monodll_framecmn.o $(OBJS)\monodll_timercmn.o $(OBJS)\monodll_toplvcmn.o $(OBJS)\monodll_gaugecmn.o $(OBJS)\monodll_gdicmn.o $(OBJS)\monodll_geometry.o $(OBJS)\monodll_gifdecod.o $(OBJS)\monodll_helpbase.o $(OBJS)\monodll_iconbndl.o $(OBJS)\monodll_imagall.o $(OBJS)\monodll_imagbmp.o $(OBJS)\monodll_image.o $(OBJS)\monodll_imaggif.o $(OBJS)\monodll_imagiff.o $(OBJS)\monodll_imagjpeg.o $(OBJS)\monodll_imagpcx.o $(OBJS)\monodll_imagpng.o $(OBJS)\monodll_imagpnm.o $(OBJS)\monodll_imagtiff.o $(OBJS)\monodll_imagxpm.o $(OBJS)\monodll_imagfill.o $(OBJS)\monodll_layout.o $(OBJS)\monodll_lboxcmn.o $(OBJS)\monodll_matrix.o $(OBJS)\monodll_menucmn.o $(OBJS)\monodll_nbkbase.o $(OBJS)\monodll_paper.o $(OBJS)\monodll_popupcmn.o $(OBJS)\monodll_prntbase.o $(OBJS)\monodll_quantize.o $(OBJS)\monodll_radiocmn.o $(OBJS)\monodll_rgncmn.o $(OBJS)\monodll_settcmn.o $(OBJS)\monodll_sizer.o $(OBJS)\monodll_statbar.o $(OBJS)\monodll_tbarbase.o $(OBJS)\monodll_textcmn.o $(OBJS)\monodll_treebase.o $(OBJS)\monodll_valgen.o $(OBJS)\monodll_validate.o $(OBJS)\monodll_valtext.o $(OBJS)\monodll_wincmn.o $(OBJS)\monodll_xpmdecod.o
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -1132,6 +1132,11 @@ endif
 $(OBJS)\coredll_dragimag.o: ..\src\msw\dragimag.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_dragimgg.o: ..\src\generic\dragimgg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_dropsrc.o: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -2388,6 +2393,11 @@ endif
 $(OBJS)\corelib_dragimag.o: ..\src\msw\dragimag.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_dragimgg.o: ..\src\generic\dragimgg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_dropsrc.o: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -3833,6 +3843,11 @@ endif
 $(OBJS)\monodll_dragimag.o: ..\src\msw\dragimag.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_dragimgg.o: ..\src\generic\dragimgg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_dropsrc.o: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -5380,6 +5395,11 @@ endif
 $(OBJS)\monolib_dragimag.o: ..\src\msw\dragimag.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_dragimgg.o: ..\src\generic\dragimgg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_dropsrc.o: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6854,7 +6874,7 @@ $(OBJS)\wxzlib_zutil.o: ..\src\zlib\zutil.c
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\basedll_dummy.o ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxzlib$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxregex$(WXDEBUGFLAG).a $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_inet.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_ftp.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_http.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_protocol.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_sckaddr.o $(OBJS)\basedll_sckfile.o $(OBJS)\basedll_sckipc.o $(OBJS)\basedll_sckstrm.o $(OBJS)\basedll_socket.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_url.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_gsocket.o $(OBJS)\basedll_gsockmsw.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o
-	$(CXX) -shared -o $@  $(OBJS)\basedll_dummy.o $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_inet.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_ftp.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_http.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_protocol.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_sckaddr.o $(OBJS)\basedll_sckfile.o $(OBJS)\basedll_sckipc.o $(OBJS)\basedll_sckstrm.o $(OBJS)\basedll_socket.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_url.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_gsocket.o $(OBJS)\basedll_gsockmsw.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o $(LDFLAGS) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+	$(CXX) -shared -o $@  $(OBJS)\basedll_dummy.o $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_inet.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_ftp.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_http.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_protocol.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_sckaddr.o $(OBJS)\basedll_sckfile.o $(OBJS)\basedll_sckipc.o $(OBJS)\basedll_sckstrm.o $(OBJS)\basedll_socket.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_url.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_gsocket.o $(OBJS)\basedll_gsockmsw.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 endif
 endif
 
@@ -6894,7 +6914,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\coredll_dummy.o ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxtiff$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxjpeg$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxpng$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxzlib$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxregex$(WXDEBUGFLAG).a $(OBJS)\coredll_event.o $(OBJS)\coredll_fs_mem.o $(OBJS)\coredll_msgout.o $(OBJS)\coredll_utilscmn.o $(OBJS)\coredll_main.o $(OBJS)\coredll_mslu.o $(OBJS)\coredll_volume.o $(____CORE_SRC_FILENAMES_2_OBJECTS) $(__basedll___depname)
-	$(CXX) -shared -o $@  $(OBJS)\coredll_dummy.o $(OBJS)\coredll_event.o $(OBJS)\coredll_fs_mem.o $(OBJS)\coredll_msgout.o $(OBJS)\coredll_utilscmn.o $(OBJS)\coredll_main.o $(OBJS)\coredll_mslu.o $(OBJS)\coredll_volume.o $(____CORE_SRC_FILENAMES_2_OBJECTS) $(LDFLAGS) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+	$(CXX) -shared -o $@  $(OBJS)\coredll_dummy.o $(OBJS)\coredll_event.o $(OBJS)\coredll_fs_mem.o $(OBJS)\coredll_msgout.o $(OBJS)\coredll_utilscmn.o $(OBJS)\coredll_main.o $(OBJS)\coredll_mslu.o $(OBJS)\coredll_volume.o $(____CORE_SRC_FILENAMES_2_OBJECTS) $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
 endif
 endif
 endif
@@ -6914,7 +6934,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\gldll_dummy.o ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxtiff$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxjpeg$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxpng$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxzlib$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxregex$(WXDEBUGFLAG).a $(OBJS)\gldll_glcanvas.o
-	$(CXX) -shared -o $@  $(OBJS)\gldll_dummy.o $(OBJS)\gldll_glcanvas.o $(LDFLAGS) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+	$(CXX) -shared -o $@  $(OBJS)\gldll_dummy.o $(OBJS)\gldll_glcanvas.o $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
 endif
 endif
 endif
@@ -6934,7 +6954,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_HTML),1)
 ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\htmldll_dummy.o ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxtiff$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxjpeg$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxpng$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxzlib$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxregex$(WXDEBUGFLAG).a $(OBJS)\htmldll_helpbest.o $(OBJS)\htmldll_helpdata.o $(OBJS)\htmldll_helpfrm.o $(OBJS)\htmldll_helpctrl.o $(OBJS)\htmldll_htmlcell.o $(OBJS)\htmldll_htmlfilt.o $(OBJS)\htmldll_htmlpars.o $(OBJS)\htmldll_htmltag.o $(OBJS)\htmldll_htmlwin.o $(OBJS)\htmldll_winpars.o $(OBJS)\htmldll_m_fonts.o $(OBJS)\htmldll_m_hline.o $(OBJS)\htmldll_m_image.o $(OBJS)\htmldll_m_layout.o $(OBJS)\htmldll_m_links.o $(OBJS)\htmldll_m_list.o $(OBJS)\htmldll_m_dflist.o $(OBJS)\htmldll_m_pre.o $(OBJS)\htmldll_m_tables.o $(OBJS)\htmldll_m_style.o $(OBJS)\htmldll_htmprint.o $(OBJS)\htmldll_htmllbox.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -o $@  $(OBJS)\htmldll_dummy.o $(OBJS)\htmldll_helpbest.o $(OBJS)\htmldll_helpdata.o $(OBJS)\htmldll_helpfrm.o $(OBJS)\htmldll_helpctrl.o $(OBJS)\htmldll_htmlcell.o $(OBJS)\htmldll_htmlfilt.o $(OBJS)\htmldll_htmlpars.o $(OBJS)\htmldll_htmltag.o $(OBJS)\htmldll_htmlwin.o $(OBJS)\htmldll_winpars.o $(OBJS)\htmldll_m_fonts.o $(OBJS)\htmldll_m_hline.o $(OBJS)\htmldll_m_image.o $(OBJS)\htmldll_m_layout.o $(OBJS)\htmldll_m_links.o $(OBJS)\htmldll_m_list.o $(OBJS)\htmldll_m_dflist.o $(OBJS)\htmldll_m_pre.o $(OBJS)\htmldll_m_tables.o $(OBJS)\htmldll_m_style.o $(OBJS)\htmldll_htmprint.o $(OBJS)\htmldll_htmllbox.o $(LDFLAGS) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+	$(CXX) -shared -o $@  $(OBJS)\htmldll_dummy.o $(OBJS)\htmldll_helpbest.o $(OBJS)\htmldll_helpdata.o $(OBJS)\htmldll_helpfrm.o $(OBJS)\htmldll_helpctrl.o $(OBJS)\htmldll_htmlcell.o $(OBJS)\htmldll_htmlfilt.o $(OBJS)\htmldll_htmlpars.o $(OBJS)\htmldll_htmltag.o $(OBJS)\htmldll_htmlwin.o $(OBJS)\htmldll_winpars.o $(OBJS)\htmldll_m_fonts.o $(OBJS)\htmldll_m_hline.o $(OBJS)\htmldll_m_image.o $(OBJS)\htmldll_m_layout.o $(OBJS)\htmldll_m_links.o $(OBJS)\htmldll_m_list.o $(OBJS)\htmldll_m_dflist.o $(OBJS)\htmldll_m_pre.o $(OBJS)\htmldll_m_tables.o $(OBJS)\htmldll_m_style.o $(OBJS)\htmldll_htmprint.o $(OBJS)\htmldll_htmllbox.o $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
 endif
 endif
 endif
@@ -6959,7 +6979,7 @@ endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\monodll_dummy.o ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxtiff$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxjpeg$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxpng$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxzlib$(WXDEBUGFLAG).a ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwxregex$(WXDEBUGFLAG).a $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_http.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_url.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS)
-	$(CXX) -shared -o $@  $(OBJS)\monodll_dummy.o $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_http.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_url.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) $(LDFLAGS) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+	$(CXX) -shared -o $@  $(OBJS)\monodll_dummy.o $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_http.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_url.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__DEBUGFLAG) -mthreads -L..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 endif
 endif
 
diff --git a/build/makefile.vc b/build/makefile.vc
index e123440eaf..3ce5341d22 100644
--- a/build/makefile.vc
+++ b/build/makefile.vc
@@ -152,28 +152,28 @@ __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
 !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_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
+____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_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_dragimgg.obj $(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj
 !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_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
+____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_selstore.obj $(OBJS)\monolib_busyinfo.obj $(OBJS)\monolib_calctrl.obj $(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj $(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj $(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj
 !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_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
+____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_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_dragimgg.obj $(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj $(OBJS)\coredll_bitmap.obj $(OBJS)\coredll_brush.obj $(OBJS)\coredll_caret.obj $(OBJS)\coredll_clipbrd.obj $(OBJS)\coredll_colour.obj $(OBJS)\coredll_cursor.obj $(OBJS)\coredll_data.obj $(OBJS)\coredll_dc.obj $(OBJS)\coredll_dcclient.obj $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.obj $(OBJS)\coredll_settings.obj $(OBJS)\coredll_taskbarcmn.obj $(OBJS)\coredll_taskbar.obj $(OBJS)\coredll_timer.obj $(OBJS)\coredll_tooltip.obj $(OBJS)\coredll_toplevel.obj $(OBJS)\coredll_utilsgui.obj $(OBJS)\coredll_wave.obj $(OBJS)\coredll_window.obj $(OBJS)\coredll_automtn.obj $(OBJS)\coredll_dataobj.obj $(OBJS)\coredll_dropsrc.obj $(OBJS)\coredll_droptgt.obj $(OBJS)\coredll_oleutils.obj $(OBJS)\coredll_uuid.obj $(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_bmpbuttn.obj $(OBJS)\coredll_button.obj $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj $(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj $(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj $(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj $(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj $(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.obj $(OBJS)\coredll_winuniv.obj $(OBJS)\coredll_mdig.obj $(OBJS)\coredll_imaglist.obj $(OBJS)\coredll_colrdlgg.obj $(OBJS)\coredll_listctrl.obj $(OBJS)\coredll_filedlgg.obj $(OBJS)\coredll_dirdlgg.obj $(OBJS)\coredll_prntdlgg.obj $(OBJS)\coredll_accel.obj $(OBJS)\coredll_msgdlgg.obj $(OBJS)\coredll_fdrepdlg.obj $(OBJS)\coredll_fontdlgg.obj $(OBJS)\coredll_tabg.obj $(OBJS)\coredll_gtk.obj $(OBJS)\coredll_win32.obj $(OBJS)\coredll_metal.obj $(OBJS)\coredll_selstore.obj $(OBJS)\coredll_busyinfo.obj $(OBJS)\coredll_calctrl.obj $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj $(OBJS)\coredll_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
+____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj $(OBJS)\coredll_bitmap.obj $(OBJS)\coredll_brush.obj $(OBJS)\coredll_caret.obj $(OBJS)\coredll_clipbrd.obj $(OBJS)\coredll_colour.obj $(OBJS)\coredll_cursor.obj $(OBJS)\coredll_data.obj $(OBJS)\coredll_dc.obj $(OBJS)\coredll_dcclient.obj $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.obj $(OBJS)\coredll_settings.obj $(OBJS)\coredll_taskbarcmn.obj $(OBJS)\coredll_taskbar.obj $(OBJS)\coredll_timer.obj $(OBJS)\coredll_tooltip.obj $(OBJS)\coredll_toplevel.obj $(OBJS)\coredll_utilsgui.obj $(OBJS)\coredll_wave.obj $(OBJS)\coredll_window.obj $(OBJS)\coredll_automtn.obj $(OBJS)\coredll_dataobj.obj $(OBJS)\coredll_dropsrc.obj $(OBJS)\coredll_droptgt.obj $(OBJS)\coredll_oleutils.obj $(OBJS)\coredll_uuid.obj $(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_bmpbuttn.obj $(OBJS)\coredll_button.obj $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj $(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj $(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj $(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj $(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj $(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.obj $(OBJS)\coredll_winuniv.obj $(OBJS)\coredll_mdig.obj $(OBJS)\coredll_imaglist.obj $(OBJS)\coredll_colrdlgg.obj $(OBJS)\coredll_listctrl.obj $(OBJS)\coredll_filedlgg.obj $(OBJS)\coredll_dirdlgg.obj $(OBJS)\coredll_prntdlgg.obj $(OBJS)\coredll_accel.obj $(OBJS)\coredll_msgdlgg.obj $(OBJS)\coredll_fdrepdlg.obj $(OBJS)\coredll_fontdlgg.obj $(OBJS)\coredll_tabg.obj $(OBJS)\coredll_gtk.obj $(OBJS)\coredll_win32.obj $(OBJS)\coredll_metal.obj $(OBJS)\coredll_selstore.obj $(OBJS)\coredll_busyinfo.obj $(OBJS)\coredll_calctrl.obj $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj $(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_uxtheme.obj $(OBJS)\corelib_access.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj $(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj $(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_ownerdrw.obj $(OBJS)\corelib_penwin.obj $(OBJS)\corelib_printdlg.obj $(OBJS)\corelib_printwin.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj $(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_uxtheme.obj $(OBJS)\corelib_access.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj $(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj $(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_ownerdrw.obj $(OBJS)\corelib_penwin.obj $(OBJS)\corelib_printdlg.obj $(OBJS)\corelib_printwin.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj $(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colschem.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_framuniv.obj $(OBJS)\corelib_topluniv.obj $(OBJS)\corelib_gauge.obj $(OBJS)\corelib_inpcons.obj $(OBJS)\corelib_inphand.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_renderer.obj $(OBJS)\corelib_scrarrow.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_scrthumb.obj $(OBJS)\corelib_slider.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_toolbar.obj $(OBJS)\corelib_theme.obj $(OBJS)\corelib_winuniv.obj $(OBJS)\corelib_mdig.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_colrdlgg.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_filedlgg.obj $(OBJS)\corelib_dirdlgg.obj $(OBJS)\corelib_prntdlgg.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_msgdlgg.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_fontdlgg.obj $(OBJS)\corelib_tabg.obj $(OBJS)\corelib_gtk.obj $(OBJS)\corelib_win32.obj $(OBJS)\corelib_metal.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colschem.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_framuniv.obj $(OBJS)\corelib_topluniv.obj $(OBJS)\corelib_gauge.obj $(OBJS)\corelib_inpcons.obj $(OBJS)\corelib_inphand.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_renderer.obj $(OBJS)\corelib_scrarrow.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_scrthumb.obj $(OBJS)\corelib_slider.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_toolbar.obj $(OBJS)\corelib_theme.obj $(OBJS)\corelib_winuniv.obj $(OBJS)\corelib_mdig.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_colrdlgg.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_filedlgg.obj $(OBJS)\corelib_dirdlgg.obj $(OBJS)\corelib_prntdlgg.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_msgdlgg.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_fontdlgg.obj $(OBJS)\corelib_tabg.obj $(OBJS)\corelib_gtk.obj $(OBJS)\corelib_win32.obj $(OBJS)\corelib_metal.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.obj $(OBJS)\monodll_settings.obj $(OBJS)\monodll_taskbarcmn.obj $(OBJS)\monodll_taskbar.obj $(OBJS)\monodll_timer.obj $(OBJS)\monodll_tooltip.obj $(OBJS)\monodll_toplevel.obj $(OBJS)\monodll_utilsgui.obj $(OBJS)\monodll_wave.obj $(OBJS)\monodll_window.obj $(OBJS)\monodll_automtn.obj $(OBJS)\monodll_dataobj.obj $(OBJS)\monodll_dropsrc.obj $(OBJS)\monodll_droptgt.obj $(OBJS)\monodll_oleutils.obj $(OBJS)\monodll_uuid.obj $(OBJS)\monodll_statusbr.obj $(OBJS)\monodll_uxtheme.obj $(OBJS)\monodll_access.obj $(OBJS)\monodll_accel.obj $(OBJS)\monodll_bmpbuttn.obj $(OBJS)\monodll_button.obj $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj $(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj $(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj $(OBJS)\monodll_notebook.obj $(OBJS)\monodll_ownerdrw.obj $(OBJS)\monodll_penwin.obj $(OBJS)\monodll_printdlg.obj $(OBJS)\monodll_printwin.obj $(OBJS)\monodll_radiobox.obj $(OBJS)\monodll_radiobut.obj $(OBJS)\monodll_scrolbar.obj $(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj $(OBJS)\monodll_statline.obj $(OBJS)\monodll_stattext.obj $(OBJS)\monodll_tabctrl.obj $(OBJS)\monodll_tbar95.obj $(OBJS)\monodll_textctrl.obj $(OBJS)\monodll_tglbtn.obj $(OBJS)\monodll_treectrl.obj $(OBJS)\monodll_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.obj $(OBJS)\monodll_settings.obj $(OBJS)\monodll_taskbarcmn.obj $(OBJS)\monodll_taskbar.obj $(OBJS)\monodll_timer.obj $(OBJS)\monodll_tooltip.obj $(OBJS)\monodll_toplevel.obj $(OBJS)\monodll_utilsgui.obj $(OBJS)\monodll_wave.obj $(OBJS)\monodll_window.obj $(OBJS)\monodll_automtn.obj $(OBJS)\monodll_dataobj.obj $(OBJS)\monodll_dropsrc.obj $(OBJS)\monodll_droptgt.obj $(OBJS)\monodll_oleutils.obj $(OBJS)\monodll_uuid.obj $(OBJS)\monodll_statusbr.obj $(OBJS)\monodll_uxtheme.obj $(OBJS)\monodll_access.obj $(OBJS)\monodll_accel.obj $(OBJS)\monodll_bmpbuttn.obj $(OBJS)\monodll_button.obj $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj $(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj $(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj $(OBJS)\monodll_notebook.obj $(OBJS)\monodll_ownerdrw.obj $(OBJS)\monodll_penwin.obj $(OBJS)\monodll_printdlg.obj $(OBJS)\monodll_printwin.obj $(OBJS)\monodll_radiobox.obj $(OBJS)\monodll_radiobut.obj $(OBJS)\monodll_scrolbar.obj $(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj $(OBJS)\monodll_statline.obj $(OBJS)\monodll_stattext.obj $(OBJS)\monodll_tabctrl.obj $(OBJS)\monodll_tbar95.obj $(OBJS)\monodll_textctrl.obj $(OBJS)\monodll_tglbtn.obj $(OBJS)\monodll_treectrl.obj $(OBJS)\monodll_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-____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_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_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_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = $(____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
@@ -1062,6 +1062,11 @@ $(OBJS)\coredll_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\coredll_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -2218,6 +2223,11 @@ $(OBJS)\corelib_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\corelib_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -3563,6 +3573,11 @@ $(OBJS)\monodll_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\monodll_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5010,6 +5025,11 @@ $(OBJS)\monolib_dpycmn.obj: ..\src\common\dpycmn.cpp
 $(OBJS)\monolib_dragimag.obj: ..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dragimgg.obj: ..\src\generic\dragimgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
diff --git a/build/makefile.wat b/build/makefile.wat
index 0bef08c5e6..77930a25af 100644
--- a/build/makefile.wat
+++ b/build/makefile.wat
@@ -157,45 +157,45 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq 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_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
+____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_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_dragimgg.obj $(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq 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_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
+____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_selstore.obj $(OBJS)\monolib_busyinfo.obj $(OBJS)\monolib_calctrl.obj $(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj $(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj $(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_2_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq 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_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
+____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_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_dragimgg.obj $(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
-____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj $(OBJS)\coredll_bitmap.obj $(OBJS)\coredll_brush.obj $(OBJS)\coredll_caret.obj $(OBJS)\coredll_clipbrd.obj $(OBJS)\coredll_colour.obj $(OBJS)\coredll_cursor.obj $(OBJS)\coredll_data.obj $(OBJS)\coredll_dc.obj $(OBJS)\coredll_dcclient.obj $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.obj $(OBJS)\coredll_settings.obj $(OBJS)\coredll_taskbarcmn.obj $(OBJS)\coredll_taskbar.obj $(OBJS)\coredll_timer.obj $(OBJS)\coredll_tooltip.obj $(OBJS)\coredll_toplevel.obj $(OBJS)\coredll_utilsgui.obj $(OBJS)\coredll_wave.obj $(OBJS)\coredll_window.obj $(OBJS)\coredll_automtn.obj $(OBJS)\coredll_dataobj.obj $(OBJS)\coredll_dropsrc.obj $(OBJS)\coredll_droptgt.obj $(OBJS)\coredll_oleutils.obj $(OBJS)\coredll_uuid.obj $(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_bmpbuttn.obj $(OBJS)\coredll_button.obj $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj $(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj $(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj $(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj $(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj $(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.obj $(OBJS)\coredll_winuniv.obj $(OBJS)\coredll_mdig.obj $(OBJS)\coredll_imaglist.obj $(OBJS)\coredll_colrdlgg.obj $(OBJS)\coredll_listctrl.obj $(OBJS)\coredll_filedlgg.obj $(OBJS)\coredll_dirdlgg.obj $(OBJS)\coredll_prntdlgg.obj $(OBJS)\coredll_accel.obj $(OBJS)\coredll_msgdlgg.obj $(OBJS)\coredll_fdrepdlg.obj $(OBJS)\coredll_fontdlgg.obj $(OBJS)\coredll_tabg.obj $(OBJS)\coredll_gtk.obj $(OBJS)\coredll_win32.obj $(OBJS)\coredll_metal.obj $(OBJS)\coredll_selstore.obj $(OBJS)\coredll_busyinfo.obj $(OBJS)\coredll_calctrl.obj $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj $(OBJS)\coredll_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
+____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj $(OBJS)\coredll_bitmap.obj $(OBJS)\coredll_brush.obj $(OBJS)\coredll_caret.obj $(OBJS)\coredll_clipbrd.obj $(OBJS)\coredll_colour.obj $(OBJS)\coredll_cursor.obj $(OBJS)\coredll_data.obj $(OBJS)\coredll_dc.obj $(OBJS)\coredll_dcclient.obj $(OBJS)\coredll_dcmemory.obj $(OBJS)\coredll_dcprint.obj $(OBJS)\coredll_dcscreen.obj $(OBJS)\coredll_dialup.obj $(OBJS)\coredll_dib.obj $(OBJS)\coredll_dirdlg.obj $(OBJS)\coredll_display.obj $(OBJS)\coredll_enhmeta.obj $(OBJS)\coredll_evtloop.obj $(OBJS)\coredll_font.obj $(OBJS)\coredll_fontenum.obj $(OBJS)\coredll_fontutil.obj $(OBJS)\coredll_gdiimage.obj $(OBJS)\coredll_gdiobj.obj $(OBJS)\coredll_helpchm.obj $(OBJS)\coredll_helpwin.obj $(OBJS)\coredll_icon.obj $(OBJS)\coredll_joystick.obj $(OBJS)\coredll_minifram.obj $(OBJS)\coredll_palette.obj $(OBJS)\coredll_pen.obj $(OBJS)\coredll_popupwin.obj $(OBJS)\coredll_region.obj $(OBJS)\coredll_settings.obj $(OBJS)\coredll_taskbarcmn.obj $(OBJS)\coredll_taskbar.obj $(OBJS)\coredll_timer.obj $(OBJS)\coredll_tooltip.obj $(OBJS)\coredll_toplevel.obj $(OBJS)\coredll_utilsgui.obj $(OBJS)\coredll_wave.obj $(OBJS)\coredll_window.obj $(OBJS)\coredll_automtn.obj $(OBJS)\coredll_dataobj.obj $(OBJS)\coredll_dropsrc.obj $(OBJS)\coredll_droptgt.obj $(OBJS)\coredll_oleutils.obj $(OBJS)\coredll_uuid.obj $(OBJS)\coredll_textctrl.obj $(OBJS)\coredll_bmpbuttn.obj $(OBJS)\coredll_button.obj $(OBJS)\coredll_checkbox.obj $(OBJS)\coredll_checklst.obj $(OBJS)\coredll_choice.obj $(OBJS)\coredll_colschem.obj $(OBJS)\coredll_combobox.obj $(OBJS)\coredll_control.obj $(OBJS)\coredll_dialog.obj $(OBJS)\coredll_framuniv.obj $(OBJS)\coredll_topluniv.obj $(OBJS)\coredll_gauge.obj $(OBJS)\coredll_inpcons.obj $(OBJS)\coredll_inphand.obj $(OBJS)\coredll_listbox.obj $(OBJS)\coredll_menu.obj $(OBJS)\coredll_notebook.obj $(OBJS)\coredll_radiobox.obj $(OBJS)\coredll_radiobut.obj $(OBJS)\coredll_renderer.obj $(OBJS)\coredll_scrarrow.obj $(OBJS)\coredll_scrolbar.obj $(OBJS)\coredll_scrthumb.obj $(OBJS)\coredll_slider.obj $(OBJS)\coredll_spinbutt.obj $(OBJS)\coredll_statbmp.obj $(OBJS)\coredll_statbox.obj $(OBJS)\coredll_statline.obj $(OBJS)\coredll_stattext.obj $(OBJS)\coredll_statusbr.obj $(OBJS)\coredll_toolbar.obj $(OBJS)\coredll_theme.obj $(OBJS)\coredll_winuniv.obj $(OBJS)\coredll_mdig.obj $(OBJS)\coredll_imaglist.obj $(OBJS)\coredll_colrdlgg.obj $(OBJS)\coredll_listctrl.obj $(OBJS)\coredll_filedlgg.obj $(OBJS)\coredll_dirdlgg.obj $(OBJS)\coredll_prntdlgg.obj $(OBJS)\coredll_accel.obj $(OBJS)\coredll_msgdlgg.obj $(OBJS)\coredll_fdrepdlg.obj $(OBJS)\coredll_fontdlgg.obj $(OBJS)\coredll_tabg.obj $(OBJS)\coredll_gtk.obj $(OBJS)\coredll_win32.obj $(OBJS)\coredll_metal.obj $(OBJS)\coredll_selstore.obj $(OBJS)\coredll_busyinfo.obj $(OBJS)\coredll_calctrl.obj $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj $(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_3_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_uxtheme.obj $(OBJS)\corelib_access.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj $(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj $(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_ownerdrw.obj $(OBJS)\corelib_penwin.obj $(OBJS)\corelib_printdlg.obj $(OBJS)\corelib_printwin.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj $(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_uxtheme.obj $(OBJS)\corelib_access.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colordlg.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_dragimag.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_filedlg.obj $(OBJS)\corelib_fontdlg.obj $(OBJS)\corelib_frame.obj $(OBJS)\corelib_gauge95.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_iniconf.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_mdi.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_menuitem.obj $(OBJS)\corelib_metafile.obj $(OBJS)\corelib_msgdlg.obj $(OBJS)\corelib_nativdlg.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_ownerdrw.obj $(OBJS)\corelib_penwin.obj $(OBJS)\corelib_printdlg.obj $(OBJS)\corelib_printwin.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_slider95.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_spinctrl.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statbr95.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_tabctrl.obj $(OBJS)\corelib_tbar95.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_tglbtn.obj $(OBJS)\corelib_treectrl.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
-____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colschem.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_framuniv.obj $(OBJS)\corelib_topluniv.obj $(OBJS)\corelib_gauge.obj $(OBJS)\corelib_inpcons.obj $(OBJS)\corelib_inphand.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_renderer.obj $(OBJS)\corelib_scrarrow.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_scrthumb.obj $(OBJS)\corelib_slider.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_toolbar.obj $(OBJS)\corelib_theme.obj $(OBJS)\corelib_winuniv.obj $(OBJS)\corelib_mdig.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_colrdlgg.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_filedlgg.obj $(OBJS)\corelib_dirdlgg.obj $(OBJS)\corelib_prntdlgg.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_msgdlgg.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_fontdlgg.obj $(OBJS)\corelib_tabg.obj $(OBJS)\corelib_gtk.obj $(OBJS)\corelib_win32.obj $(OBJS)\corelib_metal.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
+____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj $(OBJS)\corelib_bitmap.obj $(OBJS)\corelib_brush.obj $(OBJS)\corelib_caret.obj $(OBJS)\corelib_clipbrd.obj $(OBJS)\corelib_colour.obj $(OBJS)\corelib_cursor.obj $(OBJS)\corelib_data.obj $(OBJS)\corelib_dc.obj $(OBJS)\corelib_dcclient.obj $(OBJS)\corelib_dcmemory.obj $(OBJS)\corelib_dcprint.obj $(OBJS)\corelib_dcscreen.obj $(OBJS)\corelib_dialup.obj $(OBJS)\corelib_dib.obj $(OBJS)\corelib_dirdlg.obj $(OBJS)\corelib_display.obj $(OBJS)\corelib_enhmeta.obj $(OBJS)\corelib_evtloop.obj $(OBJS)\corelib_font.obj $(OBJS)\corelib_fontenum.obj $(OBJS)\corelib_fontutil.obj $(OBJS)\corelib_gdiimage.obj $(OBJS)\corelib_gdiobj.obj $(OBJS)\corelib_helpchm.obj $(OBJS)\corelib_helpwin.obj $(OBJS)\corelib_icon.obj $(OBJS)\corelib_joystick.obj $(OBJS)\corelib_minifram.obj $(OBJS)\corelib_palette.obj $(OBJS)\corelib_pen.obj $(OBJS)\corelib_popupwin.obj $(OBJS)\corelib_region.obj $(OBJS)\corelib_settings.obj $(OBJS)\corelib_taskbarcmn.obj $(OBJS)\corelib_taskbar.obj $(OBJS)\corelib_timer.obj $(OBJS)\corelib_tooltip.obj $(OBJS)\corelib_toplevel.obj $(OBJS)\corelib_utilsgui.obj $(OBJS)\corelib_wave.obj $(OBJS)\corelib_window.obj $(OBJS)\corelib_automtn.obj $(OBJS)\corelib_dataobj.obj $(OBJS)\corelib_dropsrc.obj $(OBJS)\corelib_droptgt.obj $(OBJS)\corelib_oleutils.obj $(OBJS)\corelib_uuid.obj $(OBJS)\corelib_textctrl.obj $(OBJS)\corelib_bmpbuttn.obj $(OBJS)\corelib_button.obj $(OBJS)\corelib_checkbox.obj $(OBJS)\corelib_checklst.obj $(OBJS)\corelib_choice.obj $(OBJS)\corelib_colschem.obj $(OBJS)\corelib_combobox.obj $(OBJS)\corelib_control.obj $(OBJS)\corelib_dialog.obj $(OBJS)\corelib_framuniv.obj $(OBJS)\corelib_topluniv.obj $(OBJS)\corelib_gauge.obj $(OBJS)\corelib_inpcons.obj $(OBJS)\corelib_inphand.obj $(OBJS)\corelib_listbox.obj $(OBJS)\corelib_menu.obj $(OBJS)\corelib_notebook.obj $(OBJS)\corelib_radiobox.obj $(OBJS)\corelib_radiobut.obj $(OBJS)\corelib_renderer.obj $(OBJS)\corelib_scrarrow.obj $(OBJS)\corelib_scrolbar.obj $(OBJS)\corelib_scrthumb.obj $(OBJS)\corelib_slider.obj $(OBJS)\corelib_spinbutt.obj $(OBJS)\corelib_statbmp.obj $(OBJS)\corelib_statbox.obj $(OBJS)\corelib_statline.obj $(OBJS)\corelib_stattext.obj $(OBJS)\corelib_statusbr.obj $(OBJS)\corelib_toolbar.obj $(OBJS)\corelib_theme.obj $(OBJS)\corelib_winuniv.obj $(OBJS)\corelib_mdig.obj $(OBJS)\corelib_imaglist.obj $(OBJS)\corelib_colrdlgg.obj $(OBJS)\corelib_listctrl.obj $(OBJS)\corelib_filedlgg.obj $(OBJS)\corelib_dirdlgg.obj $(OBJS)\corelib_prntdlgg.obj $(OBJS)\corelib_accel.obj $(OBJS)\corelib_msgdlgg.obj $(OBJS)\corelib_fdrepdlg.obj $(OBJS)\corelib_fontdlgg.obj $(OBJS)\corelib_tabg.obj $(OBJS)\corelib_gtk.obj $(OBJS)\corelib_win32.obj $(OBJS)\corelib_metal.obj $(OBJS)\corelib_selstore.obj $(OBJS)\corelib_busyinfo.obj $(OBJS)\corelib_calctrl.obj $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
-____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.obj $(OBJS)\monodll_settings.obj $(OBJS)\monodll_taskbarcmn.obj $(OBJS)\monodll_taskbar.obj $(OBJS)\monodll_timer.obj $(OBJS)\monodll_tooltip.obj $(OBJS)\monodll_toplevel.obj $(OBJS)\monodll_utilsgui.obj $(OBJS)\monodll_wave.obj $(OBJS)\monodll_window.obj $(OBJS)\monodll_automtn.obj $(OBJS)\monodll_dataobj.obj $(OBJS)\monodll_dropsrc.obj $(OBJS)\monodll_droptgt.obj $(OBJS)\monodll_oleutils.obj $(OBJS)\monodll_uuid.obj $(OBJS)\monodll_statusbr.obj $(OBJS)\monodll_uxtheme.obj $(OBJS)\monodll_access.obj $(OBJS)\monodll_accel.obj $(OBJS)\monodll_bmpbuttn.obj $(OBJS)\monodll_button.obj $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj $(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj $(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj $(OBJS)\monodll_notebook.obj $(OBJS)\monodll_ownerdrw.obj $(OBJS)\monodll_penwin.obj $(OBJS)\monodll_printdlg.obj $(OBJS)\monodll_printwin.obj $(OBJS)\monodll_radiobox.obj $(OBJS)\monodll_radiobut.obj $(OBJS)\monodll_scrolbar.obj $(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj $(OBJS)\monodll_statline.obj $(OBJS)\monodll_stattext.obj $(OBJS)\monodll_tabctrl.obj $(OBJS)\monodll_tbar95.obj $(OBJS)\monodll_textctrl.obj $(OBJS)\monodll_tglbtn.obj $(OBJS)\monodll_treectrl.obj $(OBJS)\monodll_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
+____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj $(OBJS)\monodll_bitmap.obj $(OBJS)\monodll_brush.obj $(OBJS)\monodll_caret.obj $(OBJS)\monodll_clipbrd.obj $(OBJS)\monodll_colour.obj $(OBJS)\monodll_cursor.obj $(OBJS)\monodll_data.obj $(OBJS)\monodll_dc.obj $(OBJS)\monodll_dcclient.obj $(OBJS)\monodll_dcmemory.obj $(OBJS)\monodll_dcprint.obj $(OBJS)\monodll_dcscreen.obj $(OBJS)\monodll_dialup.obj $(OBJS)\monodll_dib.obj $(OBJS)\monodll_dirdlg.obj $(OBJS)\monodll_display.obj $(OBJS)\monodll_enhmeta.obj $(OBJS)\monodll_evtloop.obj $(OBJS)\monodll_font.obj $(OBJS)\monodll_fontenum.obj $(OBJS)\monodll_fontutil.obj $(OBJS)\monodll_gdiimage.obj $(OBJS)\monodll_gdiobj.obj $(OBJS)\monodll_helpchm.obj $(OBJS)\monodll_helpwin.obj $(OBJS)\monodll_icon.obj $(OBJS)\monodll_joystick.obj $(OBJS)\monodll_minifram.obj $(OBJS)\monodll_palette.obj $(OBJS)\monodll_pen.obj $(OBJS)\monodll_popupwin.obj $(OBJS)\monodll_region.obj $(OBJS)\monodll_settings.obj $(OBJS)\monodll_taskbarcmn.obj $(OBJS)\monodll_taskbar.obj $(OBJS)\monodll_timer.obj $(OBJS)\monodll_tooltip.obj $(OBJS)\monodll_toplevel.obj $(OBJS)\monodll_utilsgui.obj $(OBJS)\monodll_wave.obj $(OBJS)\monodll_window.obj $(OBJS)\monodll_automtn.obj $(OBJS)\monodll_dataobj.obj $(OBJS)\monodll_dropsrc.obj $(OBJS)\monodll_droptgt.obj $(OBJS)\monodll_oleutils.obj $(OBJS)\monodll_uuid.obj $(OBJS)\monodll_statusbr.obj $(OBJS)\monodll_uxtheme.obj $(OBJS)\monodll_access.obj $(OBJS)\monodll_accel.obj $(OBJS)\monodll_bmpbuttn.obj $(OBJS)\monodll_button.obj $(OBJS)\monodll_checkbox.obj $(OBJS)\monodll_checklst.obj $(OBJS)\monodll_choice.obj $(OBJS)\monodll_colordlg.obj $(OBJS)\monodll_combobox.obj $(OBJS)\monodll_control.obj $(OBJS)\monodll_dialog.obj $(OBJS)\monodll_dragimag.obj $(OBJS)\monodll_fdrepdlg.obj $(OBJS)\monodll_filedlg.obj $(OBJS)\monodll_fontdlg.obj $(OBJS)\monodll_frame.obj $(OBJS)\monodll_gauge95.obj $(OBJS)\monodll_imaglist.obj $(OBJS)\monodll_iniconf.obj $(OBJS)\monodll_listbox.obj $(OBJS)\monodll_listctrl.obj $(OBJS)\monodll_mdi.obj $(OBJS)\monodll_menu.obj $(OBJS)\monodll_menuitem.obj $(OBJS)\monodll_metafile.obj $(OBJS)\monodll_msgdlg.obj $(OBJS)\monodll_nativdlg.obj $(OBJS)\monodll_notebook.obj $(OBJS)\monodll_ownerdrw.obj $(OBJS)\monodll_penwin.obj $(OBJS)\monodll_printdlg.obj $(OBJS)\monodll_printwin.obj $(OBJS)\monodll_radiobox.obj $(OBJS)\monodll_radiobut.obj $(OBJS)\monodll_scrolbar.obj $(OBJS)\monodll_slider95.obj $(OBJS)\monodll_spinbutt.obj $(OBJS)\monodll_spinctrl.obj $(OBJS)\monodll_statbmp.obj $(OBJS)\monodll_statbox.obj $(OBJS)\monodll_statbr95.obj $(OBJS)\monodll_statline.obj $(OBJS)\monodll_stattext.obj $(OBJS)\monodll_tabctrl.obj $(OBJS)\monodll_tbar95.obj $(OBJS)\monodll_textctrl.obj $(OBJS)\monodll_tglbtn.obj $(OBJS)\monodll_treectrl.obj $(OBJS)\monodll_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
-____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_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_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_selstore.obj $(OBJS)\monodll_busyinfo.obj $(OBJS)\monodll_calctrl.obj $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj
 !endif
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
@@ -1189,6 +1189,11 @@ $(OBJS)\coredll_dpycmn.obj :  .AUTODEPEND ..\src\common\dpycmn.cpp
 $(OBJS)\coredll_dragimag.obj :  .AUTODEPEND ..\src\msw\dragimag.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dragimgg.obj :  .AUTODEPEND ..\src\generic\dragimgg.cpp
+	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -2445,6 +2450,11 @@ $(OBJS)\corelib_dpycmn.obj :  .AUTODEPEND ..\src\common\dpycmn.cpp
 $(OBJS)\corelib_dragimag.obj :  .AUTODEPEND ..\src\msw\dragimag.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dragimgg.obj :  .AUTODEPEND ..\src\generic\dragimgg.cpp
+	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -3890,6 +3900,11 @@ $(OBJS)\monodll_dpycmn.obj :  .AUTODEPEND ..\src\common\dpycmn.cpp
 $(OBJS)\monodll_dragimag.obj :  .AUTODEPEND ..\src\msw\dragimag.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dragimgg.obj :  .AUTODEPEND ..\src\generic\dragimgg.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5437,6 +5452,11 @@ $(OBJS)\monolib_dpycmn.obj :  .AUTODEPEND ..\src\common\dpycmn.cpp
 $(OBJS)\monolib_dragimag.obj :  .AUTODEPEND ..\src\msw\dragimag.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dragimgg.obj :  .AUTODEPEND ..\src\generic\dragimgg.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\src\msw\ole\dropsrc.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
new file mode 100644
index 0000000000..dc263b4c9a
--- /dev/null
+++ b/contrib/build/ogl/ogl.bkl
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="../../../build/bakefiles/common_contrib.bkl"/>
+
+    <set var="OGL_SRC">
+        basic2.cpp
+	canvas.cpp
+	divided.cpp
+	mfutils.cpp
+	oglmisc.cpp
+	basic.cpp
+	composit.cpp
+	drawn.cpp
+	bmpshape.cpp
+	constrnt.cpp
+	lines.cpp
+	ogldiag.cpp
+    </set>
+
+    <headers template="wx_contrib_headers">
+        <files>
+            wx/ogl/basic.h
+            wx/ogl/basicp.h
+            wx/ogl/bmpshape.h
+            wx/ogl/canvas.h
+            wx/ogl/composit.h
+            wx/ogl/constrnt.h
+            wx/ogl/divided.h
+            wx/ogl/drawn.h
+            wx/ogl/drawnp.h
+            wx/ogl/lines.h
+            wx/ogl/linesp.h
+            wx/ogl/mfutils.h
+            wx/ogl/misc.h
+            wx/ogl/ogldiag.h
+            wx/ogl/ogl.h
+        </files>
+    </headers>
+
+    <dll id="ogldll" template="wx_contrib_dll" cond="SHARED=='1'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_OGL</define>
+	<define>wxUSE_DEPRECATED=0</define>  <!-- this is a hack, we should do the RightThing later -->
+        <sources>$(OGL_SRC)</sources>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+    </dll>
+
+    <lib id="ogllib" template="wx_contrib_lib" cond="SHARED=='0'">
+        <sources>$(OGL_SRC)</sources>
+    </lib>
+
+</makefile>
diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h
index 83d292f8d5..0f907a2962 100644
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -16,7 +16,9 @@
 #pragma interface "ogldiag.h"
 #endif
 
-#include <wx/deprecated/setup.h>
+#if wxUSE_DEPRECATED
+#include <wx/deprecated/wxexpr.h>
+#endif
 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index f3094fe3cf..0ef48515c6 100644
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -1,29 +1,272 @@
-# $Id$
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-libsrc_dir = contrib/src/ogl
-
-TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@
-
-LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=@WX_AGE@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
 
 
-HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=ogl
+@MAKE_SET@
 
-HEADERS=basic.h basicp.h bmpshape.h canvas.h composit.h constrnt.h \
-	divided.h drawn.h drawnp.h lines.h linesp.h mfutils.h misc.h \
-	ogl.h ogldiag.h
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+INSTALL = @INSTALL@
+AR = @AR@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+DLLPREFIX = @DLLPREFIX@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+HOST_SUFFIX = @HOST_SUFFIX@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DIR = @INSTALL_DIR@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LN_S = @LN_S@
+PIC_FLAG = @PIC_FLAG@
+RANLIB = @RANLIB@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+SONAME_FLAG = @SONAME_FLAG@
+SO_SUFFIX = @SO_SUFFIX@
+STRIP = @STRIP@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+VENDOR = @VENDOR@
+includedir = @includedir@
+libdir = @libdir@
+srcdir = @srcdir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
-OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \
-        basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o
-DEPFILES=$(OBJECTS:.o=.d)
+### Variables: ###
 
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+OGLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \
+	-DWXUSINGDLL -DWXMAKINGDLL_OGL -DwxUSE_DEPRECATED=0 $(CXXFLAGS) $(PIC_FLAG)
+OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \
+	$(CXXFLAGS)
 
-include $(top_builddir)/src/makelib.env
+### Conditionally set variables: ###
 
--include $(DEPFILES)
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
+@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
+@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \
+@COND_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \
+@COND_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
+@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \
+@COND_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
+@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = \
+@COND_MONOLITHIC_0@	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = \
+@COND_MONOLITHIC_1@	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_SHARED_1@__install_ogldll___depname = install_ogldll
+@COND_SHARED_0@__install_ogllib___depname = install_ogllib
+@COND_SHARED_1@__ogldll___depname = \
+@COND_SHARED_1@	$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+@COND_PLATFORM_WIN32_1@__ogldll___importlib = \
+@COND_PLATFORM_WIN32_1@	-Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_PLATFORM_WIN32_1@__ogldll___importlib = \
+@COND_PLATFORM_WIN32_1@	-Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = \
+@COND_PLATFORM_MACOSX_1@	-install_name \
+@COND_PLATFORM_MACOSX_1@	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__ogldll___macver = \
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.5 -current_version 2.5.0
+@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = \
+@COND_USE_SOSYMLINKS_1@	rm -f \
+@COND_USE_SOSYMLINKS_1@	$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@	$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@	$(LN_S) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@	$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@	$(LN_S) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@	$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd \
+@COND_USE_SOSYMLINKS_1@	= rm -f \
+@COND_USE_SOSYMLINKS_1@	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@	$(LN_S) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@	$(LN_S) \
+@COND_USE_SOSYMLINKS_1@	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = \
+@COND_USE_SOVERLINUX_1@	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = \
+@COND_USE_SOVERSOLARIS_1@	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
+@COND_SHARED_0@__ogllib___depname = \
+@COND_SHARED_0@	$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
+
+### Targets: ###
+
+all: $(__ogldll___depname) $(__ogllib___depname)
+
+clean: 
+	rm -rf ./.deps
+	rm -f -f ./*.o
+	rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
+
+distclean: clean
+	rm -f configure config.cache config.log config.status
+	rm -f bk-deps shared-ld-sh
+
+install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+	$(INSTALL_DIR) $(includedir)
+	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
+	if test ! -d $(includedir)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+	fi; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
+	done
+
+install-strip: install
+	$(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+
+@COND_SHARED_1@install_ogldll: 
+@COND_SHARED_1@	$(INSTALL_DIR) $(libdir)
+@COND_SHARED_1@	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
+@COND_SHARED_1@	$(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir)
+@COND_SHARED_1@	(cd $(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
+
+@COND_SHARED_0@install_ogllib: 
+@COND_SHARED_0@	$(INSTALL_DIR) $(libdir)
+@COND_SHARED_0@	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir)
+
+@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o
+@COND_SHARED_1@	$(SHARED_LD_CXX) $@  ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o $(LDFLAGS) $(__ogldll___importlib)   -L$(top_builddir)lib $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@	$(__ogldll___so_symlinks_cmd)
+
+ogldll_basic.o: $(srcdir)/basic.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_basic2.o: $(srcdir)/basic2.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_canvas.o: $(srcdir)/canvas.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_composit.o: $(srcdir)/composit.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_constrnt.o: $(srcdir)/constrnt.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_divided.o: $(srcdir)/divided.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_drawn.o: $(srcdir)/drawn.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_lines.o: $(srcdir)/lines.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_mfutils.o: $(srcdir)/mfutils.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+
+@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o
+@COND_SHARED_0@	rm -f $@
+@COND_SHARED_0@	$(AR) rcu $@  ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o
+@COND_SHARED_0@	$(RANLIB) $@
+
+ogllib_basic.o: $(srcdir)/basic.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_basic2.o: $(srcdir)/basic2.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_canvas.o: $(srcdir)/canvas.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_composit.o: $(srcdir)/composit.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_constrnt.o: $(srcdir)/constrnt.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_divided.o: $(srcdir)/divided.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_drawn.o: $(srcdir)/drawn.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_lines.o: $(srcdir)/lines.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_mfutils.o: $(srcdir)/mfutils.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+
+uninstall: 
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include .deps/*.d
+
+.PHONY: all clean distclean install install_ogldll install_ogllib uninstall
diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 563711de0d..a145099919 100644
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index d5eba29248..bf4eb57ca4 100644
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index 3080ac77c1..058262db6a 100644
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/basicp.h>
diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index ee49fdb4f5..77fa05b67e 100644
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index eb5be656df..42b2f375c1 100644
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/basicp.h>
diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index 98e9e6ffde..f62585c931 100644
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/constrnt.h>
diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp
index afb71ece6a..767bfa69e4 100644
--- a/contrib/src/ogl/divided.cpp
+++ b/contrib/src/ogl/divided.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/basicp.h>
diff --git a/contrib/src/ogl/drawn.cpp b/contrib/src/ogl/drawn.cpp
index 3104fbaf10..88bae8f5ca 100644
--- a/contrib/src/ogl/drawn.cpp
+++ b/contrib/src/ogl/drawn.cpp
@@ -25,7 +25,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/basicp.h>
diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index 40996d0776..ebdb997d07 100644
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -25,7 +25,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
diff --git a/contrib/src/ogl/misc.cpp b/contrib/src/ogl/misc.cpp
deleted file mode 100644
index f76fa8fa5c..0000000000
--- a/contrib/src/ogl/misc.cpp
+++ /dev/null
@@ -1,862 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        misc.cpp
-// Purpose:     Miscellaneous OGL support functions
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "misc.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
-
-#include <wx/deprecated/wxexpr.h>
-
-#include <wx/types.h>
-
-#ifdef new
-#undef new
-#endif
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/misc.h>
-#include <wx/ogl/constrnt.h>
-#include <wx/ogl/composit.h>
-
-wxFont*         g_oglNormalFont;
-wxPen*          g_oglBlackPen;
-wxPen*          g_oglTransparentPen;
-wxPen*          g_oglBlackForegroundPen;
-wxPen*          g_oglWhiteBackgroundPen;
-wxBrush*        g_oglWhiteBackgroundBrush;
-
-char*           oglBuffer = NULL;
-
-wxList          oglObjectCopyMapping(wxKEY_INTEGER);
-
-
-
-void wxOGLInitialize()
-{
-  g_oglNormalFont = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
-  g_oglBlackPen = wxThePenList->FindOrCreatePen(wxT("BLACK"), 1, wxSOLID);
-  g_oglTransparentPen = wxThePenList->FindOrCreatePen(wxT("WHITE"), 1, wxTRANSPARENT);
-  g_oglBlackForegroundPen = wxThePenList->FindOrCreatePen(wxT("BLACK"), 1, wxSOLID);
-  g_oglWhiteBackgroundPen = wxThePenList->FindOrCreatePen(wxT("WHITE"), 1, wxSOLID);
-  g_oglWhiteBackgroundBrush = wxTheBrushList->FindOrCreateBrush(wxT("WHITE"), wxSOLID);
-
-  OGLInitializeConstraintTypes();
-
-  // Initialize big buffer used when writing images
-  oglBuffer = new char[3000];
-
-}
-
-void wxOGLCleanUp()
-{
-    if (oglBuffer)
-    {
-        delete[] oglBuffer;
-        oglBuffer = NULL;
-    }
-    oglBuffer = NULL;
-
-    g_oglNormalFont = NULL;             // These will be cleaned up by their GDI list
-    g_oglBlackPen = NULL;
-    g_oglTransparentPen = NULL;
-    g_oglBlackForegroundPen = NULL;
-    g_oglWhiteBackgroundPen = NULL;
-    g_oglWhiteBackgroundBrush = NULL;
-
-    OGLCleanUpConstraintTypes();
-}
-
-wxFont *oglMatchFont(int point_size)
-{
-  wxFont *font = wxTheFontList->FindOrCreateFont(point_size, wxSWISS, wxNORMAL, wxNORMAL);
-#if 0
-  switch (point_size)
-  {
-    case 4:
-      font = swiss_font_4;
-      break;
-    case 6:
-      font = swiss_font_6;
-      break;
-    case 8:
-      font = swiss_font_8;
-      break;
-    case 12:
-      font = swiss_font_12;
-      break;
-    case 14:
-      font = swiss_font_14;
-      break;
-    case 18:
-      font = swiss_font_18;
-      break;
-    case 24:
-      font = swiss_font_24;
-      break;
-    default:
-    case 10:
-      font = swiss_font_10;
-      break;
-  }
-#endif
-  return font;
-}
-
-int FontSizeDialog(wxFrame *parent, int old_size)
-{
-  if (old_size <= 0)
-    old_size = 10;
-  wxString buf;
-  buf << old_size;
-  wxString ans = wxGetTextFromUser(wxT("Enter point size"), wxT("Font size"), buf, parent);
-  if (ans.Length() == 0)
-    return 0;
-
-  long new_size = 0;
-  ans.ToLong(&new_size);
-  if ((new_size <= 0) || (new_size > 40))
-  {
-    wxMessageBox(wxT("Invalid point size!"), wxT("Error"), wxOK);
-    return 0;
-  }
-  return new_size;
-/*
-  char *strings[8];
-  strings[0] = "4";
-  strings[1] = "6";
-  strings[2] = "8";
-  strings[3] = "10";
-  strings[4] = "12";
-  strings[5] = "14";
-  strings[6] = "18";
-  strings[7] = "24";
-  char *ans = wxGetSingleChoice("Choose", "Choose a font size", 8, strings, parent);
-  if (ans)
-  {
-    int size;
-    sscanf(ans, "%d", &size);
-    return oglMatchFont(size);
-  }
-  else return NULL;
-*/
-}
-
-// Centre a list of strings in the given box. xOffset and yOffset are the
-// the positions that these lines should be relative to, and this might be
-// the same as m_xpos, m_ypos, but might be zero if formatting from left-justifying.
-void oglCentreText(wxDC& dc, wxList *text_list,
-                double m_xpos, double m_ypos, double width, double height,
-                int formatMode)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-    return;
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  // Store text extents for speed
-  double *widths = new double[n];
-
-  wxNode *current = text_list->GetFirst();
-  int i = 0;
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-    widths[i] = current_width;
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-    i ++;
-  }
-
-  double max_height = n*char_height;
-
-  double xoffset, yoffset, xOffset, yOffset;
-
-  if (formatMode & FORMAT_CENTRE_VERT)
-  {
-    if (max_height < height)
-      yoffset = (double)(m_ypos - (height/2.0) + (height - max_height)/2.0);
-    else
-      yoffset = (double)(m_ypos - (height/2.0));
-    yOffset = m_ypos;
-  }
-  else
-  {
-    yoffset = 0.0;
-    yOffset = 0.0;
-  }
-
-  if (formatMode & FORMAT_CENTRE_HORIZ)
-  {
-    xoffset = (double)(m_xpos - width/2.0);
-    xOffset = m_xpos;
-  }
-  else
-  {
-    xoffset = 0.0;
-    xOffset = 0.0;
-  }
-
-  current = text_list->GetFirst();
-  i = 0;
-
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    double x;
-    if ((formatMode & FORMAT_CENTRE_HORIZ) && (widths[i] < width))
-      x = (double)((width - widths[i])/2.0 + xoffset);
-    else
-      x = xoffset;
-    double y = (double)(i*char_height + yoffset);
-
-    line->SetX( x - xOffset ); line->SetY( y - yOffset );
-    current = current->GetNext();
-    i ++;
-  }
-
-  delete widths;
-}
-
-// Centre a list of strings in the given box
-void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
-                              double m_xpos, double m_ypos, double width, double height)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-    return;
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  // Store text extents for speed
-  double *widths = new double[n];
-
-  wxNode *current = text_list->GetFirst();
-  int i = 0;
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-    widths[i] = current_width;
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-    i ++;
-  }
-
-  double max_height = n*char_height;
-
-  double yoffset = (double)(m_ypos - (height/2.0) + (height - max_height)/2.0);
-
-  double xoffset = (double)(m_xpos - width/2.0);
-
-  current = text_list->GetFirst();
-  i = 0;
-
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    double x = (double)((width - widths[i])/2.0 + xoffset);
-    double y = (double)(i*char_height + yoffset);
-
-    line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
-    current = current->GetNext();
-    i ++;
-  }
-  delete widths;
-}
-
-void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
-                              double m_xpos, double m_ypos, double width, double height,
-                              double *actual_width, double *actual_height)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-  {
-    *actual_width = 0;
-    *actual_height = 0;
-    return;
-  }
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  wxNode *current = text_list->GetFirst();
-  int i = 0;
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-    i ++;
-  }
-
-  *actual_height = n*char_height;
-  *actual_width = max_width;
-}
-
-// Format a string to a list of strings that fit in the given box.
-// Interpret %n and 10 or 13 as a new line.
-wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double height, int formatMode)
-{
-  // First, parse the string into a list of words
-  wxStringList word_list;
-
-  // Make new lines into NULL strings at this point
-  int i = 0; int j = 0; int len = text.Length();
-  wxChar word[200]; word[0] = 0;
-  bool end_word = FALSE; bool new_line = FALSE;
-  while (i < len)
-  {
-    switch (text[i])
-    {
-      case wxT('%'):
-      {
-        i ++;
-        if (i == len)
-        { word[j] = wxT('%'); j ++; }
-        else
-        {
-          if (text[i] == wxT('n'))
-          { new_line = TRUE; end_word = TRUE; i++; }
-          else
-          { word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; }
-        }
-        break;
-      }
-      case 10:
-      {
-        new_line = TRUE; end_word = TRUE; i++;
-        break;
-      }
-      case 13:
-      {
-        new_line = TRUE; end_word = TRUE; i++;
-      }
-      case wxT(' '):
-      {
-        end_word = TRUE;
-        i ++;
-        break;
-      }
-      default:
-      {
-        word[j] = text[i];
-        j ++; i ++;
-        break;
-      }
-    }
-    if (i == len) end_word = TRUE;
-    if (end_word)
-    {
-      word[j] = 0;
-      j = 0;
-      word_list.Add(word);
-      end_word = FALSE;
-    }
-    if (new_line)
-    {
-      word_list.Append(NULL);
-      new_line = FALSE;
-    }
-  }
-  // Now, make a list of strings which can fit in the box
-  wxStringList *string_list = new wxStringList;
-
-  wxString buffer;
-  wxNode *node = (wxNode*)word_list.GetFirst();
-  long x, y;
-
-  while (node)
-  {
-    wxString oldBuffer(buffer);
-
-    wxChar *s = (wxChar *)node->GetData();
-    if (!s)
-    {
-      // FORCE NEW LINE
-      if (buffer.Length() > 0)
-        string_list->Add(buffer);
-
-      buffer.Empty();
-    }
-    else
-    {
-      if (buffer.Length() != 0)
-        buffer += wxT(" ");
-
-      buffer += s;
-      dc.GetTextExtent(buffer, &x, &y);
-
-      // Don't fit within the bounding box if we're fitting shape to contents
-      if ((x > width) && !(formatMode & FORMAT_SIZE_TO_CONTENTS))
-      {
-        // Deal with first word being wider than box
-        if (oldBuffer.Length() > 0)
-          string_list->Add(oldBuffer);
-
-        buffer.Empty();
-        buffer += s;
-      }
-    }
-
-    node = node->GetNext();
-  }
-  if (buffer.Length() != 0)
-    string_list->Add(buffer);
-
-  return string_list;
-}
-
-void oglDrawFormattedText(wxDC& dc, wxList *text_list,
-                       double m_xpos, double m_ypos, double width, double height,
-                       int formatMode)
-{
-  double xoffset, yoffset;
-  if (formatMode & FORMAT_CENTRE_HORIZ)
-    xoffset = m_xpos;
-  else
-    xoffset = (double)(m_xpos - (width / 2.0));
-
-  if (formatMode & FORMAT_CENTRE_VERT)
-    yoffset = m_ypos;
-  else
-    yoffset = (double)(m_ypos - (height / 2.0));
-
-  dc.SetClippingRegion(
-                    (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
-                    (long)width, (long)height);
-
-  wxNode *current = text_list->GetFirst();
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
-    current = current->GetNext();
-  }
-
-  dc.DestroyClippingRegion();
-}
-
-/*
- * Find centroid given list of points comprising polyline
- *
- */
-
-void oglFindPolylineCentroid(wxList *points, double *x, double *y)
-{
-  double xcount = 0;
-  double ycount = 0;
-
-  wxNode *node = points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    xcount += point->x;
-    ycount += point->y;
-    node = node->GetNext();
-  }
-
-  *x = (xcount/points->GetCount());
-  *y = (ycount/points->GetCount());
-}
-
-/*
- * Check that (x1, y1) -> (x2, y2) hits (x3, y3) -> (x4, y4).
- * If so, ratio1 gives the proportion along the first line
- * that the intersection occurs (or something like that).
- * Used by functions below.
- *
- */
-void oglCheckLineIntersection(double x1, double y1, double x2, double y2,
-                             double x3, double y3, double x4, double y4,
-                             double *ratio1, double *ratio2)
-{
-  double denominator_term = (y4 - y3)*(x2 - x1) - (y2 - y1)*(x4 - x3);
-  double numerator_term = (x3 - x1)*(y4 - y3) + (x4 - x3)*(y1 - y3);
-
-  double line_constant;
-  double length_ratio = 1.0;
-  double k_line = 1.0;
-
-  // Check for parallel lines
-  if ((denominator_term < 0.005) && (denominator_term > -0.005))
-    line_constant = -1.0;
-  else
-    line_constant = numerator_term/denominator_term;
-
-  // Check for intersection
-  if ((line_constant < 1.0) && (line_constant > 0.0))
-  {
-    // Now must check that other line hits
-    if (((y4 - y3) < 0.005) && ((y4 - y3) > -0.005))
-      k_line = ((x1 - x3) + line_constant*(x2 - x1))/(x4 - x3);
-    else
-      k_line = ((y1 - y3) + line_constant*(y2 - y1))/(y4 - y3);
-
-    if ((k_line >= 0.0) && (k_line < 1.0))
-      length_ratio = line_constant;
-    else
-      k_line = 1.0;
-  }
-  *ratio1 = length_ratio;
-  *ratio2 = k_line;
-}
-
-/*
- * Find where (x1, y1) -> (x2, y2) hits one of the lines in xvec, yvec.
- * (*x3, *y3) is the point where it hits.
- *
- */
-void oglFindEndForPolyline(double n, double xvec[], double yvec[],
-                           double x1, double y1, double x2, double y2, double *x3, double *y3)
-{
-  int i;
-  double lastx = xvec[0];
-  double lasty = yvec[0];
-
-  double min_ratio = 1.0;
-  double line_ratio;
-  double other_ratio;
-
-  for (i = 1; i < n; i++)
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[i], yvec[i],
-                            &line_ratio, &other_ratio);
-    lastx = xvec[i];
-    lasty = yvec[i];
-
-    if (line_ratio < min_ratio)
-      min_ratio = line_ratio;
-  }
-
-  // Do last (implicit) line if last and first doubles are not identical
-  if (!(xvec[0] == lastx && yvec[0] == lasty))
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[0], yvec[0],
-                            &line_ratio, &other_ratio);
-
-    if (line_ratio < min_ratio)
-      min_ratio = line_ratio;
-  }
-
-  *x3 = (x1 + (x2 - x1)*min_ratio);
-  *y3 = (y1 + (y2 - y1)*min_ratio);
-
-}
-
-/*
- * Find where the line hits the box.
- *
- */
-
-void oglFindEndForBox(double width, double height,
-                      double x1, double y1,         // Centre of box (possibly)
-                      double x2, double y2,         // other end of line
-                      double *x3, double *y3)       // End on box edge
-{
-  double xvec[5];
-  double yvec[5];
-
-  xvec[0] = (double)(x1 - width/2.0);
-  yvec[0] = (double)(y1 - height/2.0);
-  xvec[1] = (double)(x1 - width/2.0);
-  yvec[1] = (double)(y1 + height/2.0);
-  xvec[2] = (double)(x1 + width/2.0);
-  yvec[2] = (double)(y1 + height/2.0);
-  xvec[3] = (double)(x1 + width/2.0);
-  yvec[3] = (double)(y1 - height/2.0);
-  xvec[4] = (double)(x1 - width/2.0);
-  yvec[4] = (double)(y1 - height/2.0);
-
-  oglFindEndForPolyline(5, xvec, yvec, x2, y2, x1, y1, x3, y3);
-}
-
-/*
- * Find where the line hits the circle.
- *
- */
-
-void oglFindEndForCircle(double radius,
-                         double x1, double y1,  // Centre of circle
-                         double x2, double y2,  // Other end of line
-                         double *x3, double *y3)
-{
-  double H = (double)sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-
-  if (H == 0.0)
-  {
-    *x3 = x1;
-    *y3 = y1;
-  }
-  else
-  {
-   *y3 = radius * (y2 - y1)/H + y1;
-   *x3 = radius * (x2 - x1)/H + x1;
-  }
-}
-
-/*
- * Given the line (x1, y1) -> (x2, y2), and an arrow size of given length and width,
- * return the position of the tip of the arrow and the left and right vertices of the arrow.
- *
- */
-
-void oglGetArrowPoints(double x1, double y1, double x2, double y2,
-                      double length, double width,
-                      double *tip_x, double *tip_y,
-                      double *side1_x, double *side1_y,
-                      double *side2_x, double *side2_y)
-{
-  double l = (double)sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-
-  if (l < 0.01)
-    l = (double) 0.01;
-
-  double i_bar = (x2 - x1)/l;
-  double j_bar = (y2 - y1)/l;
-
-  double x3 = (- length*i_bar) + x2;
-  double y3 = (- length*j_bar) + y2;
-
-  *side1_x = width*(-j_bar) + x3;
-  *side1_y = width*i_bar + y3;
-
-  *side2_x = -width*(-j_bar) + x3;
-  *side2_y = -width*i_bar + y3;
-
-  *tip_x = x2; *tip_y = y2;
-}
-
-/*
- * Given an ellipse and endpoints of a line, returns the point at which
- * the line touches the ellipse in values x4, y4.
- * This function assumes that the centre of the ellipse is at x1, y1, and the
- * ellipse has a width of width1 and a height of height1. It also assumes you are
- * wanting to draw an arc FROM point x2, y2 TOWARDS point x3, y3.
- * This function calculates the x,y coordinates of the intersection point of
- * the arc with the ellipse.
- * Author: Ian Harrison
- */
-
-void oglDrawArcToEllipse(double x1, double y1, double width1, double height1, double x2, double y2, double x3, double y3,
-  double *x4, double *y4)
-{
-  double a1 = (double)(width1/2.0);
-  double b1 = (double)(height1/2.0);
-
-  // These are required to give top left x and y coordinates for DrawEllipse
-//  double top_left_x1 = (double)(x1 - a1);
-//  double top_left_y1 = (double)(y1 - b1);
-/*
-  // Check for vertical line
-  if (fabs(x2 - x3) < 0.05)
-  {
-    *x4 = x3;
-    if (y2 < y3)
-      *y4 = (double)(y1 - b1);
-    else
-      *y4 = (double)(y1 + b1);
-    return;
-  }
-*/
-  // Check that x2 != x3
-  if (fabs(x2 - x3) < 0.05)
-  {
-    *x4 = x2;
-    if (y3 > y2)
-      *y4 = (double)(y1 - sqrt((b1*b1 - (((x2-x1)*(x2-x1))*(b1*b1)/(a1*a1)))));
-    else
-      *y4 = (double)(y1 + sqrt((b1*b1 - (((x2-x1)*(x2-x1))*(b1*b1)/(a1*a1)))));
-    return;
-  }
-
-  // Calculate the x and y coordinates of the point where arc intersects ellipse
-
-  double A, B, C, D, E, F, G, H, K;
-  double ellipse1_x, ellipse1_y;
-
-  A = (double)(1/(a1 * a1));
-  B = (double)((y3 - y2) * (y3 - y2)) / ((x3 - x2) * (x3 - x2) * b1 * b1);
-  C = (double)(2 * (y3 - y2) * (y2 - y1)) / ((x3 - x2) * b1 * b1);
-  D = (double)((y2 - y1) * (y2 - y1)) / (b1 * b1);
-  E = (double)(A + B);
-  F = (double)(C - (2 * A * x1) - (2 * B * x2));
-  G = (double)((A * x1 * x1) + (B * x2 * x2) - (C * x2) + D - 1);
-  H = (double)((y3 - y2) / (x3 - x2));
-  K = (double)((F * F) - (4 * E * G));
-
-  if (K >= 0)
-  // In this case the line intersects the ellipse, so calculate intersection
-  {
-    if(x2 >= x1)
-    {
-      ellipse1_x = (double)(((F * -1) + sqrt(K)) / (2 * E));
-      ellipse1_y = (double)((H * (ellipse1_x - x2)) + y2);
-    }
-    else
-    {
-      ellipse1_x = (double)(((F * -1) -  sqrt(K)) / (2 * E));
-      ellipse1_y = (double)((H * (ellipse1_x - x2)) + y2);
-    }
-  }
-  else
-  // in this case, arc does not intersect ellipse, so just draw arc
-  {
-    ellipse1_x = x3;
-    ellipse1_y = y3;
-  }
-  *x4 = ellipse1_x;
-  *y4 = ellipse1_y;
-
-/*
-  // Draw a little circle (radius = 2) at the end of the arc where it hits
-  // the ellipse .
-
-  double circle_x = ellipse1_x - 2.0;
-  double circle_y = ellipse1_y - 2.0;
-  m_canvas->DrawEllipse(circle_x, circle_y, 4.0, 4.0);
-*/
-}
-
-// Update a list item from a list of strings
-void UpdateListBox(wxListBox *item, wxList *list)
-{
-  item->Clear();
-  if (!list)
-    return;
-
-  wxNode *node = list->GetFirst();
-  while (node)
-  {
-    wxChar *s = (wxChar *)node->GetData();
-    item->Append(s);
-    node = node->GetNext();
-  }
-}
-
-bool oglRoughlyEqual(double val1, double val2, double tol)
-{
-    return ( (val1 < (val2 + tol)) && (val1 > (val2 - tol)) &&
-             (val2 < (val1 + tol)) && (val2 > (val1 - tol)));
-}
-
-/*
- * Hex<->Dec conversion
- */
-
-// Array used in DecToHex conversion routine.
-static wxChar sg_HexArray[] = { wxT('0'), wxT('1'), wxT('2'), wxT('3'),
-                                wxT('4'), wxT('5'), wxT('6'), wxT('7'),
-                                wxT('8'), wxT('9'), wxT('A'), wxT('B'),
-                                wxT('C'), wxT('D'), wxT('E'), wxT('F')
-};
-
-// Convert 2-digit hex number to decimal
-unsigned int oglHexToDec(wxChar* buf)
-{
-  int firstDigit, secondDigit;
-
-  if (buf[0] >= wxT('A'))
-    firstDigit = buf[0] - wxT('A') + 10;
-  else
-    firstDigit = buf[0] - wxT('0');
-
-  if (buf[1] >= wxT('A'))
-    secondDigit = buf[1] - wxT('A') + 10;
-  else
-    secondDigit = buf[1] - wxT('0');
-
-  return firstDigit * 16 + secondDigit;
-}
-
-// Convert decimal integer to 2-character hex string
-void oglDecToHex(unsigned int dec, wxChar *buf)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = sg_HexArray[firstDigit];
-    buf[1] = sg_HexArray[secondDigit];
-    buf[2] = 0;
-}
-
-// 3-digit hex to wxColour
-wxColour oglHexToColour(const wxString& hex)
-{
-    if (hex.Length() == 6)
-    {
-        long r, g, b;
-        r = g = b = 0;
-        hex.Mid(0,2).ToLong(&r, 16);
-        hex.Mid(2,2).ToLong(&g, 16);
-        hex.Mid(4,2).ToLong(&b, 16);
-        return wxColour(r, g, b);
-    }
-    else
-        return wxColour(0,0,0);
-}
-
-// RGB to 3-digit hex
-wxString oglColourToHex(const wxColour& colour)
-{
-    wxChar buf[7];
-    unsigned int red = colour.Red();
-    unsigned int green = colour.Green();
-    unsigned int blue = colour.Blue();
-
-    oglDecToHex(red, buf);
-    oglDecToHex(green, buf+2);
-    oglDecToHex(blue, buf+4);
-
-    return wxString(buf);
-}
-
-
diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index fa1139bfdd..d9deae4921 100644
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index 07ea533e2f..47c140bc95 100644
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/types.h>
 
@@ -229,7 +231,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
 
     if (current_width > max_width)
       max_width = current_width;
-    current = current->Next();
+    current = current->GetNext();
     i ++;
   }
 
@@ -277,7 +279,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - xOffset ); line->SetY( y - yOffset );
-    current = current->Next();
+    current = current->GetNext();
     i ++;
   }
 
@@ -312,7 +314,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
 
     if (current_width > max_width)
       max_width = current_width;
-    current = current->Next();
+    current = current->GetNext();
     i ++;
   }
 
@@ -333,7 +335,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
-    current = current->Next();
+    current = current->GetNext();
     i ++;
   }
   delete widths;
@@ -367,7 +369,7 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
 
     if (current_width > max_width)
       max_width = current_width;
-    current = current->Next();
+    current = current->GetNext();
     i ++;
   }
 
@@ -445,7 +447,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
 
   char buffer[400];
   buffer[0] = 0;
-  wxNode *node = word_list.First();
+  wxStringListNode *node = word_list.GetFirst();
   long x, y;
 
   while (node)
@@ -481,7 +483,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
       }
     }
 
-    node = node->Next();
+    node = node->GetNext();
   }
   if (buffer[0] != 0)
     string_list->Add(buffer);
@@ -514,7 +516,7 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
     wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
 
     dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
-    current = current->Next();
+    current = current->GetNext();
   }
 
   dc.DestroyClippingRegion();
@@ -536,7 +538,7 @@ void oglFindPolylineCentroid(wxList *points, double *x, double *y)
     wxRealPoint *point = (wxRealPoint *)node->GetData();
     xcount += point->x;
     ycount += point->y;
-    node = node->Next();
+    node = node->GetNext();
   }
 
   *x = (xcount/points->GetCount());
@@ -813,7 +815,7 @@ void UpdateListBox(wxListBox *item, wxList *list)
   {
     char *s = (char *)node->GetData();
     item->Append(s);
-    node = node->Next();
+    node = node->GetNext();
   }
 }