From 232e80750003e1ed30731ce1e5e3f74676c53950 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 4 Jan 2011 10:46:18 +0000 Subject: [PATCH] fixing placing of common files for grid and calctrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 290 +++++++++++++++++++++++++++++++++++ build/bakefiles/files.bkl | 5 +- build/msw/makefile.bcc | 152 +++++++----------- build/msw/makefile.gcc | 152 +++++++----------- build/msw/makefile.vc | 152 +++++++----------- build/msw/makefile.wat | 152 +++++++----------- build/msw/wx_adv.dsp | 8 + build/msw/wx_core.dsp | 12 -- build/msw/wx_vc7_adv.vcproj | 6 + build/msw/wx_vc7_core.vcproj | 9 -- build/msw/wx_vc8_adv.vcproj | 8 + build/msw/wx_vc8_core.vcproj | 12 -- build/msw/wx_vc9_adv.vcproj | 8 + build/msw/wx_vc9_core.vcproj | 12 -- wxGTK.spec | 5 + wxMotif.spec | 5 + wxX11.spec | 5 + 17 files changed, 569 insertions(+), 424 deletions(-) diff --git a/Makefile.in b/Makefile.in index 21347e4ca7..66f4bd7a22 100644 --- a/Makefile.in +++ b/Makefile.in @@ -412,6 +412,7 @@ ALL_BASE_HEADERS = \ wx/ptr_shrd.h \ wx/recguard.h \ wx/regex.h \ + wx/rtti.h \ wx/scopedarray.h \ wx/scopedptr.h \ wx/scopeguard.h \ @@ -464,6 +465,10 @@ ALL_BASE_HEADERS = \ wx/xlocale.h \ wx/xti.h \ wx/xtistrm.h \ + wx/xtictor.h \ + wx/xtihandler.h \ + wx/xtiprop.h \ + wx/xtitypes.h \ wx/zipstrm.h \ wx/zstream.h \ wx/meta/convertible.h \ @@ -583,6 +588,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/ptr_shrd.h \ wx/recguard.h \ wx/regex.h \ + wx/rtti.h \ wx/scopedarray.h \ wx/scopedptr.h \ wx/scopeguard.h \ @@ -635,6 +641,10 @@ ALL_PORTS_BASE_HEADERS = \ wx/xlocale.h \ wx/xti.h \ wx/xtistrm.h \ + wx/xtictor.h \ + wx/xtihandler.h \ + wx/xtiprop.h \ + wx/xtitypes.h \ wx/zipstrm.h \ wx/zstream.h \ wx/meta/convertible.h \ @@ -4460,9 +4470,12 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_artstd.o \ monodll_arttango.o \ monodll_bmpbase.o \ + monodll_bmpbtncmn.o \ monodll_bookctrl.o \ monodll_btncmn.o \ monodll_cairo.o \ + monodll_checkboxcmn.o \ + monodll_checklstcmn.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ @@ -4479,6 +4492,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_dcbufcmn.o \ monodll_dcgraph.o \ monodll_dcsvg.o \ + monodll_dirctrlcmn.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -4532,20 +4546,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_overlaycmn.o \ monodll_ownerdrwcmn.o \ monodll_paper.o \ + monodll_panelcmn.o \ monodll_persist.o \ monodll_pickerbase.o \ monodll_popupcmn.o \ monodll_prntbase.o \ monodll_quantize.o \ + monodll_radiobtncmn.o \ monodll_radiocmn.o \ monodll_rearrangectrl.o \ monodll_rendcmn.o \ monodll_rgncmn.o \ + monodll_scrolbarcmn.o \ monodll_settcmn.o \ monodll_sizer.o \ + monodll_slidercmn.o \ + monodll_spinbtncmn.o \ monodll_spinctrlcmn.o \ monodll_srchcmn.o \ monodll_statbar.o \ + monodll_statbmpcmn.o \ + monodll_statboxcmn.o \ + monodll_statlinecmn.o \ monodll_stattextcmn.o \ monodll_stockitem.o \ monodll_tbarbase.o \ @@ -4660,9 +4682,12 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_artstd.o \ monodll_arttango.o \ monodll_bmpbase.o \ + monodll_bmpbtncmn.o \ monodll_bookctrl.o \ monodll_btncmn.o \ monodll_cairo.o \ + monodll_checkboxcmn.o \ + monodll_checklstcmn.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ @@ -4679,6 +4704,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_dcbufcmn.o \ monodll_dcgraph.o \ monodll_dcsvg.o \ + monodll_dirctrlcmn.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -4732,20 +4758,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_overlaycmn.o \ monodll_ownerdrwcmn.o \ monodll_paper.o \ + monodll_panelcmn.o \ monodll_persist.o \ monodll_pickerbase.o \ monodll_popupcmn.o \ monodll_prntbase.o \ monodll_quantize.o \ + monodll_radiobtncmn.o \ monodll_radiocmn.o \ monodll_rearrangectrl.o \ monodll_rendcmn.o \ monodll_rgncmn.o \ + monodll_scrolbarcmn.o \ monodll_settcmn.o \ monodll_sizer.o \ + monodll_slidercmn.o \ + monodll_spinbtncmn.o \ monodll_spinctrlcmn.o \ monodll_srchcmn.o \ monodll_statbar.o \ + monodll_statbmpcmn.o \ + monodll_statboxcmn.o \ + monodll_statlinecmn.o \ monodll_stattextcmn.o \ monodll_stockitem.o \ monodll_tbarbase.o \ @@ -5979,7 +6013,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_bmpcboxcmn.o \ monodll_calctrlcmn.o \ monodll_datavcmn.o \ + monodll_gridcmn.o \ monodll_hyperlnkcmn.o \ + monodll_odcombocmn.o \ monodll_aboutdlgg.o \ monodll_bmpcboxg.o \ monodll_calctrlg.o \ @@ -6009,7 +6045,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_bmpcboxcmn.o \ monodll_calctrlcmn.o \ monodll_datavcmn.o \ + monodll_gridcmn.o \ monodll_hyperlnkcmn.o \ + monodll_odcombocmn.o \ monodll_aboutdlgg.o \ monodll_bmpcboxg.o \ monodll_calctrlg.o \ @@ -6340,9 +6378,12 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_artstd.o \ monolib_arttango.o \ monolib_bmpbase.o \ + monolib_bmpbtncmn.o \ monolib_bookctrl.o \ monolib_btncmn.o \ monolib_cairo.o \ + monolib_checkboxcmn.o \ + monolib_checklstcmn.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ @@ -6359,6 +6400,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_dcbufcmn.o \ monolib_dcgraph.o \ monolib_dcsvg.o \ + monolib_dirctrlcmn.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -6412,20 +6454,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_overlaycmn.o \ monolib_ownerdrwcmn.o \ monolib_paper.o \ + monolib_panelcmn.o \ monolib_persist.o \ monolib_pickerbase.o \ monolib_popupcmn.o \ monolib_prntbase.o \ monolib_quantize.o \ + monolib_radiobtncmn.o \ monolib_radiocmn.o \ monolib_rearrangectrl.o \ monolib_rendcmn.o \ monolib_rgncmn.o \ + monolib_scrolbarcmn.o \ monolib_settcmn.o \ monolib_sizer.o \ + monolib_slidercmn.o \ + monolib_spinbtncmn.o \ monolib_spinctrlcmn.o \ monolib_srchcmn.o \ monolib_statbar.o \ + monolib_statbmpcmn.o \ + monolib_statboxcmn.o \ + monolib_statlinecmn.o \ monolib_stattextcmn.o \ monolib_stockitem.o \ monolib_tbarbase.o \ @@ -6540,9 +6590,12 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_artstd.o \ monolib_arttango.o \ monolib_bmpbase.o \ + monolib_bmpbtncmn.o \ monolib_bookctrl.o \ monolib_btncmn.o \ monolib_cairo.o \ + monolib_checkboxcmn.o \ + monolib_checklstcmn.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ @@ -6559,6 +6612,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_dcbufcmn.o \ monolib_dcgraph.o \ monolib_dcsvg.o \ + monolib_dirctrlcmn.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -6612,20 +6666,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_overlaycmn.o \ monolib_ownerdrwcmn.o \ monolib_paper.o \ + monolib_panelcmn.o \ monolib_persist.o \ monolib_pickerbase.o \ monolib_popupcmn.o \ monolib_prntbase.o \ monolib_quantize.o \ + monolib_radiobtncmn.o \ monolib_radiocmn.o \ monolib_rearrangectrl.o \ monolib_rendcmn.o \ monolib_rgncmn.o \ + monolib_scrolbarcmn.o \ monolib_settcmn.o \ monolib_sizer.o \ + monolib_slidercmn.o \ + monolib_spinbtncmn.o \ monolib_spinctrlcmn.o \ monolib_srchcmn.o \ monolib_statbar.o \ + monolib_statbmpcmn.o \ + monolib_statboxcmn.o \ + monolib_statlinecmn.o \ monolib_stattextcmn.o \ monolib_stockitem.o \ monolib_tbarbase.o \ @@ -7859,7 +7921,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_bmpcboxcmn.o \ monolib_calctrlcmn.o \ monolib_datavcmn.o \ + monolib_gridcmn.o \ monolib_hyperlnkcmn.o \ + monolib_odcombocmn.o \ monolib_aboutdlgg.o \ monolib_bmpcboxg.o \ monolib_calctrlg.o \ @@ -7889,7 +7953,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_bmpcboxcmn.o \ monolib_calctrlcmn.o \ monolib_datavcmn.o \ + monolib_gridcmn.o \ monolib_hyperlnkcmn.o \ + monolib_odcombocmn.o \ monolib_aboutdlgg.o \ monolib_bmpcboxg.o \ monolib_calctrlg.o \ @@ -8404,9 +8470,12 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_artstd.o \ coredll_arttango.o \ coredll_bmpbase.o \ + coredll_bmpbtncmn.o \ coredll_bookctrl.o \ coredll_btncmn.o \ coredll_cairo.o \ + coredll_checkboxcmn.o \ + coredll_checklstcmn.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ @@ -8423,6 +8492,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_dcbufcmn.o \ coredll_dcgraph.o \ coredll_dcsvg.o \ + coredll_dirctrlcmn.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -8476,20 +8546,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_overlaycmn.o \ coredll_ownerdrwcmn.o \ coredll_paper.o \ + coredll_panelcmn.o \ coredll_persist.o \ coredll_pickerbase.o \ coredll_popupcmn.o \ coredll_prntbase.o \ coredll_quantize.o \ + coredll_radiobtncmn.o \ coredll_radiocmn.o \ coredll_rearrangectrl.o \ coredll_rendcmn.o \ coredll_rgncmn.o \ + coredll_scrolbarcmn.o \ coredll_settcmn.o \ coredll_sizer.o \ + coredll_slidercmn.o \ + coredll_spinbtncmn.o \ coredll_spinctrlcmn.o \ coredll_srchcmn.o \ coredll_statbar.o \ + coredll_statbmpcmn.o \ + coredll_statboxcmn.o \ + coredll_statlinecmn.o \ coredll_stattextcmn.o \ coredll_stockitem.o \ coredll_tbarbase.o \ @@ -8604,9 +8682,12 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_artstd.o \ coredll_arttango.o \ coredll_bmpbase.o \ + coredll_bmpbtncmn.o \ coredll_bookctrl.o \ coredll_btncmn.o \ coredll_cairo.o \ + coredll_checkboxcmn.o \ + coredll_checklstcmn.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ @@ -8623,6 +8704,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_dcbufcmn.o \ coredll_dcgraph.o \ coredll_dcsvg.o \ + coredll_dirctrlcmn.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -8676,20 +8758,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_overlaycmn.o \ coredll_ownerdrwcmn.o \ coredll_paper.o \ + coredll_panelcmn.o \ coredll_persist.o \ coredll_pickerbase.o \ coredll_popupcmn.o \ coredll_prntbase.o \ coredll_quantize.o \ + coredll_radiobtncmn.o \ coredll_radiocmn.o \ coredll_rearrangectrl.o \ coredll_rendcmn.o \ coredll_rgncmn.o \ + coredll_scrolbarcmn.o \ coredll_settcmn.o \ coredll_sizer.o \ + coredll_slidercmn.o \ + coredll_spinbtncmn.o \ coredll_spinctrlcmn.o \ coredll_srchcmn.o \ coredll_statbar.o \ + coredll_statbmpcmn.o \ + coredll_statboxcmn.o \ + coredll_statlinecmn.o \ coredll_stattextcmn.o \ coredll_stockitem.o \ coredll_tbarbase.o \ @@ -9950,9 +10040,12 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_artstd.o \ corelib_arttango.o \ corelib_bmpbase.o \ + corelib_bmpbtncmn.o \ corelib_bookctrl.o \ corelib_btncmn.o \ corelib_cairo.o \ + corelib_checkboxcmn.o \ + corelib_checklstcmn.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ @@ -9969,6 +10062,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_dcbufcmn.o \ corelib_dcgraph.o \ corelib_dcsvg.o \ + corelib_dirctrlcmn.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -10022,20 +10116,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_overlaycmn.o \ corelib_ownerdrwcmn.o \ corelib_paper.o \ + corelib_panelcmn.o \ corelib_persist.o \ corelib_pickerbase.o \ corelib_popupcmn.o \ corelib_prntbase.o \ corelib_quantize.o \ + corelib_radiobtncmn.o \ corelib_radiocmn.o \ corelib_rearrangectrl.o \ corelib_rendcmn.o \ corelib_rgncmn.o \ + corelib_scrolbarcmn.o \ corelib_settcmn.o \ corelib_sizer.o \ + corelib_slidercmn.o \ + corelib_spinbtncmn.o \ corelib_spinctrlcmn.o \ corelib_srchcmn.o \ corelib_statbar.o \ + corelib_statbmpcmn.o \ + corelib_statboxcmn.o \ + corelib_statlinecmn.o \ corelib_stattextcmn.o \ corelib_stockitem.o \ corelib_tbarbase.o \ @@ -10150,9 +10252,12 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_artstd.o \ corelib_arttango.o \ corelib_bmpbase.o \ + corelib_bmpbtncmn.o \ corelib_bookctrl.o \ corelib_btncmn.o \ corelib_cairo.o \ + corelib_checkboxcmn.o \ + corelib_checklstcmn.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ @@ -10169,6 +10274,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_dcbufcmn.o \ corelib_dcgraph.o \ corelib_dcsvg.o \ + corelib_dirctrlcmn.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -10222,20 +10328,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_overlaycmn.o \ corelib_ownerdrwcmn.o \ corelib_paper.o \ + corelib_panelcmn.o \ corelib_persist.o \ corelib_pickerbase.o \ corelib_popupcmn.o \ corelib_prntbase.o \ corelib_quantize.o \ + corelib_radiobtncmn.o \ corelib_radiocmn.o \ corelib_rearrangectrl.o \ corelib_rendcmn.o \ corelib_rgncmn.o \ + corelib_scrolbarcmn.o \ corelib_settcmn.o \ corelib_sizer.o \ + corelib_slidercmn.o \ + corelib_spinbtncmn.o \ corelib_spinctrlcmn.o \ corelib_srchcmn.o \ corelib_statbar.o \ + corelib_statbmpcmn.o \ + corelib_statboxcmn.o \ + corelib_statlinecmn.o \ corelib_stattextcmn.o \ corelib_stockitem.o \ corelib_tbarbase.o \ @@ -11538,7 +11652,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_bmpcboxcmn.o \ advdll_calctrlcmn.o \ advdll_datavcmn.o \ + advdll_gridcmn.o \ advdll_hyperlnkcmn.o \ + advdll_odcombocmn.o \ advdll_aboutdlgg.o \ advdll_bmpcboxg.o \ advdll_calctrlg.o \ @@ -11568,7 +11684,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_bmpcboxcmn.o \ advdll_calctrlcmn.o \ advdll_datavcmn.o \ + advdll_gridcmn.o \ advdll_hyperlnkcmn.o \ + advdll_odcombocmn.o \ advdll_aboutdlgg.o \ advdll_bmpcboxg.o \ advdll_calctrlg.o \ @@ -11636,7 +11754,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_bmpcboxcmn.o \ advlib_calctrlcmn.o \ advlib_datavcmn.o \ + advlib_gridcmn.o \ advlib_hyperlnkcmn.o \ + advlib_odcombocmn.o \ advlib_aboutdlgg.o \ advlib_bmpcboxg.o \ advlib_calctrlg.o \ @@ -11666,7 +11786,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_bmpcboxcmn.o \ advlib_calctrlcmn.o \ advlib_datavcmn.o \ + advlib_gridcmn.o \ advlib_hyperlnkcmn.o \ + advlib_odcombocmn.o \ advlib_aboutdlgg.o \ advlib_bmpcboxg.o \ advlib_calctrlg.o \ @@ -19584,6 +19706,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@monodll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -19593,6 +19718,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@monodll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@monodll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -19641,6 +19772,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@monodll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -19800,6 +19934,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@monodll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@monodll_persist.o: $(srcdir)/src/common/persist.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -19815,6 +19952,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@monodll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -19827,12 +19967,21 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@monodll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@monodll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@monodll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@monodll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -19842,6 +19991,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@monodll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@monodll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@monodll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -20001,9 +20159,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +@COND_USE_GUI_1@monodll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + @COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +@COND_USE_GUI_1@monodll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + @COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -24816,6 +24980,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@monolib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -24825,6 +24992,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@monolib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@monolib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -24873,6 +25046,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@monolib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -25032,6 +25208,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@monolib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@monolib_persist.o: $(srcdir)/src/common/persist.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -25047,6 +25226,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@monolib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -25059,12 +25241,21 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@monolib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@monolib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@monolib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@monolib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -25074,6 +25265,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@monolib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@monolib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@monolib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -25233,9 +25433,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +@COND_USE_GUI_1@monolib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + @COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +@COND_USE_GUI_1@monolib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + @COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -30225,6 +30431,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@coredll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -30234,6 +30443,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@coredll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@coredll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -30282,6 +30497,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@coredll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -30441,6 +30659,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@coredll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@coredll_persist.o: $(srcdir)/src/common/persist.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -30456,6 +30677,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@coredll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -30468,12 +30692,21 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@coredll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@coredll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@coredll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@coredll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -30483,6 +30716,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@coredll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@coredll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@coredll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -34149,6 +34391,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@corelib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -34158,6 +34403,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_cairo.o: $(srcdir)/src/common/cairo.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@corelib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@corelib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@corelib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -34206,6 +34457,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@corelib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -34365,6 +34619,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@corelib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@corelib_persist.o: $(srcdir)/src/common/persist.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -34380,6 +34637,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_quantize.o: $(srcdir)/src/common/quantize.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@corelib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@corelib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -34392,12 +34652,21 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@corelib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@corelib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@corelib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@corelib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -34407,6 +34676,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@corelib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@corelib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@corelib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@corelib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -34590,9 +34868,15 @@ advdll_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVDLL_ODEP) advdll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +advdll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + advdll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +advdll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + advdll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -34938,9 +35222,15 @@ advlib_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVLIB_ODEP) advlib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +advlib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + advlib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +advlib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + advlib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8495d50681..282cafb972 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -657,7 +657,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/bookctrl.cpp src/common/btncmn.cpp src/common/cairo.cpp - src/common/calctrlcmn.cpp src/common/checkboxcmn.cpp src/common/checklstcmn.cpp src/common/choiccmn.cpp @@ -703,7 +702,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/geometry.cpp src/common/gifdecod.cpp src/common/graphcmn.cpp - src/common/gridcmn.cpp src/common/headercolcmn.cpp src/common/headerctrlcmn.cpp src/common/helpbase.cpp @@ -728,7 +726,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/menucmn.cpp src/common/mousemanager.cpp src/common/nbkbase.cpp - src/common/odcombocmn.cpp src/common/overlaycmn.cpp src/common/ownerdrwcmn.cpp src/common/paper.cpp @@ -2922,7 +2919,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/bmpcboxcmn.cpp src/common/calctrlcmn.cpp src/common/datavcmn.cpp + src/common/gridcmn.cpp src/common/hyperlnkcmn.cpp + src/common/odcombocmn.cpp src/generic/aboutdlgg.cpp src/generic/bmpcboxg.cpp src/generic/calctrlg.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index db5598ac75..5a776cac26 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1795,7 +1795,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_checkboxcmn.obj \ $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ @@ -1841,7 +1840,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -1866,7 +1864,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ @@ -2058,7 +2055,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_checkboxcmn.obj \ $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ @@ -2104,7 +2100,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2129,7 +2124,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ @@ -2211,7 +2205,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.obj \ $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_datavcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ @@ -2253,7 +2249,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.obj \ $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_datavcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ @@ -2549,7 +2547,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_checkboxcmn.obj \ $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ @@ -2595,7 +2592,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2620,7 +2616,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ @@ -2812,7 +2807,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_checkboxcmn.obj \ $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ @@ -2858,7 +2852,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2883,7 +2876,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ @@ -2965,7 +2957,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.obj \ $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_datavcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ @@ -3007,7 +3001,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.obj \ $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_datavcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ @@ -3191,7 +3187,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_calctrlcmn.obj \ $(OBJS)\coredll_checkboxcmn.obj \ $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ @@ -3237,7 +3232,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3262,7 +3256,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ @@ -3454,7 +3447,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_calctrlcmn.obj \ $(OBJS)\coredll_checkboxcmn.obj \ $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ @@ -3500,7 +3492,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3525,7 +3516,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ @@ -3726,7 +3716,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_calctrlcmn.obj \ $(OBJS)\corelib_checkboxcmn.obj \ $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ @@ -3772,7 +3761,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -3797,7 +3785,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ @@ -3989,7 +3976,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_calctrlcmn.obj \ $(OBJS)\corelib_checkboxcmn.obj \ $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ @@ -4035,7 +4021,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -4060,7 +4045,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ @@ -4152,7 +4136,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.obj \ $(OBJS)\advdll_calctrlcmn.obj \ $(OBJS)\advdll_datavcmn.obj \ + $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ + $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ @@ -4194,7 +4180,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.obj \ $(OBJS)\advdll_calctrlcmn.obj \ $(OBJS)\advdll_datavcmn.obj \ + $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ + $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ @@ -4235,7 +4223,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.obj \ $(OBJS)\advlib_calctrlcmn.obj \ $(OBJS)\advlib_datavcmn.obj \ + $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ + $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ @@ -4277,7 +4267,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.obj \ $(OBJS)\advlib_calctrlcmn.obj \ $(OBJS)\advlib_datavcmn.obj \ + $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ + $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ @@ -7278,16 +7270,6 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -7513,11 +7495,6 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -7638,11 +7615,6 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -8023,16 +7995,31 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -9600,16 +9587,6 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -9835,11 +9812,6 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -9960,11 +9932,6 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -10345,16 +10312,31 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -11913,11 +11895,6 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -12143,11 +12120,6 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -12268,11 +12240,6 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -13303,11 +13270,6 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -13533,11 +13495,6 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -13658,11 +13615,6 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -14066,9 +14018,15 @@ $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp +$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp + $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp +$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp + $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -14186,9 +14144,15 @@ $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp +$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp + $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp +$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp + $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 7df486ff82..8fc2bc069c 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1806,7 +1806,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_btncmn.o \ $(OBJS)\monodll_cairo.o \ - $(OBJS)\monodll_calctrlcmn.o \ $(OBJS)\monodll_checkboxcmn.o \ $(OBJS)\monodll_checklstcmn.o \ $(OBJS)\monodll_choiccmn.o \ @@ -1852,7 +1851,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ $(OBJS)\monodll_graphcmn.o \ - $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_headercolcmn.o \ $(OBJS)\monodll_headerctrlcmn.o \ $(OBJS)\monodll_helpbase.o \ @@ -1877,7 +1875,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_ownerdrwcmn.o \ $(OBJS)\monodll_paper.o \ @@ -2071,7 +2068,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_btncmn.o \ $(OBJS)\monodll_cairo.o \ - $(OBJS)\monodll_calctrlcmn.o \ $(OBJS)\monodll_checkboxcmn.o \ $(OBJS)\monodll_checklstcmn.o \ $(OBJS)\monodll_choiccmn.o \ @@ -2117,7 +2113,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ $(OBJS)\monodll_graphcmn.o \ - $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_headercolcmn.o \ $(OBJS)\monodll_headerctrlcmn.o \ $(OBJS)\monodll_helpbase.o \ @@ -2142,7 +2137,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_ownerdrwcmn.o \ $(OBJS)\monodll_paper.o \ @@ -2225,7 +2219,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.o \ $(OBJS)\monodll_calctrlcmn.o \ $(OBJS)\monodll_datavcmn.o \ + $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_hyperlnkcmn.o \ + $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_aboutdlgg.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ @@ -2267,7 +2263,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.o \ $(OBJS)\monodll_calctrlcmn.o \ $(OBJS)\monodll_datavcmn.o \ + $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_hyperlnkcmn.o \ + $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_aboutdlgg.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ @@ -2566,7 +2564,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_btncmn.o \ $(OBJS)\monolib_cairo.o \ - $(OBJS)\monolib_calctrlcmn.o \ $(OBJS)\monolib_checkboxcmn.o \ $(OBJS)\monolib_checklstcmn.o \ $(OBJS)\monolib_choiccmn.o \ @@ -2612,7 +2609,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ $(OBJS)\monolib_graphcmn.o \ - $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_headercolcmn.o \ $(OBJS)\monolib_headerctrlcmn.o \ $(OBJS)\monolib_helpbase.o \ @@ -2637,7 +2633,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_ownerdrwcmn.o \ $(OBJS)\monolib_paper.o \ @@ -2831,7 +2826,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_btncmn.o \ $(OBJS)\monolib_cairo.o \ - $(OBJS)\monolib_calctrlcmn.o \ $(OBJS)\monolib_checkboxcmn.o \ $(OBJS)\monolib_checklstcmn.o \ $(OBJS)\monolib_choiccmn.o \ @@ -2877,7 +2871,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ $(OBJS)\monolib_graphcmn.o \ - $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_headercolcmn.o \ $(OBJS)\monolib_headerctrlcmn.o \ $(OBJS)\monolib_helpbase.o \ @@ -2902,7 +2895,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_ownerdrwcmn.o \ $(OBJS)\monolib_paper.o \ @@ -2985,7 +2977,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.o \ $(OBJS)\monolib_calctrlcmn.o \ $(OBJS)\monolib_datavcmn.o \ + $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_hyperlnkcmn.o \ + $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_aboutdlgg.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ @@ -3027,7 +3021,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.o \ $(OBJS)\monolib_calctrlcmn.o \ $(OBJS)\monolib_datavcmn.o \ + $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_hyperlnkcmn.o \ + $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_aboutdlgg.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ @@ -3224,7 +3220,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_btncmn.o \ $(OBJS)\coredll_cairo.o \ - $(OBJS)\coredll_calctrlcmn.o \ $(OBJS)\coredll_checkboxcmn.o \ $(OBJS)\coredll_checklstcmn.o \ $(OBJS)\coredll_choiccmn.o \ @@ -3270,7 +3265,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ $(OBJS)\coredll_graphcmn.o \ - $(OBJS)\coredll_gridcmn.o \ $(OBJS)\coredll_headercolcmn.o \ $(OBJS)\coredll_headerctrlcmn.o \ $(OBJS)\coredll_helpbase.o \ @@ -3295,7 +3289,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_odcombocmn.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_ownerdrwcmn.o \ $(OBJS)\coredll_paper.o \ @@ -3489,7 +3482,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_btncmn.o \ $(OBJS)\coredll_cairo.o \ - $(OBJS)\coredll_calctrlcmn.o \ $(OBJS)\coredll_checkboxcmn.o \ $(OBJS)\coredll_checklstcmn.o \ $(OBJS)\coredll_choiccmn.o \ @@ -3535,7 +3527,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ $(OBJS)\coredll_graphcmn.o \ - $(OBJS)\coredll_gridcmn.o \ $(OBJS)\coredll_headercolcmn.o \ $(OBJS)\coredll_headerctrlcmn.o \ $(OBJS)\coredll_helpbase.o \ @@ -3560,7 +3551,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_odcombocmn.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_ownerdrwcmn.o \ $(OBJS)\coredll_paper.o \ @@ -3767,7 +3757,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_btncmn.o \ $(OBJS)\corelib_cairo.o \ - $(OBJS)\corelib_calctrlcmn.o \ $(OBJS)\corelib_checkboxcmn.o \ $(OBJS)\corelib_checklstcmn.o \ $(OBJS)\corelib_choiccmn.o \ @@ -3813,7 +3802,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ $(OBJS)\corelib_graphcmn.o \ - $(OBJS)\corelib_gridcmn.o \ $(OBJS)\corelib_headercolcmn.o \ $(OBJS)\corelib_headerctrlcmn.o \ $(OBJS)\corelib_helpbase.o \ @@ -3838,7 +3826,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_odcombocmn.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_ownerdrwcmn.o \ $(OBJS)\corelib_paper.o \ @@ -4032,7 +4019,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_btncmn.o \ $(OBJS)\corelib_cairo.o \ - $(OBJS)\corelib_calctrlcmn.o \ $(OBJS)\corelib_checkboxcmn.o \ $(OBJS)\corelib_checklstcmn.o \ $(OBJS)\corelib_choiccmn.o \ @@ -4078,7 +4064,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ $(OBJS)\corelib_graphcmn.o \ - $(OBJS)\corelib_gridcmn.o \ $(OBJS)\corelib_headercolcmn.o \ $(OBJS)\corelib_headerctrlcmn.o \ $(OBJS)\corelib_helpbase.o \ @@ -4103,7 +4088,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_odcombocmn.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_ownerdrwcmn.o \ $(OBJS)\corelib_paper.o \ @@ -4200,7 +4184,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.o \ $(OBJS)\advdll_calctrlcmn.o \ $(OBJS)\advdll_datavcmn.o \ + $(OBJS)\advdll_gridcmn.o \ $(OBJS)\advdll_hyperlnkcmn.o \ + $(OBJS)\advdll_odcombocmn.o \ $(OBJS)\advdll_aboutdlgg.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ @@ -4242,7 +4228,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.o \ $(OBJS)\advdll_calctrlcmn.o \ $(OBJS)\advdll_datavcmn.o \ + $(OBJS)\advdll_gridcmn.o \ $(OBJS)\advdll_hyperlnkcmn.o \ + $(OBJS)\advdll_odcombocmn.o \ $(OBJS)\advdll_aboutdlgg.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ @@ -4287,7 +4275,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.o \ $(OBJS)\advlib_calctrlcmn.o \ $(OBJS)\advlib_datavcmn.o \ + $(OBJS)\advlib_gridcmn.o \ $(OBJS)\advlib_hyperlnkcmn.o \ + $(OBJS)\advlib_odcombocmn.o \ $(OBJS)\advlib_aboutdlgg.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ @@ -4329,7 +4319,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.o \ $(OBJS)\advlib_calctrlcmn.o \ $(OBJS)\advlib_datavcmn.o \ + $(OBJS)\advlib_gridcmn.o \ $(OBJS)\advlib_hyperlnkcmn.o \ + $(OBJS)\advlib_odcombocmn.o \ $(OBJS)\advlib_aboutdlgg.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ @@ -7428,16 +7420,6 @@ $(OBJS)\monodll_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7663,11 +7645,6 @@ $(OBJS)\monodll_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7788,11 +7765,6 @@ $(OBJS)\monodll_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8173,16 +8145,31 @@ $(OBJS)\monodll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9750,16 +9737,6 @@ $(OBJS)\monolib_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9985,11 +9962,6 @@ $(OBJS)\monolib_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10110,11 +10082,6 @@ $(OBJS)\monolib_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10495,16 +10462,31 @@ $(OBJS)\monolib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12063,11 +12045,6 @@ $(OBJS)\coredll_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12293,11 +12270,6 @@ $(OBJS)\coredll_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12418,11 +12390,6 @@ $(OBJS)\coredll_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13453,11 +13420,6 @@ $(OBJS)\corelib_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13683,11 +13645,6 @@ $(OBJS)\corelib_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13808,11 +13765,6 @@ $(OBJS)\corelib_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14216,9 +14168,15 @@ $(OBJS)\advdll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp $(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14336,9 +14294,15 @@ $(OBJS)\advlib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp $(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index b0090620fc..c547de1ce0 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2003,7 +2003,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_checkboxcmn.obj \ $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ @@ -2049,7 +2048,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2074,7 +2072,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ @@ -2266,7 +2263,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_checkboxcmn.obj \ $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ @@ -2312,7 +2308,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2337,7 +2332,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ @@ -2419,7 +2413,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.obj \ $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_datavcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ @@ -2461,7 +2457,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcboxcmn.obj \ $(OBJS)\monodll_calctrlcmn.obj \ $(OBJS)\monodll_datavcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ @@ -2763,7 +2761,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_checkboxcmn.obj \ $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ @@ -2809,7 +2806,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2834,7 +2830,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ @@ -3026,7 +3021,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_checkboxcmn.obj \ $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ @@ -3072,7 +3066,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -3097,7 +3090,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ @@ -3179,7 +3171,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.obj \ $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_datavcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ @@ -3221,7 +3215,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcboxcmn.obj \ $(OBJS)\monolib_calctrlcmn.obj \ $(OBJS)\monolib_datavcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ @@ -3471,7 +3467,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_calctrlcmn.obj \ $(OBJS)\coredll_checkboxcmn.obj \ $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ @@ -3517,7 +3512,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3542,7 +3536,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ @@ -3734,7 +3727,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_calctrlcmn.obj \ $(OBJS)\coredll_checkboxcmn.obj \ $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ @@ -3780,7 +3772,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3805,7 +3796,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ @@ -4012,7 +4002,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_calctrlcmn.obj \ $(OBJS)\corelib_checkboxcmn.obj \ $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ @@ -4058,7 +4047,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -4083,7 +4071,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ @@ -4275,7 +4262,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_calctrlcmn.obj \ $(OBJS)\corelib_checkboxcmn.obj \ $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ @@ -4321,7 +4307,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -4346,7 +4331,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ @@ -4456,7 +4440,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.obj \ $(OBJS)\advdll_calctrlcmn.obj \ $(OBJS)\advdll_datavcmn.obj \ + $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ + $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ @@ -4498,7 +4484,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcboxcmn.obj \ $(OBJS)\advdll_calctrlcmn.obj \ $(OBJS)\advdll_datavcmn.obj \ + $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ + $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ @@ -4545,7 +4533,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.obj \ $(OBJS)\advlib_calctrlcmn.obj \ $(OBJS)\advlib_datavcmn.obj \ + $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ + $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ @@ -4587,7 +4577,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcboxcmn.obj \ $(OBJS)\advlib_calctrlcmn.obj \ $(OBJS)\advlib_datavcmn.obj \ + $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ + $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ @@ -7858,16 +7850,6 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -8093,11 +8075,6 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -8218,11 +8195,6 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -8603,16 +8575,31 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -10180,16 +10167,6 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -10415,11 +10392,6 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -10540,11 +10512,6 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -10925,16 +10892,31 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -12493,11 +12475,6 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -12723,11 +12700,6 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -12848,11 +12820,6 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -13883,11 +13850,6 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp @@ -14113,11 +14075,6 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -14238,11 +14195,6 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -14646,9 +14598,15 @@ $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp +$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp + $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp +$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp + $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -14766,9 +14724,15 @@ $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp +$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp + $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp +$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp + $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d7c6345bb0..838158f7aa 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -361,7 +361,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_btncmn.obj & $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_checkboxcmn.obj & $(OBJS)\monodll_checklstcmn.obj & $(OBJS)\monodll_choiccmn.obj & @@ -407,7 +406,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_headercolcmn.obj & $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & @@ -432,7 +430,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_ownerdrwcmn.obj & $(OBJS)\monodll_paper.obj & @@ -626,7 +623,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_btncmn.obj & $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_checkboxcmn.obj & $(OBJS)\monodll_checklstcmn.obj & $(OBJS)\monodll_choiccmn.obj & @@ -672,7 +668,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_headercolcmn.obj & $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & @@ -697,7 +692,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_ownerdrwcmn.obj & $(OBJS)\monodll_paper.obj & @@ -781,7 +775,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bmpcboxcmn.obj & $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_datavcmn.obj & + $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_hyperlnkcmn.obj & + $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_aboutdlgg.obj & $(OBJS)\monodll_bmpcboxg.obj & $(OBJS)\monodll_calctrlg.obj & @@ -823,7 +819,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bmpcboxcmn.obj & $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_datavcmn.obj & + $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_hyperlnkcmn.obj & + $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_aboutdlgg.obj & $(OBJS)\monodll_bmpcboxg.obj & $(OBJS)\monodll_calctrlg.obj & @@ -1126,7 +1124,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_btncmn.obj & $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_checkboxcmn.obj & $(OBJS)\monolib_checklstcmn.obj & $(OBJS)\monolib_choiccmn.obj & @@ -1172,7 +1169,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_headercolcmn.obj & $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & @@ -1197,7 +1193,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_ownerdrwcmn.obj & $(OBJS)\monolib_paper.obj & @@ -1391,7 +1386,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_btncmn.obj & $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_checkboxcmn.obj & $(OBJS)\monolib_checklstcmn.obj & $(OBJS)\monolib_choiccmn.obj & @@ -1437,7 +1431,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_headercolcmn.obj & $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & @@ -1462,7 +1455,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_ownerdrwcmn.obj & $(OBJS)\monolib_paper.obj & @@ -1546,7 +1538,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bmpcboxcmn.obj & $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_datavcmn.obj & + $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_hyperlnkcmn.obj & + $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_aboutdlgg.obj & $(OBJS)\monolib_bmpcboxg.obj & $(OBJS)\monolib_calctrlg.obj & @@ -1588,7 +1582,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bmpcboxcmn.obj & $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_datavcmn.obj & + $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_hyperlnkcmn.obj & + $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_aboutdlgg.obj & $(OBJS)\monolib_bmpcboxg.obj & $(OBJS)\monolib_calctrlg.obj & @@ -1795,7 +1791,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_btncmn.obj & $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_calctrlcmn.obj & $(OBJS)\coredll_checkboxcmn.obj & $(OBJS)\coredll_checklstcmn.obj & $(OBJS)\coredll_choiccmn.obj & @@ -1841,7 +1836,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_gridcmn.obj & $(OBJS)\coredll_headercolcmn.obj & $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & @@ -1866,7 +1860,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_odcombocmn.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_ownerdrwcmn.obj & $(OBJS)\coredll_paper.obj & @@ -2060,7 +2053,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_btncmn.obj & $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_calctrlcmn.obj & $(OBJS)\coredll_checkboxcmn.obj & $(OBJS)\coredll_checklstcmn.obj & $(OBJS)\coredll_choiccmn.obj & @@ -2106,7 +2098,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_gridcmn.obj & $(OBJS)\coredll_headercolcmn.obj & $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & @@ -2131,7 +2122,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_odcombocmn.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_ownerdrwcmn.obj & $(OBJS)\coredll_paper.obj & @@ -2340,7 +2330,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_btncmn.obj & $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_calctrlcmn.obj & $(OBJS)\corelib_checkboxcmn.obj & $(OBJS)\corelib_checklstcmn.obj & $(OBJS)\corelib_choiccmn.obj & @@ -2386,7 +2375,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_gridcmn.obj & $(OBJS)\corelib_headercolcmn.obj & $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & @@ -2411,7 +2399,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_odcombocmn.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_ownerdrwcmn.obj & $(OBJS)\corelib_paper.obj & @@ -2605,7 +2592,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_btncmn.obj & $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_calctrlcmn.obj & $(OBJS)\corelib_checkboxcmn.obj & $(OBJS)\corelib_checklstcmn.obj & $(OBJS)\corelib_choiccmn.obj & @@ -2651,7 +2637,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_gridcmn.obj & $(OBJS)\corelib_headercolcmn.obj & $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & @@ -2676,7 +2661,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_odcombocmn.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_ownerdrwcmn.obj & $(OBJS)\corelib_paper.obj & @@ -2777,7 +2761,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_bmpcboxcmn.obj & $(OBJS)\advdll_calctrlcmn.obj & $(OBJS)\advdll_datavcmn.obj & + $(OBJS)\advdll_gridcmn.obj & $(OBJS)\advdll_hyperlnkcmn.obj & + $(OBJS)\advdll_odcombocmn.obj & $(OBJS)\advdll_aboutdlgg.obj & $(OBJS)\advdll_bmpcboxg.obj & $(OBJS)\advdll_calctrlg.obj & @@ -2819,7 +2805,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_bmpcboxcmn.obj & $(OBJS)\advdll_calctrlcmn.obj & $(OBJS)\advdll_datavcmn.obj & + $(OBJS)\advdll_gridcmn.obj & $(OBJS)\advdll_hyperlnkcmn.obj & + $(OBJS)\advdll_odcombocmn.obj & $(OBJS)\advdll_aboutdlgg.obj & $(OBJS)\advdll_bmpcboxg.obj & $(OBJS)\advdll_calctrlg.obj & @@ -2866,7 +2854,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_bmpcboxcmn.obj & $(OBJS)\advlib_calctrlcmn.obj & $(OBJS)\advlib_datavcmn.obj & + $(OBJS)\advlib_gridcmn.obj & $(OBJS)\advlib_hyperlnkcmn.obj & + $(OBJS)\advlib_odcombocmn.obj & $(OBJS)\advlib_aboutdlgg.obj & $(OBJS)\advlib_bmpcboxg.obj & $(OBJS)\advlib_calctrlg.obj & @@ -2908,7 +2898,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_bmpcboxcmn.obj & $(OBJS)\advlib_calctrlcmn.obj & $(OBJS)\advlib_datavcmn.obj & + $(OBJS)\advlib_gridcmn.obj & $(OBJS)\advlib_hyperlnkcmn.obj & + $(OBJS)\advlib_odcombocmn.obj & $(OBJS)\advlib_aboutdlgg.obj & $(OBJS)\advlib_bmpcboxg.obj & $(OBJS)\advlib_calctrlg.obj & @@ -7687,16 +7679,6 @@ $(OBJS)\monodll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7922,11 +7904,6 @@ $(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8047,11 +8024,6 @@ $(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8432,16 +8404,31 @@ $(OBJS)\monodll_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -10009,16 +9996,6 @@ $(OBJS)\monolib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10244,11 +10221,6 @@ $(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10369,11 +10341,6 @@ $(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10754,16 +10721,31 @@ $(OBJS)\monolib_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12322,11 +12304,6 @@ $(OBJS)\coredll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12552,11 +12529,6 @@ $(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12677,11 +12649,6 @@ $(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -13712,11 +13679,6 @@ $(OBJS)\corelib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13942,11 +13904,6 @@ $(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14067,11 +14024,6 @@ $(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14475,9 +14427,15 @@ $(OBJS)\advdll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp $(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14595,9 +14553,15 @@ $(OBJS)\advlib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp $(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 3beb8ac089..7cd4f59bc1 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -266,10 +266,18 @@ SOURCE=..\..\src\common\dummy.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\gridcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\hyperlnkcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\odcombocmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\taskbarcmn.cpp # End Source File # End Group diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index c4b6d2e12e..fccb085534 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -292,10 +292,6 @@ SOURCE=..\..\src\common\cairo.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\calctrlcmn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\checkboxcmn.cpp # End Source File # Begin Source File @@ -486,10 +482,6 @@ SOURCE=..\..\src\common\graphcmn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\gridcmn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\headercolcmn.cpp # End Source File # Begin Source File @@ -590,10 +582,6 @@ SOURCE=..\..\src\common\nbkbase.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\odcombocmn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\overlaycmn.cpp # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 6b2d024a7b..0cc185730b 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -591,9 +591,15 @@ UsePrecompiledHeader="1"/> + + + + diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index a137071767..470e79d73e 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -564,9 +564,6 @@ - - @@ -756,9 +753,6 @@ - - @@ -834,9 +828,6 @@ - - diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index 34e42c6ed1..34e858091c 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -822,10 +822,18 @@ /> + + + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 1c1586ee31..f7b158bc39 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -786,10 +786,6 @@ RelativePath="..\..\src\common\cairo.cpp" > - - @@ -1042,10 +1038,6 @@ RelativePath="..\..\src\common\graphcmn.cpp" > - - @@ -1146,10 +1138,6 @@ RelativePath="..\..\src\common\nbkbase.cpp" > - - diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index 48d8fc9bf0..54625456a9 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -818,10 +818,18 @@ /> + + + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index cab5f59b3d..cffda174e4 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -782,10 +782,6 @@ RelativePath="..\..\src\common\cairo.cpp" > - - @@ -1038,10 +1034,6 @@ RelativePath="..\..\src\common\graphcmn.cpp" > - - @@ -1142,10 +1134,6 @@ RelativePath="..\..\src\common\nbkbase.cpp" > - - diff --git a/wxGTK.spec b/wxGTK.spec index d78748de00..98cc171f09 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -279,6 +279,7 @@ wx/ptr_scpd.h wx/ptr_shrd.h wx/recguard.h wx/regex.h +wx/rtti.h wx/scopedarray.h wx/scopedptr.h wx/scopeguard.h @@ -331,6 +332,10 @@ wx/wxprec.h wx/xlocale.h wx/xti.h wx/xtistrm.h +wx/xtictor.h +wx/xtihandler.h +wx/xtiprop.h +wx/xtitypes.h wx/zipstrm.h wx/zstream.h wx/meta/convertible.h diff --git a/wxMotif.spec b/wxMotif.spec index 06cd566c7e..c7e68b98dd 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -181,6 +181,7 @@ wx/ptr_scpd.h wx/ptr_shrd.h wx/recguard.h wx/regex.h +wx/rtti.h wx/scopedarray.h wx/scopedptr.h wx/scopeguard.h @@ -233,6 +234,10 @@ wx/wxprec.h wx/xlocale.h wx/xti.h wx/xtistrm.h +wx/xtictor.h +wx/xtihandler.h +wx/xtiprop.h +wx/xtitypes.h wx/zipstrm.h wx/zstream.h wx/meta/convertible.h diff --git a/wxX11.spec b/wxX11.spec index 3c1ba58527..c7edf088dc 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -205,6 +205,7 @@ wx/ptr_scpd.h wx/ptr_shrd.h wx/recguard.h wx/regex.h +wx/rtti.h wx/scopedarray.h wx/scopedptr.h wx/scopeguard.h @@ -257,6 +258,10 @@ wx/wxprec.h wx/xlocale.h wx/xti.h wx/xtistrm.h +wx/xtictor.h +wx/xtihandler.h +wx/xtiprop.h +wx/xtitypes.h wx/zipstrm.h wx/zstream.h wx/meta/convertible.h