Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bakefile for the OGL contrib

Browse Source 
Changed use of deprecated methods in OGL to new methods

Changes to allow OGL to be built without the deprecated wxExpr (again)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:09:34 +00:00
parent 52fcf3b1bd
commit fd657b8a59
21 changed files with 2348 additions and 2741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
Makefile.in
View File

@@ -265,7 +265,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_UNIX_1@ wx/unix/gsockunx.h wx/unix/mimetype.h @COND_PLATFORM_UNIX_1@ wx/unix/gsockunx.h wx/unix/mimetype.h
@COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = \ @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/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_COCOA@BASE_PLATFORM_HDR =
@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = @COND_TOOLKIT_MAC@BASE_PLATFORM_HDR =
@COND_DEPS_TRACKING_0@CCC = $(CC) @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_basemsw.o monodll_dde.o monodll_dir.o \
@COND_PLATFORM_WIN32_1@ monodll_mimetype.o monodll_regconf.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_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_PLATFORM_SRC_OBJECTS_1 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_1) @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_1)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_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_basemsw.o monolib_dde.o monolib_dir.o \
@COND_PLATFORM_WIN32_1@ monolib_mimetype.o monolib_regconf.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_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_PLATFORM_SRC_OBJECTS_2 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_2) @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_2)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_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_basemsw.o basedll_dde.o basedll_dir.o \
@COND_PLATFORM_WIN32_1@ basedll_mimetype.o basedll_regconf.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_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_PLATFORM_SRC_OBJECTS_3 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_3) @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_3)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_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_basemsw.o baselib_dde.o baselib_dir.o \
@COND_PLATFORM_WIN32_1@ baselib_mimetype.o baselib_regconf.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_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@__CORE_SRC_OBJECTS = \
@COND_USE_GUI_1_WXUNIV_0@ $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_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_selstore.o monodll_busyinfo.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_calctrl.o monodll_choicdgg.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_dcbuffer.o monodll_dcpsg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dirctrlg.o monodll_grid.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_dirctrlg.o monodll_dragimgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gridctrl.o monodll_gridsel.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_grid.o monodll_gridctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_laywin.o monodll_logg.o monodll_numdlgg.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_gridsel.o monodll_laywin.o monodll_logg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_panelg.o monodll_progdlgg.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_numdlgg.o monodll_panelg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_sashwin.o monodll_scrlwing.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_progdlgg.o monodll_sashwin.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_spinctlg.o monodll_splash.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_scrlwing.o monodll_spinctlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_splitter.o monodll_tbarsmpl.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_splash.o monodll_splitter.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_textdlgg.o monodll_tipdlg.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_tbarsmpl.o monodll_textdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tipwin.o monodll_treectlg.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_tipdlg.o monodll_tipwin.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_vlbox.o monodll_vscroll.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_treectlg.o monodll_vlbox.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_wizard.o monodll_appcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_vscroll.o monodll_wizard.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fontmap.o monodll_accesscmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_appcmn.o monodll_fontmap.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_artprov.o monodll_artstd.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_accesscmn.o monodll_artprov.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_bmpbase.o monodll_choiccmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_artstd.o monodll_bmpbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_clipcmn.o monodll_cmdproc.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_choiccmn.o monodll_clipcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_cmndata.o monodll_containr.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_cmdproc.o monodll_cmndata.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_cshelp.o monodll_ctrlcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_containr.o monodll_cshelp.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_ctrlsub.o monodll_datacmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_ctrlcmn.o monodll_ctrlsub.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dbgrid.o monodll_dcbase.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_datacmn.o monodll_dbgrid.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dlgcmn.o monodll_dndcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_dcbase.o monodll_dlgcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dobjcmn.o monodll_docmdi.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_dndcmn.o monodll_dobjcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_docview.o monodll_dpycmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_docmdi.o monodll_docview.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dseldlg.o monodll_effects.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_dpycmn.o monodll_dseldlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fddlgcmn.o monodll_fldlgcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_effects.o monodll_fddlgcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fontcmn.o monodll_framecmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_fldlgcmn.o monodll_fontcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_timercmn.o monodll_toplvcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_framecmn.o monodll_timercmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gaugecmn.o monodll_gdicmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_toplvcmn.o monodll_gaugecmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_geometry.o monodll_gifdecod.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_gdicmn.o monodll_geometry.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_helpbase.o monodll_iconbndl.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_gifdecod.o monodll_helpbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagall.o monodll_imagbmp.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_iconbndl.o monodll_imagall.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_image.o monodll_imaggif.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imagbmp.o monodll_image.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagiff.o monodll_imagjpeg.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imaggif.o monodll_imagiff.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagpcx.o monodll_imagpng.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imagjpeg.o monodll_imagpcx.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagpnm.o monodll_imagtiff.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imagpng.o monodll_imagpnm.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagxpm.o monodll_imagfill.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imagtiff.o monodll_imagxpm.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_layout.o monodll_lboxcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_imagfill.o monodll_layout.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_matrix.o monodll_menucmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_lboxcmn.o monodll_matrix.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_nbkbase.o monodll_paper.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_menucmn.o monodll_nbkbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_popupcmn.o monodll_prntbase.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_paper.o monodll_popupcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_quantize.o monodll_radiocmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_prntbase.o monodll_quantize.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_rgncmn.o monodll_settcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_radiocmn.o monodll_rgncmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_sizer.o monodll_statbar.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_settcmn.o monodll_sizer.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tbarbase.o monodll_textcmn.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_statbar.o monodll_tbarbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_treebase.o monodll_valgen.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_textcmn.o monodll_treebase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_validate.o monodll_valtext.o \ @COND_USE_GUI_1_WXUNIV_0@ monodll_valgen.o monodll_validate.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_wincmn.o monodll_xpmdecod.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@__CORE_SRC_OBJECTS = \
@COND_USE_GUI_1_WXUNIV_1@ $(__LOWLEVEL_SRC_OBJECTS) \ @COND_USE_GUI_1_WXUNIV_1@ $(__LOWLEVEL_SRC_OBJECTS) \
@COND_USE_GUI_1_WXUNIV_1@ $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o \ @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_metal.o monodll_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_busyinfo.o monodll_calctrl.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_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_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_laywin.o monodll_logg.o monodll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_panelg.o monodll_progdlgg.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@ $(__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_busyinfo.o monolib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_choicdgg.o monolib_dcbuffer.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_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_laywin.o monolib_logg.o monolib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_panelg.o monolib_progdlgg.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_metal.o monolib_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_busyinfo.o monolib_calctrl.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_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_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_laywin.o monolib_logg.o monolib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_panelg.o monolib_progdlgg.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@ $(__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_busyinfo.o coredll_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_choicdgg.o coredll_dcbuffer.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_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_laywin.o coredll_logg.o coredll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_panelg.o coredll_progdlgg.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_metal.o coredll_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_busyinfo.o coredll_calctrl.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_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_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_laywin.o coredll_logg.o coredll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_panelg.o coredll_progdlgg.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@ $(__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_busyinfo.o corelib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_choicdgg.o corelib_dcbuffer.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_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_laywin.o corelib_logg.o corelib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_panelg.o corelib_progdlgg.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_metal.o corelib_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_busyinfo.o corelib_calctrl.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_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_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_laywin.o corelib_logg.o corelib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_panelg.o corelib_progdlgg.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 basedll_config.o: $(srcdir)/src/common/config.cpp
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(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 basedll_datetime.o: $(srcdir)/src/common/datetime.cpp
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(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 baselib_config.o: $(srcdir)/src/common/config.cpp
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< $(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 baselib_datetime.o: $(srcdir)/src/common/datetime.cpp
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< $(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 coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< $(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@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @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 corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< $(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@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @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@monodll_control.o: $(srcdir)/src/os2/control.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @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@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @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 monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< $(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@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @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@monolib_control.o: $(srcdir)/src/os2/control.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @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@monolib_cshelp.o: $(srcdir)/src/common/cshelp.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @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 monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(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@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

2783
build/bakefiles/Makefile
View File

File diff suppressed because it is too large Load Diff

784
build/makefile.bcc
View File

@@ -325,52 +325,53 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \
$(OBJS)\monolib_busyinfo.obj $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_busyinfo.obj $(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj \
$(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj \
$(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj \ $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj \ $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj \
$(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj \
$(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj \
$(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj \
$(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj \ $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj \
$(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj \
$(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj \ $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj \
$(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj \
$(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj \
$(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj \ $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj \
$(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj \ $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj \
$(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj \ $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj \
$(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj \ $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj \
$(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj \ $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj \
$(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj \
$(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj \
$(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj \ $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj \
$(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj \
$(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj \ $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj \
$(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj \
$(OBJS)\monolib_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = $(OBJS)\monolib_app.obj \ ____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_busyinfo.obj $(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_choicdgg.obj $(OBJS)\monolib_dcbuffer.obj \
$(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dcpsg.obj $(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_grid.obj $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_dragimgg.obj $(OBJS)\monolib_grid.obj \
$(OBJS)\monolib_gridsel.obj $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_gridctrl.obj $(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_logg.obj $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_laywin.obj $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_panelg.obj $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_numdlgg.obj $(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_sashwin.obj $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_progdlgg.obj $(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_spinctlg.obj $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_scrlwing.obj $(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_splash.obj $(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tbarsmpl.obj $(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_tipdlg.obj $(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_vlbox.obj $(OBJS)\monolib_vscroll.obj \ $(OBJS)\monolib_treectlg.obj $(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_wizard.obj $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_vscroll.obj $(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_fontmap.obj $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj $(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_artprov.obj $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_accesscmn.obj $(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_bmpbase.obj $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_artstd.obj $(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_clipcmn.obj $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_choiccmn.obj $(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_cmndata.obj $(OBJS)\monolib_containr.obj \ $(OBJS)\monolib_cmdproc.obj $(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_cshelp.obj $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_containr.obj $(OBJS)\monolib_cshelp.obj \
$(OBJS)\monolib_ctrlsub.obj $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_ctrlcmn.obj $(OBJS)\monolib_ctrlsub.obj \
$(OBJS)\monolib_dbgrid.obj $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_datacmn.obj $(OBJS)\monolib_dbgrid.obj \
$(OBJS)\monolib_dlgcmn.obj $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dcbase.obj $(OBJS)\monolib_dlgcmn.obj \
$(OBJS)\monolib_dobjcmn.obj $(OBJS)\monolib_docmdi.obj \ $(OBJS)\monolib_dndcmn.obj $(OBJS)\monolib_dobjcmn.obj \
$(OBJS)\monolib_docview.obj $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_docmdi.obj $(OBJS)\monolib_docview.obj \
$(OBJS)\monolib_dseldlg.obj $(OBJS)\monolib_effects.obj \ $(OBJS)\monolib_dpycmn.obj $(OBJS)\monolib_dseldlg.obj \
$(OBJS)\monolib_fddlgcmn.obj $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_effects.obj $(OBJS)\monolib_fddlgcmn.obj \
$(OBJS)\monolib_fontcmn.obj $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_fldlgcmn.obj $(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_timercmn.obj $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_framecmn.obj $(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_gaugecmn.obj $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_toplvcmn.obj $(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_geometry.obj $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_gdicmn.obj $(OBJS)\monolib_geometry.obj \
$(OBJS)\monolib_helpbase.obj $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_gifdecod.obj $(OBJS)\monolib_helpbase.obj \
$(OBJS)\monolib_imagall.obj $(OBJS)\monolib_imagbmp.obj \ $(OBJS)\monolib_iconbndl.obj $(OBJS)\monolib_imagall.obj \
$(OBJS)\monolib_image.obj $(OBJS)\monolib_imaggif.obj \ $(OBJS)\monolib_imagbmp.obj $(OBJS)\monolib_image.obj \
$(OBJS)\monolib_imagiff.obj $(OBJS)\monolib_imagjpeg.obj \ $(OBJS)\monolib_imaggif.obj $(OBJS)\monolib_imagiff.obj \
$(OBJS)\monolib_imagpcx.obj $(OBJS)\monolib_imagpng.obj \ $(OBJS)\monolib_imagjpeg.obj $(OBJS)\monolib_imagpcx.obj \
$(OBJS)\monolib_imagpnm.obj $(OBJS)\monolib_imagtiff.obj \ $(OBJS)\monolib_imagpng.obj $(OBJS)\monolib_imagpnm.obj \
$(OBJS)\monolib_imagxpm.obj $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_imagtiff.obj $(OBJS)\monolib_imagxpm.obj \
$(OBJS)\monolib_layout.obj $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_imagfill.obj $(OBJS)\monolib_layout.obj \
$(OBJS)\monolib_matrix.obj $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_lboxcmn.obj $(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_nbkbase.obj $(OBJS)\monolib_paper.obj \ $(OBJS)\monolib_menucmn.obj $(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_popupcmn.obj $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_paper.obj $(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_quantize.obj $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_prntbase.obj $(OBJS)\monolib_quantize.obj \
$(OBJS)\monolib_rgncmn.obj $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_radiocmn.obj $(OBJS)\monolib_rgncmn.obj \
$(OBJS)\monolib_sizer.obj $(OBJS)\monolib_statbar.obj \ $(OBJS)\monolib_settcmn.obj $(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_tbarbase.obj $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_statbar.obj $(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_treebase.obj $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_textcmn.obj $(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_validate.obj $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_valgen.obj $(OBJS)\monolib_validate.obj \
$(OBJS)\monolib_wincmn.obj $(OBJS)\monolib_xpmdecod.obj $(OBJS)\monolib_valtext.obj $(OBJS)\monolib_wincmn.obj \
$(OBJS)\monolib_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \ ____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_busyinfo.obj $(OBJS)\coredll_calctrl.obj \
$(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj \
$(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj \ $(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj \
$(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj \
$(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
$(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj \ $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj \
$(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj \ $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj \
$(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj \
$(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj \
$(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj \
$(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj \ $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj \
$(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj \
$(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj \ $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj \
$(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj \
$(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj \
$(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj \ $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj \
$(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj \ $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj \
$(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj \ $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj \
$(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj \ $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj \
$(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj \ $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj \
$(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj \
$(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj \
$(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj \ $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj \
$(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj \
$(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj \ $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj \
$(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj \
$(OBJS)\coredll_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = $(OBJS)\coredll_app.obj \ ____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_busyinfo.obj $(OBJS)\coredll_calctrl.obj \
$(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_choicdgg.obj $(OBJS)\coredll_dcbuffer.obj \
$(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dcpsg.obj $(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_grid.obj $(OBJS)\coredll_gridctrl.obj \ $(OBJS)\coredll_dragimgg.obj $(OBJS)\coredll_grid.obj \
$(OBJS)\coredll_gridsel.obj $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_gridctrl.obj $(OBJS)\coredll_gridsel.obj \
$(OBJS)\coredll_logg.obj $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_laywin.obj $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_panelg.obj $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_numdlgg.obj $(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_sashwin.obj $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_progdlgg.obj $(OBJS)\coredll_sashwin.obj \
$(OBJS)\coredll_spinctlg.obj $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_scrlwing.obj $(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_splash.obj $(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tbarsmpl.obj $(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_tipdlg.obj $(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_vlbox.obj $(OBJS)\coredll_vscroll.obj \ $(OBJS)\coredll_treectlg.obj $(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_wizard.obj $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_vscroll.obj $(OBJS)\coredll_wizard.obj \
$(OBJS)\coredll_fontmap.obj $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj $(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_artprov.obj $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_accesscmn.obj $(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_bmpbase.obj $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_artstd.obj $(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_clipcmn.obj $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_choiccmn.obj $(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_cmndata.obj $(OBJS)\coredll_containr.obj \ $(OBJS)\coredll_cmdproc.obj $(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_cshelp.obj $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_containr.obj $(OBJS)\coredll_cshelp.obj \
$(OBJS)\coredll_ctrlsub.obj $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_ctrlcmn.obj $(OBJS)\coredll_ctrlsub.obj \
$(OBJS)\coredll_dbgrid.obj $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_datacmn.obj $(OBJS)\coredll_dbgrid.obj \
$(OBJS)\coredll_dlgcmn.obj $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dcbase.obj $(OBJS)\coredll_dlgcmn.obj \
$(OBJS)\coredll_dobjcmn.obj $(OBJS)\coredll_docmdi.obj \ $(OBJS)\coredll_dndcmn.obj $(OBJS)\coredll_dobjcmn.obj \
$(OBJS)\coredll_docview.obj $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_docmdi.obj $(OBJS)\coredll_docview.obj \
$(OBJS)\coredll_dseldlg.obj $(OBJS)\coredll_effects.obj \ $(OBJS)\coredll_dpycmn.obj $(OBJS)\coredll_dseldlg.obj \
$(OBJS)\coredll_fddlgcmn.obj $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_effects.obj $(OBJS)\coredll_fddlgcmn.obj \
$(OBJS)\coredll_fontcmn.obj $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_fldlgcmn.obj $(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_timercmn.obj $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_framecmn.obj $(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_gaugecmn.obj $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_toplvcmn.obj $(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_geometry.obj $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_gdicmn.obj $(OBJS)\coredll_geometry.obj \
$(OBJS)\coredll_helpbase.obj $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_gifdecod.obj $(OBJS)\coredll_helpbase.obj \
$(OBJS)\coredll_imagall.obj $(OBJS)\coredll_imagbmp.obj \ $(OBJS)\coredll_iconbndl.obj $(OBJS)\coredll_imagall.obj \
$(OBJS)\coredll_image.obj $(OBJS)\coredll_imaggif.obj \ $(OBJS)\coredll_imagbmp.obj $(OBJS)\coredll_image.obj \
$(OBJS)\coredll_imagiff.obj $(OBJS)\coredll_imagjpeg.obj \ $(OBJS)\coredll_imaggif.obj $(OBJS)\coredll_imagiff.obj \
$(OBJS)\coredll_imagpcx.obj $(OBJS)\coredll_imagpng.obj \ $(OBJS)\coredll_imagjpeg.obj $(OBJS)\coredll_imagpcx.obj \
$(OBJS)\coredll_imagpnm.obj $(OBJS)\coredll_imagtiff.obj \ $(OBJS)\coredll_imagpng.obj $(OBJS)\coredll_imagpnm.obj \
$(OBJS)\coredll_imagxpm.obj $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_imagtiff.obj $(OBJS)\coredll_imagxpm.obj \
$(OBJS)\coredll_layout.obj $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_imagfill.obj $(OBJS)\coredll_layout.obj \
$(OBJS)\coredll_matrix.obj $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_lboxcmn.obj $(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_nbkbase.obj $(OBJS)\coredll_paper.obj \ $(OBJS)\coredll_menucmn.obj $(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_popupcmn.obj $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_paper.obj $(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_quantize.obj $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_prntbase.obj $(OBJS)\coredll_quantize.obj \
$(OBJS)\coredll_rgncmn.obj $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_radiocmn.obj $(OBJS)\coredll_rgncmn.obj \
$(OBJS)\coredll_sizer.obj $(OBJS)\coredll_statbar.obj \ $(OBJS)\coredll_settcmn.obj $(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_tbarbase.obj $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_statbar.obj $(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_treebase.obj $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_textcmn.obj $(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_validate.obj $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_valgen.obj $(OBJS)\coredll_validate.obj \
$(OBJS)\coredll_wincmn.obj $(OBJS)\coredll_xpmdecod.obj $(OBJS)\coredll_valtext.obj $(OBJS)\coredll_wincmn.obj \
$(OBJS)\coredll_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj \ ____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_busyinfo.obj $(OBJS)\corelib_calctrl.obj \
$(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj \
$(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj \ $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj \
$(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj \
$(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
$(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj \ $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj \
$(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj \ $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
$(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj \
$(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj \
$(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj \
$(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj \ $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj \
$(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
$(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj \ $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
$(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj \
$(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
$(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj \ $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
$(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj \ $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
$(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj \ $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
$(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj \ $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
$(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj \ $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj \
$(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj \
$(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj \
$(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj \ $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
$(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
$(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj \ $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj \
$(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj \
$(OBJS)\corelib_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = $(OBJS)\corelib_app.obj \ ____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_busyinfo.obj $(OBJS)\corelib_calctrl.obj \
$(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_choicdgg.obj $(OBJS)\corelib_dcbuffer.obj \
$(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dcpsg.obj $(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_grid.obj $(OBJS)\corelib_gridctrl.obj \ $(OBJS)\corelib_dragimgg.obj $(OBJS)\corelib_grid.obj \
$(OBJS)\corelib_gridsel.obj $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_gridctrl.obj $(OBJS)\corelib_gridsel.obj \
$(OBJS)\corelib_logg.obj $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_laywin.obj $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_panelg.obj $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_numdlgg.obj $(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_sashwin.obj $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_progdlgg.obj $(OBJS)\corelib_sashwin.obj \
$(OBJS)\corelib_spinctlg.obj $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_scrlwing.obj $(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_splash.obj $(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tbarsmpl.obj $(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_tipdlg.obj $(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_vlbox.obj $(OBJS)\corelib_vscroll.obj \ $(OBJS)\corelib_treectlg.obj $(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_wizard.obj $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_vscroll.obj $(OBJS)\corelib_wizard.obj \
$(OBJS)\corelib_fontmap.obj $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj $(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_artprov.obj $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_accesscmn.obj $(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_bmpbase.obj $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_artstd.obj $(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_clipcmn.obj $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_choiccmn.obj $(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_cmndata.obj $(OBJS)\corelib_containr.obj \ $(OBJS)\corelib_cmdproc.obj $(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_cshelp.obj $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_containr.obj $(OBJS)\corelib_cshelp.obj \
$(OBJS)\corelib_ctrlsub.obj $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_ctrlcmn.obj $(OBJS)\corelib_ctrlsub.obj \
$(OBJS)\corelib_dbgrid.obj $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_datacmn.obj $(OBJS)\corelib_dbgrid.obj \
$(OBJS)\corelib_dlgcmn.obj $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dcbase.obj $(OBJS)\corelib_dlgcmn.obj \
$(OBJS)\corelib_dobjcmn.obj $(OBJS)\corelib_docmdi.obj \ $(OBJS)\corelib_dndcmn.obj $(OBJS)\corelib_dobjcmn.obj \
$(OBJS)\corelib_docview.obj $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_docmdi.obj $(OBJS)\corelib_docview.obj \
$(OBJS)\corelib_dseldlg.obj $(OBJS)\corelib_effects.obj \ $(OBJS)\corelib_dpycmn.obj $(OBJS)\corelib_dseldlg.obj \
$(OBJS)\corelib_fddlgcmn.obj $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_effects.obj $(OBJS)\corelib_fddlgcmn.obj \
$(OBJS)\corelib_fontcmn.obj $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_fldlgcmn.obj $(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_timercmn.obj $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_framecmn.obj $(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_gaugecmn.obj $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_toplvcmn.obj $(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_geometry.obj $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_gdicmn.obj $(OBJS)\corelib_geometry.obj \
$(OBJS)\corelib_helpbase.obj $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_gifdecod.obj $(OBJS)\corelib_helpbase.obj \
$(OBJS)\corelib_imagall.obj $(OBJS)\corelib_imagbmp.obj \ $(OBJS)\corelib_iconbndl.obj $(OBJS)\corelib_imagall.obj \
$(OBJS)\corelib_image.obj $(OBJS)\corelib_imaggif.obj \ $(OBJS)\corelib_imagbmp.obj $(OBJS)\corelib_image.obj \
$(OBJS)\corelib_imagiff.obj $(OBJS)\corelib_imagjpeg.obj \ $(OBJS)\corelib_imaggif.obj $(OBJS)\corelib_imagiff.obj \
$(OBJS)\corelib_imagpcx.obj $(OBJS)\corelib_imagpng.obj \ $(OBJS)\corelib_imagjpeg.obj $(OBJS)\corelib_imagpcx.obj \
$(OBJS)\corelib_imagpnm.obj $(OBJS)\corelib_imagtiff.obj \ $(OBJS)\corelib_imagpng.obj $(OBJS)\corelib_imagpnm.obj \
$(OBJS)\corelib_imagxpm.obj $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_imagtiff.obj $(OBJS)\corelib_imagxpm.obj \
$(OBJS)\corelib_layout.obj $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_imagfill.obj $(OBJS)\corelib_layout.obj \
$(OBJS)\corelib_matrix.obj $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_lboxcmn.obj $(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_nbkbase.obj $(OBJS)\corelib_paper.obj \ $(OBJS)\corelib_menucmn.obj $(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_popupcmn.obj $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_paper.obj $(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_quantize.obj $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_prntbase.obj $(OBJS)\corelib_quantize.obj \
$(OBJS)\corelib_rgncmn.obj $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_radiocmn.obj $(OBJS)\corelib_rgncmn.obj \
$(OBJS)\corelib_sizer.obj $(OBJS)\corelib_statbar.obj \ $(OBJS)\corelib_settcmn.obj $(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_tbarbase.obj $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_statbar.obj $(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_treebase.obj $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_textcmn.obj $(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_validate.obj $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_valgen.obj $(OBJS)\corelib_validate.obj \
$(OBJS)\corelib_wincmn.obj $(OBJS)\corelib_xpmdecod.obj $(OBJS)\corelib_valtext.obj $(OBJS)\corelib_wincmn.obj \
$(OBJS)\corelib_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj \ ____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_busyinfo.obj $(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj \
$(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj \
$(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj \ $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj \ $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
$(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
$(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
$(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
$(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj \ $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
$(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
$(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj \ $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
$(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj \
$(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
$(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj \ $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
$(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj \ $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
$(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj \ $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
$(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj \ $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
$(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj \ $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
$(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
$(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
$(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj \ $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
$(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
$(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj \ $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj \
$(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj \
$(OBJS)\monodll_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = $(OBJS)\monodll_app.obj \ ____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_busyinfo.obj $(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_choicdgg.obj $(OBJS)\monodll_dcbuffer.obj \
$(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dcpsg.obj $(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_grid.obj $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_dragimgg.obj $(OBJS)\monodll_grid.obj \
$(OBJS)\monodll_gridsel.obj $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_gridctrl.obj $(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_logg.obj $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_laywin.obj $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_panelg.obj $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_numdlgg.obj $(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_sashwin.obj $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_progdlgg.obj $(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_spinctlg.obj $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_scrlwing.obj $(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_splash.obj $(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tbarsmpl.obj $(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_tipdlg.obj $(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_vlbox.obj $(OBJS)\monodll_vscroll.obj \ $(OBJS)\monodll_treectlg.obj $(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_wizard.obj $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_vscroll.obj $(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_fontmap.obj $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj $(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_artprov.obj $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_accesscmn.obj $(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_bmpbase.obj $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_artstd.obj $(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_clipcmn.obj $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_choiccmn.obj $(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_cmndata.obj $(OBJS)\monodll_containr.obj \ $(OBJS)\monodll_cmdproc.obj $(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_cshelp.obj $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_containr.obj $(OBJS)\monodll_cshelp.obj \
$(OBJS)\monodll_ctrlsub.obj $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_ctrlcmn.obj $(OBJS)\monodll_ctrlsub.obj \
$(OBJS)\monodll_dbgrid.obj $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_datacmn.obj $(OBJS)\monodll_dbgrid.obj \
$(OBJS)\monodll_dlgcmn.obj $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dcbase.obj $(OBJS)\monodll_dlgcmn.obj \
$(OBJS)\monodll_dobjcmn.obj $(OBJS)\monodll_docmdi.obj \ $(OBJS)\monodll_dndcmn.obj $(OBJS)\monodll_dobjcmn.obj \
$(OBJS)\monodll_docview.obj $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_docmdi.obj $(OBJS)\monodll_docview.obj \
$(OBJS)\monodll_dseldlg.obj $(OBJS)\monodll_effects.obj \ $(OBJS)\monodll_dpycmn.obj $(OBJS)\monodll_dseldlg.obj \
$(OBJS)\monodll_fddlgcmn.obj $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_effects.obj $(OBJS)\monodll_fddlgcmn.obj \
$(OBJS)\monodll_fontcmn.obj $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_fldlgcmn.obj $(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_timercmn.obj $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_framecmn.obj $(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_gaugecmn.obj $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_toplvcmn.obj $(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_geometry.obj $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_gdicmn.obj $(OBJS)\monodll_geometry.obj \
$(OBJS)\monodll_helpbase.obj $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_gifdecod.obj $(OBJS)\monodll_helpbase.obj \
$(OBJS)\monodll_imagall.obj $(OBJS)\monodll_imagbmp.obj \ $(OBJS)\monodll_iconbndl.obj $(OBJS)\monodll_imagall.obj \
$(OBJS)\monodll_image.obj $(OBJS)\monodll_imaggif.obj \ $(OBJS)\monodll_imagbmp.obj $(OBJS)\monodll_image.obj \
$(OBJS)\monodll_imagiff.obj $(OBJS)\monodll_imagjpeg.obj \ $(OBJS)\monodll_imaggif.obj $(OBJS)\monodll_imagiff.obj \
$(OBJS)\monodll_imagpcx.obj $(OBJS)\monodll_imagpng.obj \ $(OBJS)\monodll_imagjpeg.obj $(OBJS)\monodll_imagpcx.obj \
$(OBJS)\monodll_imagpnm.obj $(OBJS)\monodll_imagtiff.obj \ $(OBJS)\monodll_imagpng.obj $(OBJS)\monodll_imagpnm.obj \
$(OBJS)\monodll_imagxpm.obj $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_imagtiff.obj $(OBJS)\monodll_imagxpm.obj \
$(OBJS)\monodll_layout.obj $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_imagfill.obj $(OBJS)\monodll_layout.obj \
$(OBJS)\monodll_matrix.obj $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_lboxcmn.obj $(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_nbkbase.obj $(OBJS)\monodll_paper.obj \ $(OBJS)\monodll_menucmn.obj $(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_popupcmn.obj $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_paper.obj $(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_quantize.obj $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_prntbase.obj $(OBJS)\monodll_quantize.obj \
$(OBJS)\monodll_rgncmn.obj $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_radiocmn.obj $(OBJS)\monodll_rgncmn.obj \
$(OBJS)\monodll_sizer.obj $(OBJS)\monodll_statbar.obj \ $(OBJS)\monodll_settcmn.obj $(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_tbarbase.obj $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_statbar.obj $(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_treebase.obj $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_textcmn.obj $(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_validate.obj $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_valgen.obj $(OBJS)\monodll_validate.obj \
$(OBJS)\monodll_wincmn.obj $(OBJS)\monodll_xpmdecod.obj $(OBJS)\monodll_valtext.obj $(OBJS)\monodll_wincmn.obj \
$(OBJS)\monodll_xpmdecod.obj
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ ____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 $(OBJS)\coredll_dragimag.obj: ..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(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" !if "$(USE_GUI)" == "1"
$(OBJS)\coredll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp $(OBJS)\coredll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(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 $(OBJS)\corelib_dragimag.obj: ..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(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" !if "$(USE_GUI)" == "1"
$(OBJS)\corelib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp $(OBJS)\corelib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(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 $(OBJS)\monodll_dragimag.obj: ..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(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" !if "$(USE_GUI)" == "1"
$(OBJS)\monodll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp $(OBJS)\monodll_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(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 $(OBJS)\monolib_dragimag.obj: ..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(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" !if "$(USE_GUI)" == "1"
$(OBJS)\monolib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp $(OBJS)\monolib_dropsrc.obj: ..\src\msw\ole\dropsrc.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7361,7 +7389,7 @@ $(OBJS)\wxzlib_zutil.obj: ..\src\zlib\zutil.c
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !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 ..\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 $@ 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 $(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 !endif
@@ -7401,7 +7429,7 @@ clean:
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" !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) ..\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 $@ 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) $(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 !endif
@@ -7417,7 +7445,7 @@ clean:
!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" !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 ..\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 $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a $@ @&&|
$(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj $(OBJS)\gllib_dummy.obj $(OBJS)\gllib_glcanvas.obj
| |
!endif !endif
@@ -7433,7 +7461,7 @@ clean:
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" !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 ..\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 $@ 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 $(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 !endif
@@ -7455,7 +7483,7 @@ clean:
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" !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) ..\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 $@ 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) $(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 !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 ..\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 $@ 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 $(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 ..\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 $@ 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 $(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 ..\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 $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a $@ @&&|
$(OBJS)\wxregex_regcomp.obj $(OBJS)\wxregex_regexec.obj $(OBJS)\wxregex_regerror.obj $(OBJS)\wxregex_regfree.obj $(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 ..\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 $@ 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 $(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 ..\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 $@ 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 $(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
| |

46
build/makefile.gcc
View File

File diff suppressed because one or more lines are too long

36
build/makefile.vc
View File

File diff suppressed because one or more lines are too long

36
build/makefile.wat
View File

File diff suppressed because one or more lines are too long

56
contrib/build/ogl/ogl.bkl Normal file
View File

@@ -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>

4
contrib/include/wx/ogl/ogldiag.h
View File

@@ -16,7 +16,9 @@
#pragma interface "ogldiag.h" #pragma interface "ogldiag.h"
#endif #endif
#include <wx/deprecated/setup.h> #if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#if wxUSE_PROLOGIO #if wxUSE_PROLOGIO
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>

287
contrib/src/ogl/Makefile.in
View File

@@ -1,29 +1,272 @@
# $Id$ # =========================================================================
# This makefile was generated by
top_srcdir = @top_srcdir@/.. # Bakefile 0.1.1 (http://bakefile.sourceforge.net)
top_builddir = ../../.. # Do not modify, all changes will be overwritten!
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@
HEADER_PATH=$(top_srcdir)/contrib/include/wx @MAKE_SET@
HEADER_SUBDIR=ogl
HEADERS=basic.h basicp.h bmpshape.h canvas.h composit.h constrnt.h \ prefix = @prefix@
divided.h drawn.h drawnp.h lines.h linesp.h mfutils.h misc.h \ exec_prefix = @exec_prefix@
ogl.h ogldiag.h 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 \ ### Variables: ###
basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o
DEPFILES=$(OBJECTS:.o=.d)
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

2
contrib/src/ogl/basic.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#ifdef new #ifdef new
#undef new #undef new

2
contrib/src/ogl/basic2.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#ifdef new #ifdef new
#undef new #undef new

2
contrib/src/ogl/bmpshape.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h> #include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h> #include <wx/ogl/basicp.h>

2
contrib/src/ogl/canvas.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#ifdef new #ifdef new
#undef new #undef new

2
contrib/src/ogl/composit.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h> #include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h> #include <wx/ogl/basicp.h>

2
contrib/src/ogl/constrnt.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h> #include <wx/ogl/basic.h>
#include <wx/ogl/constrnt.h> #include <wx/ogl/constrnt.h>

2
contrib/src/ogl/divided.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h> #include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h> #include <wx/ogl/basicp.h>

2
contrib/src/ogl/drawn.cpp
View File

@@ -25,7 +25,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h> #include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h> #include <wx/ogl/basicp.h>

2
contrib/src/ogl/lines.cpp
View File

@@ -25,7 +25,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#ifdef new #ifdef new
#undef new #undef new

862
contrib/src/ogl/misc.cpp
View File

@@ -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);
}

2
contrib/src/ogl/ogldiag.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#ifdef new #ifdef new
#undef new #undef new

22
contrib/src/ogl/oglmisc.cpp
View File

@@ -24,7 +24,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h> #include <wx/deprecated/wxexpr.h>
#endif
#include <wx/types.h> #include <wx/types.h>
@@ -229,7 +231,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
if (current_width > max_width) if (current_width > max_width)
max_width = current_width; max_width = current_width;
current = current->Next(); current = current->GetNext();
i ++; i ++;
} }
@@ -277,7 +279,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
double y = (double)(i*char_height + yoffset); double y = (double)(i*char_height + yoffset);
line->SetX( x - xOffset ); line->SetY( y - yOffset ); line->SetX( x - xOffset ); line->SetY( y - yOffset );
current = current->Next(); current = current->GetNext();
i ++; i ++;
} }
@@ -312,7 +314,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
if (current_width > max_width) if (current_width > max_width)
max_width = current_width; max_width = current_width;
current = current->Next(); current = current->GetNext();
i ++; i ++;
} }
@@ -333,7 +335,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
double y = (double)(i*char_height + yoffset); double y = (double)(i*char_height + yoffset);
line->SetX( x - m_xpos ); line->SetY( y - m_ypos ); line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
current = current->Next(); current = current->GetNext();
i ++; i ++;
} }
delete widths; delete widths;
@@ -367,7 +369,7 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
if (current_width > max_width) if (current_width > max_width)
max_width = current_width; max_width = current_width;
current = current->Next(); current = current->GetNext();
i ++; i ++;
} }
@@ -445,7 +447,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
char buffer[400]; char buffer[400];
buffer[0] = 0; buffer[0] = 0;
wxNode *node = word_list.First(); wxStringListNode *node = word_list.GetFirst();
long x, y; long x, y;
while (node) 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) if (buffer[0] != 0)
string_list->Add(buffer); string_list->Add(buffer);
@@ -514,7 +516,7 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
wxShapeTextLine *line = (wxShapeTextLine *)current->GetData(); wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY())); dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
current = current->Next(); current = current->GetNext();
} }
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
@@ -536,7 +538,7 @@ void oglFindPolylineCentroid(wxList *points, double *x, double *y)
wxRealPoint *point = (wxRealPoint *)node->GetData(); wxRealPoint *point = (wxRealPoint *)node->GetData();
xcount += point->x; xcount += point->x;
ycount += point->y; ycount += point->y;
node = node->Next(); node = node->GetNext();
} }
*x = (xcount/points->GetCount()); *x = (xcount/points->GetCount());
@@ -813,7 +815,7 @@ void UpdateListBox(wxListBox *item, wxList *list)
{ {
char *s = (char *)node->GetData(); char *s = (char *)node->GetData();
item->Append(s); item->Append(s);
node = node->Next(); node = node->GetNext();
} }
} }