X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab37ac7075cb22f2f2adfe702dd287848d9bbc72..7d9550df507d5522ac76887e5876b314b729ed50:/build/msw/makefile.wat diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 09bafb5599..e5dfcea0a1 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif @@ -143,13 +147,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_clrpicker.obj & $(OBJS)\monodll_xh_collpane.obj & $(OBJS)\monodll_xh_combo.obj & + $(OBJS)\monodll_xh_comboctrl.obj & $(OBJS)\monodll_xh_datectrl.obj & $(OBJS)\monodll_xh_dirpicker.obj & $(OBJS)\monodll_xh_dlg.obj & - $(OBJS)\monodll_xh_frame.obj & - $(OBJS)\monodll_xh_mdi.obj & + $(OBJS)\monodll_xh_editlbox.obj & + $(OBJS)\monodll_xh_filectrl.obj & $(OBJS)\monodll_xh_filepicker.obj & $(OBJS)\monodll_xh_fontpicker.obj & + $(OBJS)\monodll_xh_frame.obj & $(OBJS)\monodll_xh_gauge.obj & $(OBJS)\monodll_xh_gdctl.obj & $(OBJS)\monodll_xh_grid.obj & @@ -158,6 +164,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_listb.obj & $(OBJS)\monodll_xh_listbk.obj & $(OBJS)\monodll_xh_listc.obj & + $(OBJS)\monodll_xh_mdi.obj & $(OBJS)\monodll_xh_menu.obj & $(OBJS)\monodll_xh_notbk.obj & $(OBJS)\monodll_xh_odcombo.obj & @@ -219,6 +226,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_OBJECTS = & + $(OBJS)\monodll_activex.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & $(OBJS)\monodll_brush.obj & @@ -302,7 +310,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_nativewin.obj & $(OBJS)\monodll_notebook.obj & $(OBJS)\monodll_access.obj & - $(OBJS)\monodll_activex.obj & $(OBJS)\monodll_ownerdrw.obj & $(OBJS)\monodll_radiobox.obj & $(OBJS)\monodll_radiobut.obj & @@ -395,9 +402,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_listctrlcmn.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & + $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & @@ -461,6 +470,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_OBJECTS = & + $(OBJS)\monodll_activex.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & $(OBJS)\monodll_brush.obj & @@ -635,9 +645,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_listctrlcmn.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & + $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & @@ -727,12 +739,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & - $(OBJS)\monodll_animateg.obj & $(OBJS)\monodll_aboutdlg.obj & $(OBJS)\monodll_notifmsg.obj & $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & $(OBJS)\monodll_joystick.obj & + $(OBJS)\monodll_animateg.obj & $(OBJS)\monodll_bmpcbox.obj & $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_datecontrols.obj & @@ -766,7 +778,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & - $(OBJS)\monodll_animateg.obj & $(OBJS)\monodll_aboutdlg.obj & $(OBJS)\monodll_notifmsg.obj & $(OBJS)\monodll_sound.obj & @@ -833,13 +844,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_clrpicker.obj & $(OBJS)\monolib_xh_collpane.obj & $(OBJS)\monolib_xh_combo.obj & + $(OBJS)\monolib_xh_comboctrl.obj & $(OBJS)\monolib_xh_datectrl.obj & $(OBJS)\monolib_xh_dirpicker.obj & $(OBJS)\monolib_xh_dlg.obj & - $(OBJS)\monolib_xh_frame.obj & - $(OBJS)\monolib_xh_mdi.obj & + $(OBJS)\monolib_xh_editlbox.obj & + $(OBJS)\monolib_xh_filectrl.obj & $(OBJS)\monolib_xh_filepicker.obj & $(OBJS)\monolib_xh_fontpicker.obj & + $(OBJS)\monolib_xh_frame.obj & $(OBJS)\monolib_xh_gauge.obj & $(OBJS)\monolib_xh_gdctl.obj & $(OBJS)\monolib_xh_grid.obj & @@ -848,6 +861,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_listb.obj & $(OBJS)\monolib_xh_listbk.obj & $(OBJS)\monolib_xh_listc.obj & + $(OBJS)\monolib_xh_mdi.obj & $(OBJS)\monolib_xh_menu.obj & $(OBJS)\monolib_xh_notbk.obj & $(OBJS)\monolib_xh_odcombo.obj & @@ -909,6 +923,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_1_OBJECTS = & + $(OBJS)\monolib_activex.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & $(OBJS)\monolib_brush.obj & @@ -992,7 +1007,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_nativewin.obj & $(OBJS)\monolib_notebook.obj & $(OBJS)\monolib_access.obj & - $(OBJS)\monolib_activex.obj & $(OBJS)\monolib_ownerdrw.obj & $(OBJS)\monolib_radiobox.obj & $(OBJS)\monolib_radiobut.obj & @@ -1085,9 +1099,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_listctrlcmn.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & + $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & @@ -1151,6 +1167,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_1_OBJECTS = & + $(OBJS)\monolib_activex.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & $(OBJS)\monolib_brush.obj & @@ -1325,9 +1342,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_listctrlcmn.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & + $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & @@ -1417,12 +1436,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & - $(OBJS)\monolib_animateg.obj & $(OBJS)\monolib_aboutdlg.obj & $(OBJS)\monolib_notifmsg.obj & $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & $(OBJS)\monolib_joystick.obj & + $(OBJS)\monolib_animateg.obj & $(OBJS)\monolib_bmpcbox.obj & $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_datecontrols.obj & @@ -1456,7 +1475,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & - $(OBJS)\monolib_animateg.obj & $(OBJS)\monolib_aboutdlg.obj & $(OBJS)\monolib_notifmsg.obj & $(OBJS)\monolib_sound.obj & @@ -1521,6 +1539,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_2_OBJECTS = & + $(OBJS)\coredll_activex.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & $(OBJS)\coredll_brush.obj & @@ -1604,7 +1623,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_nativewin.obj & $(OBJS)\coredll_notebook.obj & $(OBJS)\coredll_access.obj & - $(OBJS)\coredll_activex.obj & $(OBJS)\coredll_ownerdrw.obj & $(OBJS)\coredll_radiobox.obj & $(OBJS)\coredll_radiobut.obj & @@ -1697,9 +1715,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_listctrlcmn.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & + $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & @@ -1763,6 +1783,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_2_OBJECTS = & + $(OBJS)\coredll_activex.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & $(OBJS)\coredll_brush.obj & @@ -1937,9 +1958,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_listctrlcmn.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & + $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & @@ -2013,6 +2036,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_3_OBJECTS = & + $(OBJS)\corelib_activex.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & $(OBJS)\corelib_brush.obj & @@ -2096,7 +2120,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_nativewin.obj & $(OBJS)\corelib_notebook.obj & $(OBJS)\corelib_access.obj & - $(OBJS)\corelib_activex.obj & $(OBJS)\corelib_ownerdrw.obj & $(OBJS)\corelib_radiobox.obj & $(OBJS)\corelib_radiobut.obj & @@ -2189,9 +2212,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_listctrlcmn.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & + $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & @@ -2255,6 +2280,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_3_OBJECTS = & + $(OBJS)\corelib_activex.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & $(OBJS)\corelib_brush.obj & @@ -2429,9 +2455,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_listctrlcmn.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & + $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & @@ -2538,12 +2566,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_tipdlg.obj & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & - $(OBJS)\advdll_animateg.obj & $(OBJS)\advdll_aboutdlg.obj & $(OBJS)\advdll_notifmsg.obj & $(OBJS)\advdll_sound.obj & $(OBJS)\advdll_taskbar.obj & $(OBJS)\advdll_joystick.obj & + $(OBJS)\advdll_animateg.obj & $(OBJS)\advdll_bmpcbox.obj & $(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_datecontrols.obj & @@ -2577,7 +2605,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_tipdlg.obj & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & - $(OBJS)\advdll_animateg.obj & $(OBJS)\advdll_aboutdlg.obj & $(OBJS)\advdll_notifmsg.obj & $(OBJS)\advdll_sound.obj & @@ -2623,12 +2650,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_tipdlg.obj & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & - $(OBJS)\advlib_animateg.obj & $(OBJS)\advlib_aboutdlg.obj & $(OBJS)\advlib_notifmsg.obj & $(OBJS)\advlib_sound.obj & $(OBJS)\advlib_taskbar.obj & $(OBJS)\advlib_joystick.obj & + $(OBJS)\advlib_animateg.obj & $(OBJS)\advlib_bmpcbox.obj & $(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_datecontrols.obj & @@ -2662,7 +2689,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_tipdlg.obj & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & - $(OBJS)\advlib_animateg.obj & $(OBJS)\advlib_aboutdlg.obj & $(OBJS)\advlib_notifmsg.obj & $(OBJS)\advlib_sound.obj & @@ -3132,7 +3158,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = wat OBJS = & $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -3406,6 +3432,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_config.obj & $(OBJS)\monodll_convauto.obj & $(OBJS)\monodll_datetime.obj & + $(OBJS)\monodll_datetimefmt.obj & $(OBJS)\monodll_datstrm.obj & $(OBJS)\monodll_dircmn.obj & $(OBJS)\monodll_dynarray.obj & @@ -3445,6 +3472,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_regex.obj & $(OBJS)\monodll_stdpbase.obj & $(OBJS)\monodll_sstream.obj & + $(OBJS)\monodll_stdstream.obj & $(OBJS)\monodll_stopwatch.obj & $(OBJS)\monodll_strconv.obj & $(OBJS)\monodll_stream.obj & @@ -3544,6 +3572,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_config.obj & $(OBJS)\monolib_convauto.obj & $(OBJS)\monolib_datetime.obj & + $(OBJS)\monolib_datetimefmt.obj & $(OBJS)\monolib_datstrm.obj & $(OBJS)\monolib_dircmn.obj & $(OBJS)\monolib_dynarray.obj & @@ -3583,6 +3612,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_regex.obj & $(OBJS)\monolib_stdpbase.obj & $(OBJS)\monolib_sstream.obj & + $(OBJS)\monolib_stdstream.obj & $(OBJS)\monolib_stopwatch.obj & $(OBJS)\monolib_strconv.obj & $(OBJS)\monolib_stream.obj & @@ -3680,6 +3710,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_config.obj & $(OBJS)\basedll_convauto.obj & $(OBJS)\basedll_datetime.obj & + $(OBJS)\basedll_datetimefmt.obj & $(OBJS)\basedll_datstrm.obj & $(OBJS)\basedll_dircmn.obj & $(OBJS)\basedll_dynarray.obj & @@ -3719,6 +3750,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_regex.obj & $(OBJS)\basedll_stdpbase.obj & $(OBJS)\basedll_sstream.obj & + $(OBJS)\basedll_stdstream.obj & $(OBJS)\basedll_stopwatch.obj & $(OBJS)\basedll_strconv.obj & $(OBJS)\basedll_stream.obj & @@ -3800,6 +3832,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_config.obj & $(OBJS)\baselib_convauto.obj & $(OBJS)\baselib_datetime.obj & + $(OBJS)\baselib_datetimefmt.obj & $(OBJS)\baselib_datstrm.obj & $(OBJS)\baselib_dircmn.obj & $(OBJS)\baselib_dynarray.obj & @@ -3839,6 +3872,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_regex.obj & $(OBJS)\baselib_stdpbase.obj & $(OBJS)\baselib_sstream.obj & + $(OBJS)\baselib_stdstream.obj & $(OBJS)\baselib_stopwatch.obj & $(OBJS)\baselib_strconv.obj & $(OBJS)\baselib_stream.obj & @@ -4170,13 +4204,15 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_clrpicker.obj & $(OBJS)\xrcdll_xh_collpane.obj & $(OBJS)\xrcdll_xh_combo.obj & + $(OBJS)\xrcdll_xh_comboctrl.obj & $(OBJS)\xrcdll_xh_datectrl.obj & $(OBJS)\xrcdll_xh_dirpicker.obj & $(OBJS)\xrcdll_xh_dlg.obj & - $(OBJS)\xrcdll_xh_frame.obj & - $(OBJS)\xrcdll_xh_mdi.obj & + $(OBJS)\xrcdll_xh_editlbox.obj & + $(OBJS)\xrcdll_xh_filectrl.obj & $(OBJS)\xrcdll_xh_filepicker.obj & $(OBJS)\xrcdll_xh_fontpicker.obj & + $(OBJS)\xrcdll_xh_frame.obj & $(OBJS)\xrcdll_xh_gauge.obj & $(OBJS)\xrcdll_xh_gdctl.obj & $(OBJS)\xrcdll_xh_grid.obj & @@ -4185,6 +4221,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_listb.obj & $(OBJS)\xrcdll_xh_listbk.obj & $(OBJS)\xrcdll_xh_listc.obj & + $(OBJS)\xrcdll_xh_mdi.obj & $(OBJS)\xrcdll_xh_menu.obj & $(OBJS)\xrcdll_xh_notbk.obj & $(OBJS)\xrcdll_xh_odcombo.obj & @@ -4238,13 +4275,15 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_clrpicker.obj & $(OBJS)\xrclib_xh_collpane.obj & $(OBJS)\xrclib_xh_combo.obj & + $(OBJS)\xrclib_xh_comboctrl.obj & $(OBJS)\xrclib_xh_datectrl.obj & $(OBJS)\xrclib_xh_dirpicker.obj & $(OBJS)\xrclib_xh_dlg.obj & - $(OBJS)\xrclib_xh_frame.obj & - $(OBJS)\xrclib_xh_mdi.obj & + $(OBJS)\xrclib_xh_editlbox.obj & + $(OBJS)\xrclib_xh_filectrl.obj & $(OBJS)\xrclib_xh_filepicker.obj & $(OBJS)\xrclib_xh_fontpicker.obj & + $(OBJS)\xrclib_xh_frame.obj & $(OBJS)\xrclib_xh_gauge.obj & $(OBJS)\xrclib_xh_gdctl.obj & $(OBJS)\xrclib_xh_grid.obj & @@ -4253,6 +4292,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_listb.obj & $(OBJS)\xrclib_xh_listbk.obj & $(OBJS)\xrclib_xh_listc.obj & + $(OBJS)\xrclib_xh_mdi.obj & $(OBJS)\xrclib_xh_menu.obj & $(OBJS)\xrclib_xh_notbk.obj & $(OBJS)\xrclib_xh_odcombo.obj & @@ -5120,7 +5160,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -5815,6 +5855,9 @@ $(OBJS)\monodll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp $(OBJS)\monodll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5932,6 +5975,9 @@ $(OBJS)\monodll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp $(OBJS)\monodll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6172,9 +6218,6 @@ $(OBJS)\monodll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6397,6 +6440,9 @@ $(OBJS)\monodll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp $(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6406,10 +6452,10 @@ $(OBJS)\monodll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp $(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp +$(OBJS)\monodll_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp +$(OBJS)\monodll_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp @@ -6418,6 +6464,9 @@ $(OBJS)\monodll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp $(OBJS)\monodll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6442,6 +6491,9 @@ $(OBJS)\monodll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp $(OBJS)\monodll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6616,6 +6668,11 @@ $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7633,6 +7690,11 @@ $(OBJS)\monodll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7648,6 +7710,11 @@ $(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8068,18 +8135,6 @@ $(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8105,6 +8160,11 @@ $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + $(OBJS)\monodll_version.res : .AUTODEPEND ..\..\src\msw\version.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $< @@ -8144,6 +8204,9 @@ $(OBJS)\monolib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp $(OBJS)\monolib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8261,6 +8324,9 @@ $(OBJS)\monolib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp $(OBJS)\monolib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8501,9 +8567,6 @@ $(OBJS)\monolib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8726,6 +8789,9 @@ $(OBJS)\monolib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp $(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8735,10 +8801,10 @@ $(OBJS)\monolib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp $(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp +$(OBJS)\monolib_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp +$(OBJS)\monolib_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp @@ -8747,6 +8813,9 @@ $(OBJS)\monolib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp $(OBJS)\monolib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8771,6 +8840,9 @@ $(OBJS)\monolib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp $(OBJS)\monolib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8945,6 +9017,11 @@ $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9962,6 +10039,11 @@ $(OBJS)\monolib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9977,6 +10059,11 @@ $(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10397,18 +10484,6 @@ $(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10434,6 +10509,11 @@ $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + $(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -10473,6 +10553,9 @@ $(OBJS)\basedll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp $(OBJS)\basedll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -10590,6 +10673,9 @@ $(OBJS)\basedll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp $(OBJS)\basedll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -10782,6 +10868,9 @@ $(OBJS)\baselib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp $(OBJS)\baselib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -10899,6 +10988,9 @@ $(OBJS)\baselib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp $(OBJS)\baselib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -11214,9 +11306,6 @@ $(OBJS)\coredll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11298,6 +11387,11 @@ $(OBJS)\coredll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp $(OBJS)\coredll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\coredll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12315,6 +12409,11 @@ $(OBJS)\coredll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12330,6 +12429,11 @@ $(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12695,9 +12799,6 @@ $(OBJS)\corelib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12779,6 +12880,11 @@ $(OBJS)\corelib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp $(OBJS)\corelib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\corelib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13796,6 +13902,11 @@ $(OBJS)\corelib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13811,6 +13922,11 @@ $(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14197,14 +14313,6 @@ $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -!ifeq WXUNIV 1 -$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -!endif - $(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14220,6 +14328,9 @@ $(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -14313,14 +14424,6 @@ $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -!ifeq WXUNIV 1 -$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -!endif - $(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -14336,6 +14439,9 @@ $(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< @@ -14609,6 +14715,9 @@ $(OBJS)\xrcdll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp $(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -14618,10 +14727,10 @@ $(OBJS)\xrcdll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp $(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp +$(OBJS)\xrcdll_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp +$(OBJS)\xrcdll_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< $(OBJS)\xrcdll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp @@ -14630,6 +14739,9 @@ $(OBJS)\xrcdll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp $(OBJS)\xrcdll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -14654,6 +14766,9 @@ $(OBJS)\xrcdll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp $(OBJS)\xrcdll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -14786,6 +14901,9 @@ $(OBJS)\xrclib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp $(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -14795,10 +14913,10 @@ $(OBJS)\xrclib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp $(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp +$(OBJS)\xrclib_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp +$(OBJS)\xrclib_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< $(OBJS)\xrclib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp @@ -14807,6 +14925,9 @@ $(OBJS)\xrclib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp $(OBJS)\xrclib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -14831,6 +14952,9 @@ $(OBJS)\xrclib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp $(OBJS)\xrclib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<