X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/569c7d8ccb0c3f350b50f0f8435b6c6ac3d78cc8..af184f1d2f87251da968014652c86736a92b739d:/build/msw/makefile.bcc?ds=inline diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 49f3a8a512..69d9335ecd 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -390,6 +390,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tarstrm.obj \ $(OBJS)\monodll_textbuf.obj \ $(OBJS)\monodll_textfile.obj \ + $(OBJS)\monodll_time.obj \ $(OBJS)\monodll_timercmn.obj \ $(OBJS)\monodll_timerimpl.obj \ $(OBJS)\monodll_tokenzr.obj \ @@ -538,6 +539,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tarstrm.obj \ $(OBJS)\monolib_textbuf.obj \ $(OBJS)\monolib_textfile.obj \ + $(OBJS)\monolib_time.obj \ $(OBJS)\monolib_timercmn.obj \ $(OBJS)\monolib_timerimpl.obj \ $(OBJS)\monolib_tokenzr.obj \ @@ -684,6 +686,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tarstrm.obj \ $(OBJS)\basedll_textbuf.obj \ $(OBJS)\basedll_textfile.obj \ + $(OBJS)\basedll_time.obj \ $(OBJS)\basedll_timercmn.obj \ $(OBJS)\basedll_timerimpl.obj \ $(OBJS)\basedll_tokenzr.obj \ @@ -814,6 +817,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tarstrm.obj \ $(OBJS)\baselib_textbuf.obj \ $(OBJS)\baselib_textfile.obj \ + $(OBJS)\baselib_time.obj \ $(OBJS)\baselib_timercmn.obj \ $(OBJS)\baselib_timerimpl.obj \ $(OBJS)\baselib_tokenzr.obj \ @@ -1219,6 +1223,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_sttxt.obj \ $(OBJS)\xrcdll_xh_text.obj \ $(OBJS)\xrcdll_xh_tglbtn.obj \ + $(OBJS)\xrcdll_xh_timectrl.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_toolbk.obj \ $(OBJS)\xrcdll_xh_tree.obj \ @@ -1294,6 +1299,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_sttxt.obj \ $(OBJS)\xrclib_xh_text.obj \ $(OBJS)\xrclib_xh_tglbtn.obj \ + $(OBJS)\xrclib_xh_timectrl.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_toolbk.obj \ $(OBJS)\xrclib_xh_tree.obj \ @@ -1319,7 +1325,8 @@ AUIDLL_OBJECTS = \ $(OBJS)\auidll_floatpane.obj \ $(OBJS)\auidll_auibook.obj \ $(OBJS)\auidll_auibar.obj \ - $(OBJS)\auidll_tabmdi.obj + $(OBJS)\auidll_tabmdi.obj \ + $(OBJS)\auidll_tabart.obj AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1336,7 +1343,8 @@ AUILIB_OBJECTS = \ $(OBJS)\auilib_floatpane.obj \ $(OBJS)\auilib_auibook.obj \ $(OBJS)\auilib_auibar.obj \ - $(OBJS)\auilib_tabmdi.obj + $(OBJS)\auilib_tabmdi.obj \ + $(OBJS)\auilib_tabart.obj RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1566,7 +1574,7 @@ __wxscintilla_usingdll_p = -DWXUSINGDLL EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ @@ -1666,6 +1674,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_sttxt.obj \ $(OBJS)\monodll_xh_text.obj \ $(OBJS)\monodll_xh_tglbtn.obj \ + $(OBJS)\monodll_xh_timectrl.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_toolbk.obj \ $(OBJS)\monodll_xh_tree.obj \ @@ -1681,6 +1690,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_auibook.obj \ $(OBJS)\monodll_auibar.obj \ $(OBJS)\monodll_tabmdi.obj \ + $(OBJS)\monodll_tabart.obj \ $(OBJS)\monodll_advprops.obj \ $(OBJS)\monodll_editors.obj \ $(OBJS)\monodll_manager.obj \ @@ -1743,6 +1753,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ + $(OBJS)\monodll_nonownedwnd.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ @@ -1965,7 +1976,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markuptext.obj \ $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ @@ -2015,6 +2025,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ + $(OBJS)\monodll_nonownedwnd.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ @@ -2231,7 +2242,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markuptext.obj \ $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ @@ -2260,6 +2270,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ + $(OBJS)\monodll_richtooltipcmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ @@ -2278,15 +2289,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notifmsgg.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ + $(OBJS)\monodll_richtooltipg.obj \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_generic_timectrl.obj \ + $(OBJS)\monodll_timectrlg.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_notifmsg.obj \ + $(OBJS)\monodll_richtooltip.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_joystick.obj \ @@ -2294,14 +2307,14 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpcbox.obj \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_commandlinkbutton.obj \ - $(OBJS)\monodll_datecontrols.obj \ - $(OBJS)\monodll_datectrl.obj \ - $(OBJS)\monodll_datetimectrl.obj \ - $(OBJS)\monodll_hyperlink.obj \ - $(OBJS)\monodll_msw_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_datecontrols.obj \ + $(OBJS)\monodll_datectrl.obj \ + $(OBJS)\monodll_datetimectrl.obj \ + $(OBJS)\monodll_hyperlink.obj \ + $(OBJS)\monodll_timectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_animatecmn.obj \ $(OBJS)\monodll_bmpcboxcmn.obj \ $(OBJS)\monodll_calctrlcmn.obj \ @@ -2309,6 +2322,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ + $(OBJS)\monodll_richtooltipcmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ @@ -2327,15 +2341,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notifmsgg.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ + $(OBJS)\monodll_richtooltipg.obj \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_generic_timectrl.obj \ + $(OBJS)\monodll_timectrlg.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_notifmsg.obj \ + $(OBJS)\monodll_richtooltip.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_joystick.obj \ @@ -2442,6 +2458,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_sttxt.obj \ $(OBJS)\monolib_xh_text.obj \ $(OBJS)\monolib_xh_tglbtn.obj \ + $(OBJS)\monolib_xh_timectrl.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_toolbk.obj \ $(OBJS)\monolib_xh_tree.obj \ @@ -2457,6 +2474,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_auibook.obj \ $(OBJS)\monolib_auibar.obj \ $(OBJS)\monolib_tabmdi.obj \ + $(OBJS)\monolib_tabart.obj \ $(OBJS)\monolib_advprops.obj \ $(OBJS)\monolib_editors.obj \ $(OBJS)\monolib_manager.obj \ @@ -2519,6 +2537,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ + $(OBJS)\monolib_nonownedwnd.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ @@ -2741,7 +2760,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markuptext.obj \ $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ @@ -2791,6 +2809,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ + $(OBJS)\monolib_nonownedwnd.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ @@ -3007,7 +3026,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markuptext.obj \ $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ @@ -3036,6 +3054,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ + $(OBJS)\monolib_richtooltipcmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ @@ -3054,15 +3073,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notifmsgg.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ + $(OBJS)\monolib_richtooltipg.obj \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_generic_timectrl.obj \ + $(OBJS)\monolib_timectrlg.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_notifmsg.obj \ + $(OBJS)\monolib_richtooltip.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_joystick.obj \ @@ -3070,14 +3091,14 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpcbox.obj \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_commandlinkbutton.obj \ - $(OBJS)\monolib_datecontrols.obj \ - $(OBJS)\monolib_datectrl.obj \ - $(OBJS)\monolib_datetimectrl.obj \ - $(OBJS)\monolib_hyperlink.obj \ - $(OBJS)\monolib_msw_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_datecontrols.obj \ + $(OBJS)\monolib_datectrl.obj \ + $(OBJS)\monolib_datetimectrl.obj \ + $(OBJS)\monolib_hyperlink.obj \ + $(OBJS)\monolib_timectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_animatecmn.obj \ $(OBJS)\monolib_bmpcboxcmn.obj \ $(OBJS)\monolib_calctrlcmn.obj \ @@ -3085,6 +3106,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ + $(OBJS)\monolib_richtooltipcmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ @@ -3103,15 +3125,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notifmsgg.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ + $(OBJS)\monolib_richtooltipg.obj \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_generic_timectrl.obj \ + $(OBJS)\monolib_timectrlg.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_notifmsg.obj \ + $(OBJS)\monolib_richtooltip.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_joystick.obj \ @@ -3179,6 +3203,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ + $(OBJS)\coredll_nonownedwnd.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ @@ -3401,7 +3426,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markuptext.obj \ $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ @@ -3451,6 +3475,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ + $(OBJS)\coredll_nonownedwnd.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ @@ -3667,7 +3692,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markuptext.obj \ $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ @@ -3721,6 +3745,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ + $(OBJS)\corelib_nonownedwnd.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ @@ -3943,7 +3968,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markuptext.obj \ $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ @@ -3993,6 +4017,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ + $(OBJS)\corelib_nonownedwnd.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ @@ -4209,7 +4234,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markuptext.obj \ $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ @@ -4248,6 +4272,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ + $(OBJS)\advdll_richtooltipcmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ @@ -4266,15 +4291,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_notifmsgg.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ + $(OBJS)\advdll_richtooltipg.obj \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_generic_timectrl.obj \ + $(OBJS)\advdll_timectrlg.obj \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_notifmsg.obj \ + $(OBJS)\advdll_richtooltip.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ $(OBJS)\advdll_joystick.obj \ @@ -4282,14 +4309,14 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_bmpcbox.obj \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_commandlinkbutton.obj \ - $(OBJS)\advdll_datecontrols.obj \ - $(OBJS)\advdll_datectrl.obj \ - $(OBJS)\advdll_datetimectrl.obj \ - $(OBJS)\advdll_hyperlink.obj \ - $(OBJS)\advdll_msw_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_datecontrols.obj \ + $(OBJS)\advdll_datectrl.obj \ + $(OBJS)\advdll_datetimectrl.obj \ + $(OBJS)\advdll_hyperlink.obj \ + $(OBJS)\advdll_timectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_animatecmn.obj \ $(OBJS)\advdll_bmpcboxcmn.obj \ $(OBJS)\advdll_calctrlcmn.obj \ @@ -4297,6 +4324,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ + $(OBJS)\advdll_richtooltipcmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ @@ -4315,15 +4343,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_notifmsgg.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ + $(OBJS)\advdll_richtooltipg.obj \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_generic_timectrl.obj \ + $(OBJS)\advdll_timectrlg.obj \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_notifmsg.obj \ + $(OBJS)\advdll_richtooltip.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ $(OBJS)\advdll_joystick.obj \ @@ -4342,6 +4372,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ + $(OBJS)\advlib_richtooltipcmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ @@ -4360,15 +4391,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_notifmsgg.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ + $(OBJS)\advlib_richtooltipg.obj \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_generic_timectrl.obj \ + $(OBJS)\advlib_timectrlg.obj \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_notifmsg.obj \ + $(OBJS)\advlib_richtooltip.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_joystick.obj \ @@ -4376,14 +4409,14 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_bmpcbox.obj \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_commandlinkbutton.obj \ - $(OBJS)\advlib_datecontrols.obj \ - $(OBJS)\advlib_datectrl.obj \ - $(OBJS)\advlib_datetimectrl.obj \ - $(OBJS)\advlib_hyperlink.obj \ - $(OBJS)\advlib_msw_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_datecontrols.obj \ + $(OBJS)\advlib_datectrl.obj \ + $(OBJS)\advlib_datetimectrl.obj \ + $(OBJS)\advlib_hyperlink.obj \ + $(OBJS)\advlib_timectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_animatecmn.obj \ $(OBJS)\advlib_bmpcboxcmn.obj \ $(OBJS)\advlib_calctrlcmn.obj \ @@ -4391,6 +4424,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ + $(OBJS)\advlib_richtooltipcmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ @@ -4409,15 +4443,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_notifmsgg.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ + $(OBJS)\advlib_richtooltipg.obj \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_generic_timectrl.obj \ + $(OBJS)\advlib_timectrlg.obj \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_notifmsg.obj \ + $(OBJS)\advlib_richtooltip.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_joystick.obj \ @@ -5325,7 +5361,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -6218,6 +6254,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp +$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp + $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp @@ -6710,15 +6749,15 @@ $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp -$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - +$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp + $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - +$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp + $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -6989,6 +7028,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -7034,6 +7076,9 @@ $(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp +$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp + $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp @@ -7273,6 +7318,11 @@ $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp @@ -8113,11 +8163,6 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -8243,6 +8288,11 @@ $(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_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.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 @@ -8333,6 +8383,11 @@ $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp @@ -8344,11 +8399,11 @@ $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp !endif @@ -8378,6 +8433,11 @@ $(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp @@ -8602,6 +8662,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp +$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp + $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp @@ -9094,15 +9157,15 @@ $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp -$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - +$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp + $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - +$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp + $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -9373,6 +9436,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -9418,6 +9484,9 @@ $(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp +$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp + $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp @@ -9657,6 +9726,11 @@ $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp @@ -10497,11 +10571,6 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -10627,6 +10696,11 @@ $(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_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.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 @@ -10717,6 +10791,11 @@ $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp @@ -10728,11 +10807,11 @@ $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp !endif @@ -10762,6 +10841,11 @@ $(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp @@ -10986,6 +11070,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp +$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp + $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp @@ -11322,6 +11409,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp +$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp + $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp @@ -12014,6 +12104,11 @@ $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp @@ -12854,11 +12949,6 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -13422,6 +13512,11 @@ $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp @@ -14262,11 +14357,6 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -14378,15 +14468,15 @@ $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp -$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - +$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp + $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - +$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp + $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14408,6 +14498,9 @@ $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\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_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp + $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -14462,15 +14555,18 @@ $(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp +$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp + $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp -$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp - +$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp + $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp @@ -14489,6 +14585,9 @@ $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp +$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp + $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp @@ -14519,15 +14618,15 @@ $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp -$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - +$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp + $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - +$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp + $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14549,6 +14648,9 @@ $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\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_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp + $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp @@ -14603,15 +14705,18 @@ $(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp +$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp + $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp -$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp - +$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp + $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp @@ -14630,6 +14735,9 @@ $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp +$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp + $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp @@ -15080,6 +15188,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15275,6 +15386,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15326,6 +15440,9 @@ $(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp +$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp + $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp + $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp @@ -15347,6 +15464,9 @@ $(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp +$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp + $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp + $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp