X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15a6b8966884f478b394fb521705141f6f8ba439..31848e7da515216ac5bda1cf85250bc3f7d77781:/build/msw/makefile.wat diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d781aba9d4..73499423b6 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.0 (http://bakefile.sourceforge.net) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -103,7 +103,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_mediactrlcmn.obj & $(OBJS)\monodll_mediactrl_am.obj & $(OBJS)\monodll_mediactrl_wmp10.obj & - $(OBJS)\monodll_activex.obj & + $(OBJS)\monodll_mediactrl_qt.obj & $(OBJS)\monodll_helpbest.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -128,11 +128,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_m_tables.obj & $(OBJS)\monodll_winpars.obj & $(OBJS)\monodll_htmllbox.obj & - $(OBJS)\monodll_db.obj & - $(OBJS)\monodll_dbtable.obj & $(OBJS)\monodll_debugrpt.obj & $(OBJS)\monodll_dbgrptg.obj & - $(OBJS)\monodll_dbgrid.obj & $(OBJS)\monodll_xh_animatctrl.obj & $(OBJS)\monodll_xh_bmp.obj & $(OBJS)\monodll_xh_bmpcbox.obj & @@ -165,6 +162,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_notbk.obj & $(OBJS)\monodll_xh_odcombo.obj & $(OBJS)\monodll_xh_panel.obj & + $(OBJS)\monodll_xh_propdlg.obj & $(OBJS)\monodll_xh_radbt.obj & $(OBJS)\monodll_xh_radbx.obj & $(OBJS)\monodll_xh_scrol.obj & @@ -174,6 +172,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_slidr.obj & $(OBJS)\monodll_xh_spin.obj & $(OBJS)\monodll_xh_split.obj & + $(OBJS)\monodll_xh_srchctrl.obj & $(OBJS)\monodll_xh_statbar.obj & $(OBJS)\monodll_xh_stbmp.obj & $(OBJS)\monodll_xh_stbox.obj & @@ -187,12 +186,22 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_unkwn.obj & $(OBJS)\monodll_xh_wizrd.obj & $(OBJS)\monodll_xmlres.obj & + $(OBJS)\monodll_xmladv.obj & $(OBJS)\monodll_xmlrsall.obj & $(OBJS)\monodll_framemanager.obj & $(OBJS)\monodll_dockart.obj & $(OBJS)\monodll_floatpane.obj & $(OBJS)\monodll_auibook.obj & + $(OBJS)\monodll_auibar.obj & $(OBJS)\monodll_tabmdi.obj & + $(OBJS)\monodll_advprops.obj & + $(OBJS)\monodll_editors.obj & + $(OBJS)\monodll_manager.obj & + $(OBJS)\monodll_property.obj & + $(OBJS)\monodll_propgrid.obj & + $(OBJS)\monodll_propgridiface.obj & + $(OBJS)\monodll_propgridpagestate.obj & + $(OBJS)\monodll_props.obj & $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextbuffer.obj & $(OBJS)\monodll_richtextstyles.obj & @@ -201,7 +210,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_richtextformatdlg.obj & $(OBJS)\monodll_richtextsymboldlg.obj & $(OBJS)\monodll_richtextstyledlg.obj & - $(OBJS)\monodll_richtextprint.obj + $(OBJS)\monodll_richtextprint.obj & + $(OBJS)\monodll_stc.obj & + $(OBJS)\monodll_PlatWX.obj & + $(OBJS)\monodll_ScintillaWX.obj !endif ____CORE_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 @@ -224,14 +236,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dib.obj & $(OBJS)\monodll_display.obj & $(OBJS)\monodll_enhmeta.obj & - $(OBJS)\monodll_evtloop.obj & $(OBJS)\monodll_font.obj & $(OBJS)\monodll_fontenum.obj & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_gdiplus.obj & $(OBJS)\monodll_graphics.obj & - $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_imaglist.obj & $(OBJS)\monodll_minifram.obj & @@ -247,7 +258,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & @@ -257,9 +267,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_uuid.obj & + $(OBJS)\monodll_clrpickerg.obj & + $(OBJS)\monodll_collpaneg.obj & + $(OBJS)\monodll_filepickerg.obj & + $(OBJS)\monodll_fontpickerg.obj & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_artmsw.obj & $(OBJS)\monodll_bmpbuttn.obj & $(OBJS)\monodll_button.obj & $(OBJS)\monodll_checkbox.obj & @@ -273,7 +288,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dragimag.obj & $(OBJS)\monodll_filedlg.obj & $(OBJS)\monodll_frame.obj & - $(OBJS)\monodll_gauge95.obj & + $(OBJS)\monodll_gauge.obj & + $(OBJS)\monodll_headerctrl.obj & $(OBJS)\monodll_iniconf.obj & $(OBJS)\monodll_listbox.obj & $(OBJS)\monodll_listctrl.obj & @@ -283,28 +299,31 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_metafile.obj & $(OBJS)\monodll_msgdlg.obj & $(OBJS)\monodll_nativdlg.obj & + $(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 & $(OBJS)\monodll_scrolbar.obj & - $(OBJS)\monodll_slider95.obj & + $(OBJS)\monodll_slider.obj & $(OBJS)\monodll_spinbutt.obj & $(OBJS)\monodll_spinctrl.obj & $(OBJS)\monodll_statbmp.obj & $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statbr95.obj & + $(OBJS)\monodll_statusbar.obj & $(OBJS)\monodll_statline.obj & $(OBJS)\monodll_stattext.obj & - $(OBJS)\monodll_tabctrl.obj & - $(OBJS)\monodll_tbar95.obj & + $(OBJS)\monodll_toolbar.obj & $(OBJS)\monodll_textctrl.obj & + $(OBJS)\monodll_textentry.obj & $(OBJS)\monodll_tglbtn.obj & $(OBJS)\monodll_treectrl.obj & $(OBJS)\monodll_checklst.obj & $(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_fontdlg.obj & + $(OBJS)\monodll_accelcmn.obj & $(OBJS)\monodll_accesscmn.obj & $(OBJS)\monodll_anidecod.obj & $(OBJS)\monodll_appcmn.obj & @@ -312,6 +331,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & $(OBJS)\monodll_bookctrl.obj & + $(OBJS)\monodll_btncmn.obj & + $(OBJS)\monodll_cairo.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clrpickercmn.obj & @@ -327,6 +348,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dcbufcmn.obj & $(OBJS)\monodll_dcgraph.obj & + $(OBJS)\monodll_dcsvg.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -335,14 +357,15 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dpycmn.obj & $(OBJS)\monodll_dseldlg.obj & $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_evtloopcmn.obj & $(OBJS)\monodll_fddlgcmn.obj & + $(OBJS)\monodll_filectrlcmn.obj & $(OBJS)\monodll_filepickercmn.obj & $(OBJS)\monodll_fontpickercmn.obj & $(OBJS)\monodll_fldlgcmn.obj & $(OBJS)\monodll_fontcmn.obj & $(OBJS)\monodll_fontenumcmn.obj & $(OBJS)\monodll_fontmap.obj & + $(OBJS)\monodll_fontutilcmn.obj & $(OBJS)\monodll_framecmn.obj & $(OBJS)\monodll_gaugecmn.obj & $(OBJS)\monodll_gbsizer.obj & @@ -350,6 +373,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & + $(OBJS)\monodll_headercolcmn.obj & + $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & $(OBJS)\monodll_iconbndl.obj & $(OBJS)\monodll_imagall.obj & @@ -378,34 +403,39 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & $(OBJS)\monodll_radiocmn.obj & + $(OBJS)\monodll_rearrangectrl.obj & $(OBJS)\monodll_rendcmn.obj & $(OBJS)\monodll_rgncmn.obj & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & + $(OBJS)\monodll_spinbuttcmn.obj & + $(OBJS)\monodll_spinctrlcmn.obj & + $(OBJS)\monodll_srchcmn.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_stattextcmn.obj & $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_timercmn.obj & + $(OBJS)\monodll_textentrycmn.obj & $(OBJS)\monodll_toplvcmn.obj & $(OBJS)\monodll_treebase.obj & $(OBJS)\monodll_valgen.obj & $(OBJS)\monodll_validate.obj & $(OBJS)\monodll_valtext.obj & $(OBJS)\monodll_wincmn.obj & + $(OBJS)\monodll_windowid.obj & + $(OBJS)\monodll_wrapsizer.obj & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & $(OBJS)\monodll_buttonbar.obj & $(OBJS)\monodll_choicdgg.obj & $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & $(OBJS)\monodll_combog.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontpickerg.obj & + $(OBJS)\monodll_filectrlg.obj & + $(OBJS)\monodll_headerctrlg.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & @@ -417,6 +447,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & $(OBJS)\monodll_splitter.obj & + $(OBJS)\monodll_srchctlg.obj & + $(OBJS)\monodll_statbmpg.obj & + $(OBJS)\monodll_stattextg.obj & $(OBJS)\monodll_textdlgg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_toolbkg.obj & @@ -446,14 +479,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dib.obj & $(OBJS)\monodll_display.obj & $(OBJS)\monodll_enhmeta.obj & - $(OBJS)\monodll_evtloop.obj & $(OBJS)\monodll_font.obj & $(OBJS)\monodll_fontenum.obj & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_gdiplus.obj & $(OBJS)\monodll_graphics.obj & - $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_imaglist.obj & $(OBJS)\monodll_minifram.obj & @@ -469,7 +501,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & @@ -480,22 +511,24 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_clrpickerg.obj & + $(OBJS)\monodll_collpaneg.obj & $(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_filedlgg.obj & + $(OBJS)\monodll_filepickerg.obj & $(OBJS)\monodll_fontdlgg.obj & + $(OBJS)\monodll_fontpickerg.obj & $(OBJS)\monodll_listctrl.obj & $(OBJS)\monodll_mdig.obj & $(OBJS)\monodll_msgdlgg.obj & $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_tabg.obj & $(OBJS)\monodll_bmpbuttn.obj & $(OBJS)\monodll_button.obj & $(OBJS)\monodll_checkbox.obj & $(OBJS)\monodll_checklst.obj & $(OBJS)\monodll_choice.obj & - $(OBJS)\monodll_colschem.obj & $(OBJS)\monodll_combobox.obj & $(OBJS)\monodll_control.obj & $(OBJS)\monodll_ctrlrend.obj & @@ -512,6 +545,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_scrarrow.obj & $(OBJS)\monodll_scrolbar.obj & $(OBJS)\monodll_scrthumb.obj & + $(OBJS)\monodll_settingsuniv.obj & $(OBJS)\monodll_slider.obj & $(OBJS)\monodll_spinbutt.obj & $(OBJS)\monodll_statbmp.obj & @@ -530,6 +564,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_metal.obj & $(OBJS)\monodll_mono.obj & $(OBJS)\monodll_win32.obj & + $(OBJS)\monodll_accelcmn.obj & $(OBJS)\monodll_accesscmn.obj & $(OBJS)\monodll_anidecod.obj & $(OBJS)\monodll_appcmn.obj & @@ -537,6 +572,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & $(OBJS)\monodll_bookctrl.obj & + $(OBJS)\monodll_btncmn.obj & + $(OBJS)\monodll_cairo.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clrpickercmn.obj & @@ -552,6 +589,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dcbufcmn.obj & $(OBJS)\monodll_dcgraph.obj & + $(OBJS)\monodll_dcsvg.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -560,14 +598,15 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dpycmn.obj & $(OBJS)\monodll_dseldlg.obj & $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_evtloopcmn.obj & $(OBJS)\monodll_fddlgcmn.obj & + $(OBJS)\monodll_filectrlcmn.obj & $(OBJS)\monodll_filepickercmn.obj & $(OBJS)\monodll_fontpickercmn.obj & $(OBJS)\monodll_fldlgcmn.obj & $(OBJS)\monodll_fontcmn.obj & $(OBJS)\monodll_fontenumcmn.obj & $(OBJS)\monodll_fontmap.obj & + $(OBJS)\monodll_fontutilcmn.obj & $(OBJS)\monodll_framecmn.obj & $(OBJS)\monodll_gaugecmn.obj & $(OBJS)\monodll_gbsizer.obj & @@ -575,6 +614,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & + $(OBJS)\monodll_headercolcmn.obj & + $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & $(OBJS)\monodll_iconbndl.obj & $(OBJS)\monodll_imagall.obj & @@ -603,34 +644,39 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & $(OBJS)\monodll_radiocmn.obj & + $(OBJS)\monodll_rearrangectrl.obj & $(OBJS)\monodll_rendcmn.obj & $(OBJS)\monodll_rgncmn.obj & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & + $(OBJS)\monodll_spinbuttcmn.obj & + $(OBJS)\monodll_spinctrlcmn.obj & + $(OBJS)\monodll_srchcmn.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_stattextcmn.obj & $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_timercmn.obj & + $(OBJS)\monodll_textentrycmn.obj & $(OBJS)\monodll_toplvcmn.obj & $(OBJS)\monodll_treebase.obj & $(OBJS)\monodll_valgen.obj & $(OBJS)\monodll_validate.obj & $(OBJS)\monodll_valtext.obj & $(OBJS)\monodll_wincmn.obj & + $(OBJS)\monodll_windowid.obj & + $(OBJS)\monodll_wrapsizer.obj & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & $(OBJS)\monodll_buttonbar.obj & $(OBJS)\monodll_choicdgg.obj & $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & $(OBJS)\monodll_combog.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontpickerg.obj & + $(OBJS)\monodll_filectrlg.obj & + $(OBJS)\monodll_headerctrlg.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & @@ -642,6 +688,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & $(OBJS)\monodll_splitter.obj & + $(OBJS)\monodll_srchctlg.obj & + $(OBJS)\monodll_statbmpg.obj & + $(OBJS)\monodll_stattextg.obj & $(OBJS)\monodll_textdlgg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_toolbkg.obj & @@ -655,61 +704,82 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_animatecmn.obj & + $(OBJS)\monodll_bmpcboxcmn.obj & + $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_datavcmn.obj & + $(OBJS)\monodll_hyperlnkcmn.obj & $(OBJS)\monodll_aboutdlgg.obj & $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_calctrlg.obj & $(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datectlg.obj & + $(OBJS)\monodll_editlbox.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & + $(OBJS)\monodll_grideditors.obj & $(OBJS)\monodll_gridsel.obj & $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlink.obj & + $(OBJS)\monodll_hyperlinkg.obj & $(OBJS)\monodll_laywin.obj & + $(OBJS)\monodll_notifmsgg.obj & $(OBJS)\monodll_odcombo.obj & $(OBJS)\monodll_propdlg.obj & $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_animateg.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_bmpcbox.obj & + $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_datecontrols.obj & $(OBJS)\monodll_datectrl.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_animatecmn.obj & + $(OBJS)\monodll_bmpcboxcmn.obj & + $(OBJS)\monodll_calctrlcmn.obj & $(OBJS)\monodll_datavcmn.obj & + $(OBJS)\monodll_hyperlnkcmn.obj & $(OBJS)\monodll_aboutdlgg.obj & $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_calctrlg.obj & $(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datectlg.obj & + $(OBJS)\monodll_editlbox.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & + $(OBJS)\monodll_grideditors.obj & $(OBJS)\monodll_gridsel.obj & $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlink.obj & + $(OBJS)\monodll_hyperlinkg.obj & $(OBJS)\monodll_laywin.obj & + $(OBJS)\monodll_notifmsgg.obj & $(OBJS)\monodll_odcombo.obj & $(OBJS)\monodll_propdlg.obj & $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_animateg.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 !endif +__wxscintilla_library_link_DEP = +!ifeq USE_STC 1 +__wxscintilla_library_link_DEP = $(__wxscintilla) +!endif __monolib___depname = !ifeq MONOLITHIC 1 !ifeq SHARED 0 @@ -725,7 +795,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_mediactrlcmn.obj & $(OBJS)\monolib_mediactrl_am.obj & $(OBJS)\monolib_mediactrl_wmp10.obj & - $(OBJS)\monolib_activex.obj & + $(OBJS)\monolib_mediactrl_qt.obj & $(OBJS)\monolib_helpbest.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -750,11 +820,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_m_tables.obj & $(OBJS)\monolib_winpars.obj & $(OBJS)\monolib_htmllbox.obj & - $(OBJS)\monolib_db.obj & - $(OBJS)\monolib_dbtable.obj & $(OBJS)\monolib_debugrpt.obj & $(OBJS)\monolib_dbgrptg.obj & - $(OBJS)\monolib_dbgrid.obj & $(OBJS)\monolib_xh_animatctrl.obj & $(OBJS)\monolib_xh_bmp.obj & $(OBJS)\monolib_xh_bmpcbox.obj & @@ -787,6 +854,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_notbk.obj & $(OBJS)\monolib_xh_odcombo.obj & $(OBJS)\monolib_xh_panel.obj & + $(OBJS)\monolib_xh_propdlg.obj & $(OBJS)\monolib_xh_radbt.obj & $(OBJS)\monolib_xh_radbx.obj & $(OBJS)\monolib_xh_scrol.obj & @@ -796,6 +864,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_slidr.obj & $(OBJS)\monolib_xh_spin.obj & $(OBJS)\monolib_xh_split.obj & + $(OBJS)\monolib_xh_srchctrl.obj & $(OBJS)\monolib_xh_statbar.obj & $(OBJS)\monolib_xh_stbmp.obj & $(OBJS)\monolib_xh_stbox.obj & @@ -809,12 +878,22 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_unkwn.obj & $(OBJS)\monolib_xh_wizrd.obj & $(OBJS)\monolib_xmlres.obj & + $(OBJS)\monolib_xmladv.obj & $(OBJS)\monolib_xmlrsall.obj & $(OBJS)\monolib_framemanager.obj & $(OBJS)\monolib_dockart.obj & $(OBJS)\monolib_floatpane.obj & $(OBJS)\monolib_auibook.obj & + $(OBJS)\monolib_auibar.obj & $(OBJS)\monolib_tabmdi.obj & + $(OBJS)\monolib_advprops.obj & + $(OBJS)\monolib_editors.obj & + $(OBJS)\monolib_manager.obj & + $(OBJS)\monolib_property.obj & + $(OBJS)\monolib_propgrid.obj & + $(OBJS)\monolib_propgridiface.obj & + $(OBJS)\monolib_propgridpagestate.obj & + $(OBJS)\monolib_props.obj & $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextbuffer.obj & $(OBJS)\monolib_richtextstyles.obj & @@ -823,7 +902,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_richtextformatdlg.obj & $(OBJS)\monolib_richtextsymboldlg.obj & $(OBJS)\monolib_richtextstyledlg.obj & - $(OBJS)\monolib_richtextprint.obj + $(OBJS)\monolib_richtextprint.obj & + $(OBJS)\monolib_stc.obj & + $(OBJS)\monolib_PlatWX.obj & + $(OBJS)\monolib_ScintillaWX.obj !endif ____CORE_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 @@ -846,14 +928,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dib.obj & $(OBJS)\monolib_display.obj & $(OBJS)\monolib_enhmeta.obj & - $(OBJS)\monolib_evtloop.obj & $(OBJS)\monolib_font.obj & $(OBJS)\monolib_fontenum.obj & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_gdiplus.obj & $(OBJS)\monolib_graphics.obj & - $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_imaglist.obj & $(OBJS)\monolib_minifram.obj & @@ -869,7 +950,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & @@ -879,9 +959,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_uuid.obj & + $(OBJS)\monolib_clrpickerg.obj & + $(OBJS)\monolib_collpaneg.obj & + $(OBJS)\monolib_filepickerg.obj & + $(OBJS)\monolib_fontpickerg.obj & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_artmsw.obj & $(OBJS)\monolib_bmpbuttn.obj & $(OBJS)\monolib_button.obj & $(OBJS)\monolib_checkbox.obj & @@ -895,7 +980,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dragimag.obj & $(OBJS)\monolib_filedlg.obj & $(OBJS)\monolib_frame.obj & - $(OBJS)\monolib_gauge95.obj & + $(OBJS)\monolib_gauge.obj & + $(OBJS)\monolib_headerctrl.obj & $(OBJS)\monolib_iniconf.obj & $(OBJS)\monolib_listbox.obj & $(OBJS)\monolib_listctrl.obj & @@ -905,28 +991,31 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_metafile.obj & $(OBJS)\monolib_msgdlg.obj & $(OBJS)\monolib_nativdlg.obj & + $(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 & $(OBJS)\monolib_scrolbar.obj & - $(OBJS)\monolib_slider95.obj & + $(OBJS)\monolib_slider.obj & $(OBJS)\monolib_spinbutt.obj & $(OBJS)\monolib_spinctrl.obj & $(OBJS)\monolib_statbmp.obj & $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statbr95.obj & + $(OBJS)\monolib_statusbar.obj & $(OBJS)\monolib_statline.obj & $(OBJS)\monolib_stattext.obj & - $(OBJS)\monolib_tabctrl.obj & - $(OBJS)\monolib_tbar95.obj & + $(OBJS)\monolib_toolbar.obj & $(OBJS)\monolib_textctrl.obj & + $(OBJS)\monolib_textentry.obj & $(OBJS)\monolib_tglbtn.obj & $(OBJS)\monolib_treectrl.obj & $(OBJS)\monolib_checklst.obj & $(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_fontdlg.obj & + $(OBJS)\monolib_accelcmn.obj & $(OBJS)\monolib_accesscmn.obj & $(OBJS)\monolib_anidecod.obj & $(OBJS)\monolib_appcmn.obj & @@ -934,6 +1023,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & $(OBJS)\monolib_bookctrl.obj & + $(OBJS)\monolib_btncmn.obj & + $(OBJS)\monolib_cairo.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clrpickercmn.obj & @@ -949,6 +1040,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dcbufcmn.obj & $(OBJS)\monolib_dcgraph.obj & + $(OBJS)\monolib_dcsvg.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -957,14 +1049,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dpycmn.obj & $(OBJS)\monolib_dseldlg.obj & $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_evtloopcmn.obj & $(OBJS)\monolib_fddlgcmn.obj & + $(OBJS)\monolib_filectrlcmn.obj & $(OBJS)\monolib_filepickercmn.obj & $(OBJS)\monolib_fontpickercmn.obj & $(OBJS)\monolib_fldlgcmn.obj & $(OBJS)\monolib_fontcmn.obj & $(OBJS)\monolib_fontenumcmn.obj & $(OBJS)\monolib_fontmap.obj & + $(OBJS)\monolib_fontutilcmn.obj & $(OBJS)\monolib_framecmn.obj & $(OBJS)\monolib_gaugecmn.obj & $(OBJS)\monolib_gbsizer.obj & @@ -972,6 +1065,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & + $(OBJS)\monolib_headercolcmn.obj & + $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & $(OBJS)\monolib_iconbndl.obj & $(OBJS)\monolib_imagall.obj & @@ -1000,34 +1095,39 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & $(OBJS)\monolib_radiocmn.obj & + $(OBJS)\monolib_rearrangectrl.obj & $(OBJS)\monolib_rendcmn.obj & $(OBJS)\monolib_rgncmn.obj & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & + $(OBJS)\monolib_spinbuttcmn.obj & + $(OBJS)\monolib_spinctrlcmn.obj & + $(OBJS)\monolib_srchcmn.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_stattextcmn.obj & $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_timercmn.obj & + $(OBJS)\monolib_textentrycmn.obj & $(OBJS)\monolib_toplvcmn.obj & $(OBJS)\monolib_treebase.obj & $(OBJS)\monolib_valgen.obj & $(OBJS)\monolib_validate.obj & $(OBJS)\monolib_valtext.obj & $(OBJS)\monolib_wincmn.obj & + $(OBJS)\monolib_windowid.obj & + $(OBJS)\monolib_wrapsizer.obj & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & $(OBJS)\monolib_buttonbar.obj & $(OBJS)\monolib_choicdgg.obj & $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & $(OBJS)\monolib_combog.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontpickerg.obj & + $(OBJS)\monolib_filectrlg.obj & + $(OBJS)\monolib_headerctrlg.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & @@ -1039,6 +1139,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & $(OBJS)\monolib_splitter.obj & + $(OBJS)\monolib_srchctlg.obj & + $(OBJS)\monolib_statbmpg.obj & + $(OBJS)\monolib_stattextg.obj & $(OBJS)\monolib_textdlgg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_toolbkg.obj & @@ -1068,14 +1171,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dib.obj & $(OBJS)\monolib_display.obj & $(OBJS)\monolib_enhmeta.obj & - $(OBJS)\monolib_evtloop.obj & $(OBJS)\monolib_font.obj & $(OBJS)\monolib_fontenum.obj & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_gdiplus.obj & $(OBJS)\monolib_graphics.obj & - $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_imaglist.obj & $(OBJS)\monolib_minifram.obj & @@ -1091,7 +1193,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & @@ -1102,22 +1203,24 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_clrpickerg.obj & + $(OBJS)\monolib_collpaneg.obj & $(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_filedlgg.obj & + $(OBJS)\monolib_filepickerg.obj & $(OBJS)\monolib_fontdlgg.obj & + $(OBJS)\monolib_fontpickerg.obj & $(OBJS)\monolib_listctrl.obj & $(OBJS)\monolib_mdig.obj & $(OBJS)\monolib_msgdlgg.obj & $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_tabg.obj & $(OBJS)\monolib_bmpbuttn.obj & $(OBJS)\monolib_button.obj & $(OBJS)\monolib_checkbox.obj & $(OBJS)\monolib_checklst.obj & $(OBJS)\monolib_choice.obj & - $(OBJS)\monolib_colschem.obj & $(OBJS)\monolib_combobox.obj & $(OBJS)\monolib_control.obj & $(OBJS)\monolib_ctrlrend.obj & @@ -1134,6 +1237,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_scrarrow.obj & $(OBJS)\monolib_scrolbar.obj & $(OBJS)\monolib_scrthumb.obj & + $(OBJS)\monolib_settingsuniv.obj & $(OBJS)\monolib_slider.obj & $(OBJS)\monolib_spinbutt.obj & $(OBJS)\monolib_statbmp.obj & @@ -1152,6 +1256,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_metal.obj & $(OBJS)\monolib_mono.obj & $(OBJS)\monolib_win32.obj & + $(OBJS)\monolib_accelcmn.obj & $(OBJS)\monolib_accesscmn.obj & $(OBJS)\monolib_anidecod.obj & $(OBJS)\monolib_appcmn.obj & @@ -1159,6 +1264,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & $(OBJS)\monolib_bookctrl.obj & + $(OBJS)\monolib_btncmn.obj & + $(OBJS)\monolib_cairo.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clrpickercmn.obj & @@ -1174,6 +1281,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dcbufcmn.obj & $(OBJS)\monolib_dcgraph.obj & + $(OBJS)\monolib_dcsvg.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -1182,14 +1290,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dpycmn.obj & $(OBJS)\monolib_dseldlg.obj & $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_evtloopcmn.obj & $(OBJS)\monolib_fddlgcmn.obj & + $(OBJS)\monolib_filectrlcmn.obj & $(OBJS)\monolib_filepickercmn.obj & $(OBJS)\monolib_fontpickercmn.obj & $(OBJS)\monolib_fldlgcmn.obj & $(OBJS)\monolib_fontcmn.obj & $(OBJS)\monolib_fontenumcmn.obj & $(OBJS)\monolib_fontmap.obj & + $(OBJS)\monolib_fontutilcmn.obj & $(OBJS)\monolib_framecmn.obj & $(OBJS)\monolib_gaugecmn.obj & $(OBJS)\monolib_gbsizer.obj & @@ -1197,6 +1306,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & + $(OBJS)\monolib_headercolcmn.obj & + $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & $(OBJS)\monolib_iconbndl.obj & $(OBJS)\monolib_imagall.obj & @@ -1225,34 +1336,39 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & $(OBJS)\monolib_radiocmn.obj & + $(OBJS)\monolib_rearrangectrl.obj & $(OBJS)\monolib_rendcmn.obj & $(OBJS)\monolib_rgncmn.obj & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & + $(OBJS)\monolib_spinbuttcmn.obj & + $(OBJS)\monolib_spinctrlcmn.obj & + $(OBJS)\monolib_srchcmn.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_stattextcmn.obj & $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_timercmn.obj & + $(OBJS)\monolib_textentrycmn.obj & $(OBJS)\monolib_toplvcmn.obj & $(OBJS)\monolib_treebase.obj & $(OBJS)\monolib_valgen.obj & $(OBJS)\monolib_validate.obj & $(OBJS)\monolib_valtext.obj & $(OBJS)\monolib_wincmn.obj & + $(OBJS)\monolib_windowid.obj & + $(OBJS)\monolib_wrapsizer.obj & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & $(OBJS)\monolib_buttonbar.obj & $(OBJS)\monolib_choicdgg.obj & $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & $(OBJS)\monolib_combog.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontpickerg.obj & + $(OBJS)\monolib_filectrlg.obj & + $(OBJS)\monolib_headerctrlg.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & @@ -1264,6 +1380,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & $(OBJS)\monolib_splitter.obj & + $(OBJS)\monolib_srchctlg.obj & + $(OBJS)\monolib_statbmpg.obj & + $(OBJS)\monolib_stattextg.obj & $(OBJS)\monolib_textdlgg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_toolbkg.obj & @@ -1277,56 +1396,73 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_animatecmn.obj & + $(OBJS)\monolib_bmpcboxcmn.obj & + $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_datavcmn.obj & + $(OBJS)\monolib_hyperlnkcmn.obj & $(OBJS)\monolib_aboutdlgg.obj & $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_calctrlg.obj & $(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datectlg.obj & + $(OBJS)\monolib_editlbox.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & + $(OBJS)\monolib_grideditors.obj & $(OBJS)\monolib_gridsel.obj & $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlink.obj & + $(OBJS)\monolib_hyperlinkg.obj & $(OBJS)\monolib_laywin.obj & + $(OBJS)\monolib_notifmsgg.obj & $(OBJS)\monolib_odcombo.obj & $(OBJS)\monolib_propdlg.obj & $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_animateg.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_bmpcbox.obj & + $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_datecontrols.obj & $(OBJS)\monolib_datectrl.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_animatecmn.obj & + $(OBJS)\monolib_bmpcboxcmn.obj & + $(OBJS)\monolib_calctrlcmn.obj & $(OBJS)\monolib_datavcmn.obj & + $(OBJS)\monolib_hyperlnkcmn.obj & $(OBJS)\monolib_aboutdlgg.obj & $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_calctrlg.obj & $(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datectlg.obj & + $(OBJS)\monolib_editlbox.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & + $(OBJS)\monolib_grideditors.obj & $(OBJS)\monolib_gridsel.obj & $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlink.obj & + $(OBJS)\monolib_hyperlinkg.obj & $(OBJS)\monolib_laywin.obj & + $(OBJS)\monolib_notifmsgg.obj & $(OBJS)\monolib_odcombo.obj & $(OBJS)\monolib_propdlg.obj & $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_animateg.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 & @@ -1346,6 +1482,14 @@ __baselib___depname = & $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !endif +____wxbase_namedll_DEP = +!ifeq SHARED 1 +____wxbase_namedll_DEP = $(__basedll___depname) +!endif +____wxbase_namelib_DEP = +!ifeq SHARED 0 +____wxbase_namelib_DEP = $(__baselib___depname) +!endif __netdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -1360,6 +1504,14 @@ __netlib___depname = & $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif !endif +____wxnet_namedll_DEP = +!ifeq SHARED 1 +____wxnet_namedll_DEP = $(__netdll___depname) +!endif +____wxnet_namelib_DEP = +!ifeq SHARED 0 +____wxnet_namelib_DEP = $(__netlib___depname) +!endif __coredll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -1390,14 +1542,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dib.obj & $(OBJS)\coredll_display.obj & $(OBJS)\coredll_enhmeta.obj & - $(OBJS)\coredll_evtloop.obj & $(OBJS)\coredll_font.obj & $(OBJS)\coredll_fontenum.obj & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_gdiplus.obj & $(OBJS)\coredll_graphics.obj & - $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_imaglist.obj & $(OBJS)\coredll_minifram.obj & @@ -1413,7 +1564,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & @@ -1423,9 +1573,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_uuid.obj & + $(OBJS)\coredll_clrpickerg.obj & + $(OBJS)\coredll_collpaneg.obj & + $(OBJS)\coredll_filepickerg.obj & + $(OBJS)\coredll_fontpickerg.obj & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_artmsw.obj & $(OBJS)\coredll_bmpbuttn.obj & $(OBJS)\coredll_button.obj & $(OBJS)\coredll_checkbox.obj & @@ -1439,7 +1594,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dragimag.obj & $(OBJS)\coredll_filedlg.obj & $(OBJS)\coredll_frame.obj & - $(OBJS)\coredll_gauge95.obj & + $(OBJS)\coredll_gauge.obj & + $(OBJS)\coredll_headerctrl.obj & $(OBJS)\coredll_iniconf.obj & $(OBJS)\coredll_listbox.obj & $(OBJS)\coredll_listctrl.obj & @@ -1449,28 +1605,31 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_metafile.obj & $(OBJS)\coredll_msgdlg.obj & $(OBJS)\coredll_nativdlg.obj & + $(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 & $(OBJS)\coredll_scrolbar.obj & - $(OBJS)\coredll_slider95.obj & + $(OBJS)\coredll_slider.obj & $(OBJS)\coredll_spinbutt.obj & $(OBJS)\coredll_spinctrl.obj & $(OBJS)\coredll_statbmp.obj & $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statbr95.obj & + $(OBJS)\coredll_statusbar.obj & $(OBJS)\coredll_statline.obj & $(OBJS)\coredll_stattext.obj & - $(OBJS)\coredll_tabctrl.obj & - $(OBJS)\coredll_tbar95.obj & + $(OBJS)\coredll_toolbar.obj & $(OBJS)\coredll_textctrl.obj & + $(OBJS)\coredll_textentry.obj & $(OBJS)\coredll_tglbtn.obj & $(OBJS)\coredll_treectrl.obj & $(OBJS)\coredll_checklst.obj & $(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_fontdlg.obj & + $(OBJS)\coredll_accelcmn.obj & $(OBJS)\coredll_accesscmn.obj & $(OBJS)\coredll_anidecod.obj & $(OBJS)\coredll_appcmn.obj & @@ -1478,6 +1637,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & $(OBJS)\coredll_bookctrl.obj & + $(OBJS)\coredll_btncmn.obj & + $(OBJS)\coredll_cairo.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clrpickercmn.obj & @@ -1493,6 +1654,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dcbufcmn.obj & $(OBJS)\coredll_dcgraph.obj & + $(OBJS)\coredll_dcsvg.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -1501,14 +1663,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dpycmn.obj & $(OBJS)\coredll_dseldlg.obj & $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_evtloopcmn.obj & $(OBJS)\coredll_fddlgcmn.obj & + $(OBJS)\coredll_filectrlcmn.obj & $(OBJS)\coredll_filepickercmn.obj & $(OBJS)\coredll_fontpickercmn.obj & $(OBJS)\coredll_fldlgcmn.obj & $(OBJS)\coredll_fontcmn.obj & $(OBJS)\coredll_fontenumcmn.obj & $(OBJS)\coredll_fontmap.obj & + $(OBJS)\coredll_fontutilcmn.obj & $(OBJS)\coredll_framecmn.obj & $(OBJS)\coredll_gaugecmn.obj & $(OBJS)\coredll_gbsizer.obj & @@ -1516,6 +1679,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & + $(OBJS)\coredll_headercolcmn.obj & + $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & $(OBJS)\coredll_iconbndl.obj & $(OBJS)\coredll_imagall.obj & @@ -1544,34 +1709,39 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & $(OBJS)\coredll_radiocmn.obj & + $(OBJS)\coredll_rearrangectrl.obj & $(OBJS)\coredll_rendcmn.obj & $(OBJS)\coredll_rgncmn.obj & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & + $(OBJS)\coredll_spinbuttcmn.obj & + $(OBJS)\coredll_spinctrlcmn.obj & + $(OBJS)\coredll_srchcmn.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_stattextcmn.obj & $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_timercmn.obj & + $(OBJS)\coredll_textentrycmn.obj & $(OBJS)\coredll_toplvcmn.obj & $(OBJS)\coredll_treebase.obj & $(OBJS)\coredll_valgen.obj & $(OBJS)\coredll_validate.obj & $(OBJS)\coredll_valtext.obj & $(OBJS)\coredll_wincmn.obj & + $(OBJS)\coredll_windowid.obj & + $(OBJS)\coredll_wrapsizer.obj & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & $(OBJS)\coredll_buttonbar.obj & $(OBJS)\coredll_choicdgg.obj & $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & $(OBJS)\coredll_combog.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontpickerg.obj & + $(OBJS)\coredll_filectrlg.obj & + $(OBJS)\coredll_headerctrlg.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & @@ -1583,6 +1753,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & $(OBJS)\coredll_splitter.obj & + $(OBJS)\coredll_srchctlg.obj & + $(OBJS)\coredll_statbmpg.obj & + $(OBJS)\coredll_stattextg.obj & $(OBJS)\coredll_textdlgg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_toolbkg.obj & @@ -1612,14 +1785,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dib.obj & $(OBJS)\coredll_display.obj & $(OBJS)\coredll_enhmeta.obj & - $(OBJS)\coredll_evtloop.obj & $(OBJS)\coredll_font.obj & $(OBJS)\coredll_fontenum.obj & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_gdiplus.obj & $(OBJS)\coredll_graphics.obj & - $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_imaglist.obj & $(OBJS)\coredll_minifram.obj & @@ -1635,7 +1807,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & @@ -1646,22 +1817,24 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_clrpickerg.obj & + $(OBJS)\coredll_collpaneg.obj & $(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_filedlgg.obj & + $(OBJS)\coredll_filepickerg.obj & $(OBJS)\coredll_fontdlgg.obj & + $(OBJS)\coredll_fontpickerg.obj & $(OBJS)\coredll_listctrl.obj & $(OBJS)\coredll_mdig.obj & $(OBJS)\coredll_msgdlgg.obj & $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_tabg.obj & $(OBJS)\coredll_bmpbuttn.obj & $(OBJS)\coredll_button.obj & $(OBJS)\coredll_checkbox.obj & $(OBJS)\coredll_checklst.obj & $(OBJS)\coredll_choice.obj & - $(OBJS)\coredll_colschem.obj & $(OBJS)\coredll_combobox.obj & $(OBJS)\coredll_control.obj & $(OBJS)\coredll_ctrlrend.obj & @@ -1678,6 +1851,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_scrarrow.obj & $(OBJS)\coredll_scrolbar.obj & $(OBJS)\coredll_scrthumb.obj & + $(OBJS)\coredll_settingsuniv.obj & $(OBJS)\coredll_slider.obj & $(OBJS)\coredll_spinbutt.obj & $(OBJS)\coredll_statbmp.obj & @@ -1696,6 +1870,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_metal.obj & $(OBJS)\coredll_mono.obj & $(OBJS)\coredll_win32.obj & + $(OBJS)\coredll_accelcmn.obj & $(OBJS)\coredll_accesscmn.obj & $(OBJS)\coredll_anidecod.obj & $(OBJS)\coredll_appcmn.obj & @@ -1703,6 +1878,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & $(OBJS)\coredll_bookctrl.obj & + $(OBJS)\coredll_btncmn.obj & + $(OBJS)\coredll_cairo.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clrpickercmn.obj & @@ -1718,6 +1895,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dcbufcmn.obj & $(OBJS)\coredll_dcgraph.obj & + $(OBJS)\coredll_dcsvg.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -1726,14 +1904,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dpycmn.obj & $(OBJS)\coredll_dseldlg.obj & $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_evtloopcmn.obj & $(OBJS)\coredll_fddlgcmn.obj & + $(OBJS)\coredll_filectrlcmn.obj & $(OBJS)\coredll_filepickercmn.obj & $(OBJS)\coredll_fontpickercmn.obj & $(OBJS)\coredll_fldlgcmn.obj & $(OBJS)\coredll_fontcmn.obj & $(OBJS)\coredll_fontenumcmn.obj & $(OBJS)\coredll_fontmap.obj & + $(OBJS)\coredll_fontutilcmn.obj & $(OBJS)\coredll_framecmn.obj & $(OBJS)\coredll_gaugecmn.obj & $(OBJS)\coredll_gbsizer.obj & @@ -1741,6 +1920,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & + $(OBJS)\coredll_headercolcmn.obj & + $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & $(OBJS)\coredll_iconbndl.obj & $(OBJS)\coredll_imagall.obj & @@ -1769,34 +1950,39 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & $(OBJS)\coredll_radiocmn.obj & + $(OBJS)\coredll_rearrangectrl.obj & $(OBJS)\coredll_rendcmn.obj & $(OBJS)\coredll_rgncmn.obj & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & + $(OBJS)\coredll_spinbuttcmn.obj & + $(OBJS)\coredll_spinctrlcmn.obj & + $(OBJS)\coredll_srchcmn.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_stattextcmn.obj & $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_timercmn.obj & + $(OBJS)\coredll_textentrycmn.obj & $(OBJS)\coredll_toplvcmn.obj & $(OBJS)\coredll_treebase.obj & $(OBJS)\coredll_valgen.obj & $(OBJS)\coredll_validate.obj & $(OBJS)\coredll_valtext.obj & $(OBJS)\coredll_wincmn.obj & + $(OBJS)\coredll_windowid.obj & + $(OBJS)\coredll_wrapsizer.obj & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & $(OBJS)\coredll_buttonbar.obj & $(OBJS)\coredll_choicdgg.obj & $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & $(OBJS)\coredll_combog.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontpickerg.obj & + $(OBJS)\coredll_filectrlg.obj & + $(OBJS)\coredll_headerctrlg.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & @@ -1808,6 +1994,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & $(OBJS)\coredll_splitter.obj & + $(OBJS)\coredll_srchctlg.obj & + $(OBJS)\coredll_statbmpg.obj & + $(OBJS)\coredll_stattextg.obj & $(OBJS)\coredll_textdlgg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_toolbkg.obj & @@ -1847,14 +2036,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dib.obj & $(OBJS)\corelib_display.obj & $(OBJS)\corelib_enhmeta.obj & - $(OBJS)\corelib_evtloop.obj & $(OBJS)\corelib_font.obj & $(OBJS)\corelib_fontenum.obj & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_gdiplus.obj & $(OBJS)\corelib_graphics.obj & - $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_imaglist.obj & $(OBJS)\corelib_minifram.obj & @@ -1870,7 +2058,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & @@ -1880,9 +2067,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_uuid.obj & + $(OBJS)\corelib_clrpickerg.obj & + $(OBJS)\corelib_collpaneg.obj & + $(OBJS)\corelib_filepickerg.obj & + $(OBJS)\corelib_fontpickerg.obj & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_artmsw.obj & $(OBJS)\corelib_bmpbuttn.obj & $(OBJS)\corelib_button.obj & $(OBJS)\corelib_checkbox.obj & @@ -1896,7 +2088,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dragimag.obj & $(OBJS)\corelib_filedlg.obj & $(OBJS)\corelib_frame.obj & - $(OBJS)\corelib_gauge95.obj & + $(OBJS)\corelib_gauge.obj & + $(OBJS)\corelib_headerctrl.obj & $(OBJS)\corelib_iniconf.obj & $(OBJS)\corelib_listbox.obj & $(OBJS)\corelib_listctrl.obj & @@ -1906,28 +2099,31 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_metafile.obj & $(OBJS)\corelib_msgdlg.obj & $(OBJS)\corelib_nativdlg.obj & + $(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 & $(OBJS)\corelib_scrolbar.obj & - $(OBJS)\corelib_slider95.obj & + $(OBJS)\corelib_slider.obj & $(OBJS)\corelib_spinbutt.obj & $(OBJS)\corelib_spinctrl.obj & $(OBJS)\corelib_statbmp.obj & $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statbr95.obj & + $(OBJS)\corelib_statusbar.obj & $(OBJS)\corelib_statline.obj & $(OBJS)\corelib_stattext.obj & - $(OBJS)\corelib_tabctrl.obj & - $(OBJS)\corelib_tbar95.obj & + $(OBJS)\corelib_toolbar.obj & $(OBJS)\corelib_textctrl.obj & + $(OBJS)\corelib_textentry.obj & $(OBJS)\corelib_tglbtn.obj & $(OBJS)\corelib_treectrl.obj & $(OBJS)\corelib_checklst.obj & $(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_fontdlg.obj & + $(OBJS)\corelib_accelcmn.obj & $(OBJS)\corelib_accesscmn.obj & $(OBJS)\corelib_anidecod.obj & $(OBJS)\corelib_appcmn.obj & @@ -1935,6 +2131,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & $(OBJS)\corelib_bookctrl.obj & + $(OBJS)\corelib_btncmn.obj & + $(OBJS)\corelib_cairo.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clrpickercmn.obj & @@ -1950,6 +2148,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dcbufcmn.obj & $(OBJS)\corelib_dcgraph.obj & + $(OBJS)\corelib_dcsvg.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -1958,14 +2157,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dpycmn.obj & $(OBJS)\corelib_dseldlg.obj & $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_evtloopcmn.obj & $(OBJS)\corelib_fddlgcmn.obj & + $(OBJS)\corelib_filectrlcmn.obj & $(OBJS)\corelib_filepickercmn.obj & $(OBJS)\corelib_fontpickercmn.obj & $(OBJS)\corelib_fldlgcmn.obj & $(OBJS)\corelib_fontcmn.obj & $(OBJS)\corelib_fontenumcmn.obj & $(OBJS)\corelib_fontmap.obj & + $(OBJS)\corelib_fontutilcmn.obj & $(OBJS)\corelib_framecmn.obj & $(OBJS)\corelib_gaugecmn.obj & $(OBJS)\corelib_gbsizer.obj & @@ -1973,6 +2173,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & + $(OBJS)\corelib_headercolcmn.obj & + $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & $(OBJS)\corelib_iconbndl.obj & $(OBJS)\corelib_imagall.obj & @@ -2001,34 +2203,39 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & $(OBJS)\corelib_radiocmn.obj & + $(OBJS)\corelib_rearrangectrl.obj & $(OBJS)\corelib_rendcmn.obj & $(OBJS)\corelib_rgncmn.obj & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & + $(OBJS)\corelib_spinbuttcmn.obj & + $(OBJS)\corelib_spinctrlcmn.obj & + $(OBJS)\corelib_srchcmn.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_stattextcmn.obj & $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_timercmn.obj & + $(OBJS)\corelib_textentrycmn.obj & $(OBJS)\corelib_toplvcmn.obj & $(OBJS)\corelib_treebase.obj & $(OBJS)\corelib_valgen.obj & $(OBJS)\corelib_validate.obj & $(OBJS)\corelib_valtext.obj & $(OBJS)\corelib_wincmn.obj & + $(OBJS)\corelib_windowid.obj & + $(OBJS)\corelib_wrapsizer.obj & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & $(OBJS)\corelib_buttonbar.obj & $(OBJS)\corelib_choicdgg.obj & $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & $(OBJS)\corelib_combog.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontpickerg.obj & + $(OBJS)\corelib_filectrlg.obj & + $(OBJS)\corelib_headerctrlg.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & @@ -2040,6 +2247,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & $(OBJS)\corelib_splitter.obj & + $(OBJS)\corelib_srchctlg.obj & + $(OBJS)\corelib_statbmpg.obj & + $(OBJS)\corelib_stattextg.obj & $(OBJS)\corelib_textdlgg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_toolbkg.obj & @@ -2069,14 +2279,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dib.obj & $(OBJS)\corelib_display.obj & $(OBJS)\corelib_enhmeta.obj & - $(OBJS)\corelib_evtloop.obj & $(OBJS)\corelib_font.obj & $(OBJS)\corelib_fontenum.obj & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_gdiplus.obj & $(OBJS)\corelib_graphics.obj & - $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_imaglist.obj & $(OBJS)\corelib_minifram.obj & @@ -2092,7 +2301,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & @@ -2103,22 +2311,24 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_clrpickerg.obj & + $(OBJS)\corelib_collpaneg.obj & $(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_filedlgg.obj & + $(OBJS)\corelib_filepickerg.obj & $(OBJS)\corelib_fontdlgg.obj & + $(OBJS)\corelib_fontpickerg.obj & $(OBJS)\corelib_listctrl.obj & $(OBJS)\corelib_mdig.obj & $(OBJS)\corelib_msgdlgg.obj & $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_tabg.obj & $(OBJS)\corelib_bmpbuttn.obj & $(OBJS)\corelib_button.obj & $(OBJS)\corelib_checkbox.obj & $(OBJS)\corelib_checklst.obj & $(OBJS)\corelib_choice.obj & - $(OBJS)\corelib_colschem.obj & $(OBJS)\corelib_combobox.obj & $(OBJS)\corelib_control.obj & $(OBJS)\corelib_ctrlrend.obj & @@ -2135,6 +2345,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_scrarrow.obj & $(OBJS)\corelib_scrolbar.obj & $(OBJS)\corelib_scrthumb.obj & + $(OBJS)\corelib_settingsuniv.obj & $(OBJS)\corelib_slider.obj & $(OBJS)\corelib_spinbutt.obj & $(OBJS)\corelib_statbmp.obj & @@ -2153,6 +2364,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_metal.obj & $(OBJS)\corelib_mono.obj & $(OBJS)\corelib_win32.obj & + $(OBJS)\corelib_accelcmn.obj & $(OBJS)\corelib_accesscmn.obj & $(OBJS)\corelib_anidecod.obj & $(OBJS)\corelib_appcmn.obj & @@ -2160,6 +2372,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & $(OBJS)\corelib_bookctrl.obj & + $(OBJS)\corelib_btncmn.obj & + $(OBJS)\corelib_cairo.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clrpickercmn.obj & @@ -2175,6 +2389,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dcbufcmn.obj & $(OBJS)\corelib_dcgraph.obj & + $(OBJS)\corelib_dcsvg.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -2183,14 +2398,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dpycmn.obj & $(OBJS)\corelib_dseldlg.obj & $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_evtloopcmn.obj & $(OBJS)\corelib_fddlgcmn.obj & + $(OBJS)\corelib_filectrlcmn.obj & $(OBJS)\corelib_filepickercmn.obj & $(OBJS)\corelib_fontpickercmn.obj & $(OBJS)\corelib_fldlgcmn.obj & $(OBJS)\corelib_fontcmn.obj & $(OBJS)\corelib_fontenumcmn.obj & $(OBJS)\corelib_fontmap.obj & + $(OBJS)\corelib_fontutilcmn.obj & $(OBJS)\corelib_framecmn.obj & $(OBJS)\corelib_gaugecmn.obj & $(OBJS)\corelib_gbsizer.obj & @@ -2198,6 +2414,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & + $(OBJS)\corelib_headercolcmn.obj & + $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & $(OBJS)\corelib_iconbndl.obj & $(OBJS)\corelib_imagall.obj & @@ -2226,34 +2444,39 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & $(OBJS)\corelib_radiocmn.obj & + $(OBJS)\corelib_rearrangectrl.obj & $(OBJS)\corelib_rendcmn.obj & $(OBJS)\corelib_rgncmn.obj & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & + $(OBJS)\corelib_spinbuttcmn.obj & + $(OBJS)\corelib_spinctrlcmn.obj & + $(OBJS)\corelib_srchcmn.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_stattextcmn.obj & $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_timercmn.obj & + $(OBJS)\corelib_textentrycmn.obj & $(OBJS)\corelib_toplvcmn.obj & $(OBJS)\corelib_treebase.obj & $(OBJS)\corelib_valgen.obj & $(OBJS)\corelib_validate.obj & $(OBJS)\corelib_valtext.obj & $(OBJS)\corelib_wincmn.obj & + $(OBJS)\corelib_windowid.obj & + $(OBJS)\corelib_wrapsizer.obj & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & $(OBJS)\corelib_buttonbar.obj & $(OBJS)\corelib_choicdgg.obj & $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & $(OBJS)\corelib_combog.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontpickerg.obj & + $(OBJS)\corelib_filectrlg.obj & + $(OBJS)\corelib_headerctrlg.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & @@ -2265,6 +2488,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & $(OBJS)\corelib_splitter.obj & + $(OBJS)\corelib_srchctlg.obj & + $(OBJS)\corelib_statbmpg.obj & + $(OBJS)\corelib_stattextg.obj & $(OBJS)\corelib_textdlgg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_toolbkg.obj & @@ -2274,6 +2500,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_vscroll.obj !endif !endif +____wxcore_namedll_DEP = +!ifeq SHARED 1 +____wxcore_namedll_DEP = $(__coredll___depname) +!endif +____wxcore_namelib_DEP = +!ifeq SHARED 0 +____wxcore_namelib_DEP = $(__corelib___depname) +!endif __advdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2287,56 +2521,73 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_animatecmn.obj & + $(OBJS)\advdll_bmpcboxcmn.obj & + $(OBJS)\advdll_calctrlcmn.obj & $(OBJS)\advdll_datavcmn.obj & + $(OBJS)\advdll_hyperlnkcmn.obj & $(OBJS)\advdll_aboutdlgg.obj & $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_calctrlg.obj & $(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datectlg.obj & + $(OBJS)\advdll_editlbox.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & + $(OBJS)\advdll_grideditors.obj & $(OBJS)\advdll_gridsel.obj & $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlink.obj & + $(OBJS)\advdll_hyperlinkg.obj & $(OBJS)\advdll_laywin.obj & + $(OBJS)\advdll_notifmsgg.obj & $(OBJS)\advdll_odcombo.obj & $(OBJS)\advdll_propdlg.obj & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_animateg.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_bmpcbox.obj & + $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_datecontrols.obj & $(OBJS)\advdll_datectrl.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_animatecmn.obj & + $(OBJS)\advdll_bmpcboxcmn.obj & + $(OBJS)\advdll_calctrlcmn.obj & $(OBJS)\advdll_datavcmn.obj & + $(OBJS)\advdll_hyperlnkcmn.obj & $(OBJS)\advdll_aboutdlgg.obj & $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_calctrlg.obj & $(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datectlg.obj & + $(OBJS)\advdll_editlbox.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & + $(OBJS)\advdll_grideditors.obj & $(OBJS)\advdll_gridsel.obj & $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlink.obj & + $(OBJS)\advdll_hyperlinkg.obj & $(OBJS)\advdll_laywin.obj & + $(OBJS)\advdll_notifmsgg.obj & $(OBJS)\advdll_odcombo.obj & $(OBJS)\advdll_propdlg.obj & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_animateg.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 & @@ -2355,61 +2606,86 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = !ifeq WXUNIV 0 ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_animatecmn.obj & + $(OBJS)\advlib_bmpcboxcmn.obj & + $(OBJS)\advlib_calctrlcmn.obj & $(OBJS)\advlib_datavcmn.obj & + $(OBJS)\advlib_hyperlnkcmn.obj & $(OBJS)\advlib_aboutdlgg.obj & $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_calctrlg.obj & $(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datectlg.obj & + $(OBJS)\advlib_editlbox.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & + $(OBJS)\advlib_grideditors.obj & $(OBJS)\advlib_gridsel.obj & $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlink.obj & + $(OBJS)\advlib_hyperlinkg.obj & $(OBJS)\advlib_laywin.obj & + $(OBJS)\advlib_notifmsgg.obj & $(OBJS)\advlib_odcombo.obj & $(OBJS)\advlib_propdlg.obj & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_animateg.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_bmpcbox.obj & + $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_datecontrols.obj & $(OBJS)\advlib_datectrl.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_animatecmn.obj & + $(OBJS)\advlib_bmpcboxcmn.obj & + $(OBJS)\advlib_calctrlcmn.obj & $(OBJS)\advlib_datavcmn.obj & + $(OBJS)\advlib_hyperlnkcmn.obj & $(OBJS)\advlib_aboutdlgg.obj & $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_calctrlg.obj & $(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datectlg.obj & + $(OBJS)\advlib_editlbox.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & + $(OBJS)\advlib_grideditors.obj & $(OBJS)\advlib_gridsel.obj & $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlink.obj & + $(OBJS)\advlib_hyperlinkg.obj & $(OBJS)\advlib_laywin.obj & + $(OBJS)\advlib_notifmsgg.obj & $(OBJS)\advlib_odcombo.obj & $(OBJS)\advlib_propdlg.obj & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_animateg.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 !endif +____wxadv_namedll_DEP = +!ifeq SHARED 1 +____wxadv_namedll_DEP = $(__advdll___depname) +!endif +____wxadv_namelib_DEP = +!ifeq SHARED 0 +____wxadv_namelib_DEP = $(__advlib___depname) +!endif __mediadll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2432,45 +2708,13 @@ __medialib___depname = & !endif !endif !endif -__odbcdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_ODBC 1 -__odbcdll___depname = & - $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll -!endif -!endif -!endif -__odbclib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_ODBC 1 -__odbclib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib -!endif -!endif -!endif -__dbgriddll___depname = -!ifeq MONOLITHIC 0 +____wxmedia_namedll_DEP = !ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_ODBC 1 -__dbgriddll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll -!endif -!endif -!endif +____wxmedia_namedll_DEP = $(__mediadll___depname) !endif -__dbgridlib___depname = -!ifeq MONOLITHIC 0 +____wxmedia_namelib_DEP = !ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_ODBC 1 -__dbgridlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib -!endif -!endif -!endif +____wxmedia_namelib_DEP = $(__medialib___depname) !endif __htmldll___depname = !ifeq MONOLITHIC 0 @@ -2494,6 +2738,14 @@ __htmllib___depname = & !endif !endif !endif +____wxhtml_namedll_DEP = +!ifeq SHARED 1 +____wxhtml_namedll_DEP = $(__htmldll___depname) +!endif +____wxhtml_namelib_DEP = +!ifeq SHARED 0 +____wxhtml_namelib_DEP = $(__htmllib___depname) +!endif __qadll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2516,6 +2768,14 @@ __qalib___depname = & !endif !endif !endif +____wxqa_namedll_DEP = +!ifeq SHARED 1 +____wxqa_namedll_DEP = $(__qadll___depname) +!endif +____wxqa_namelib_DEP = +!ifeq SHARED 0 +____wxqa_namelib_DEP = $(__qalib___depname) +!endif __xmldll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2530,6 +2790,14 @@ __xmllib___depname = & $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib !endif !endif +____wxxml_namedll_DEP = +!ifeq SHARED 1 +____wxxml_namedll_DEP = $(__xmldll___depname) +!endif +____wxxml_namelib_DEP = +!ifeq SHARED 0 +____wxxml_namelib_DEP = $(__xmllib___depname) +!endif __xrcdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2548,6 +2816,14 @@ __xrclib___depname = & !endif !endif !endif +____wxxrc_namedll_DEP = +!ifeq SHARED 1 +____wxxrc_namedll_DEP = $(__xrcdll___depname) +!endif +____wxxrc_namelib_DEP = +!ifeq SHARED 0 +____wxxrc_namelib_DEP = $(__xrclib___depname) +!endif __auidll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2566,6 +2842,40 @@ __auilib___depname = & !endif !endif !endif +____wxaui_namedll_DEP = +!ifeq SHARED 1 +____wxaui_namedll_DEP = $(__auidll___depname) +!endif +____wxaui_namelib_DEP = +!ifeq SHARED 0 +____wxaui_namelib_DEP = $(__auilib___depname) +!endif +__propgriddll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_PROPGRID 1 +__propgriddll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_wat$(VENDORTAG).dll +!endif +!endif +!endif +__propgridlib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_PROPGRID 1 +__propgridlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib +!endif +!endif +!endif +____wxpropgrid_namedll_DEP = +!ifeq SHARED 1 +____wxpropgrid_namedll_DEP = $(__propgriddll___depname) +!endif +____wxpropgrid_namelib_DEP = +!ifeq SHARED 0 +____wxpropgrid_namelib_DEP = $(__propgridlib___depname) +!endif __richtextdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -2584,6 +2894,40 @@ __richtextlib___depname = & !endif !endif !endif +____wxrichtext_namedll_DEP = +!ifeq SHARED 1 +____wxrichtext_namedll_DEP = $(__richtextdll___depname) +!endif +____wxrichtext_namelib_DEP = +!ifeq SHARED 0 +____wxrichtext_namelib_DEP = $(__richtextlib___depname) +!endif +__stcdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_STC 1 +__stcdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll +!endif +!endif +!endif +__stclib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_STC 1 +__stclib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +!endif +!endif +!endif +____wxstc_namedll_DEP = +!ifeq SHARED 1 +____wxstc_namedll_DEP = $(__stcdll___depname) +!endif +____wxstc_namelib_DEP = +!ifeq SHARED 0 +____wxstc_namelib_DEP = $(__stclib___depname) +!endif __gldll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 @@ -2617,6 +2961,39 @@ __gllib___depname = & !endif !endif !endif +____wxgl_namedll_DEP = +!ifeq SHARED 1 +____wxgl_namedll_DEP = $(__gldll___depname) +!endif +____wxgl_namelib_DEP = +!ifeq SHARED 0 +____wxgl_namelib_DEP = $(__gllib___depname) +!endif +__wxscintilla = +!ifeq USE_STC 1 +__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib +!endif +__htmldll_library_link_DEP = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +!ifeq USE_HTML 1 +__htmldll_library_link_DEP = $(__htmldll___depname) +!endif +!endif +!endif +!endif +__htmldll_library_link_LIBR = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +!ifeq USE_HTML 1 +__htmldll_library_link_LIBR = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!endif +!endif +!endif __DEBUGINFO_3 = !ifeq BUILD debug !ifeq DEBUG_INFO default @@ -2728,6 +3105,9 @@ __THREAD_DEFINE_p = __THREAD_DEFINE_p = -dwxNO_THREADS !endif __UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif @@ -2751,19 +3131,20 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" & - USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" & + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" & + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 27 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_RELEASE_NODOT = 29 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +COMPILER_PREFIX = wat OBJS = & - wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & @@ -2859,8 +3240,8 @@ WXJPEG_OBJECTS = & $(OBJS)\wxjpeg_jquant2.obj & $(OBJS)\wxjpeg_jdmerge.obj WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=..\..\src\zlib -i=..\..\src\jpeg -wcd=124 $(CPPFLAGS) & - $(CFLAGS) + $(__RUNTIME_LIBS) -i=..\..\src\zlib -i=..\..\src\jpeg & + -i=..\..\src\tiff\libtiff -wcd=124 $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = & $(OBJS)\wxtiff_tif_win32.obj & $(OBJS)\wxtiff_tif_aux.obj & @@ -2877,20 +3258,21 @@ WXTIFF_OBJECTS = & $(OBJS)\wxtiff_tif_extension.obj & $(OBJS)\wxtiff_tif_fax3.obj & $(OBJS)\wxtiff_tif_fax3sm.obj & + $(OBJS)\wxtiff_tif_flush.obj & $(OBJS)\wxtiff_tif_getimage.obj & $(OBJS)\wxtiff_tif_jpeg.obj & - $(OBJS)\wxtiff_tif_flush.obj & - $(OBJS)\wxtiff_tif_lzw.obj & $(OBJS)\wxtiff_tif_luv.obj & + $(OBJS)\wxtiff_tif_lzw.obj & $(OBJS)\wxtiff_tif_next.obj & + $(OBJS)\wxtiff_tif_ojpeg.obj & $(OBJS)\wxtiff_tif_open.obj & $(OBJS)\wxtiff_tif_packbits.obj & $(OBJS)\wxtiff_tif_pixarlog.obj & $(OBJS)\wxtiff_tif_predict.obj & $(OBJS)\wxtiff_tif_print.obj & $(OBJS)\wxtiff_tif_read.obj & - $(OBJS)\wxtiff_tif_swab.obj & $(OBJS)\wxtiff_tif_strip.obj & + $(OBJS)\wxtiff_tif_swab.obj & $(OBJS)\wxtiff_tif_thunder.obj & $(OBJS)\wxtiff_tif_tile.obj & $(OBJS)\wxtiff_tif_version.obj & @@ -2903,28 +3285,130 @@ WXEXPAT_OBJECTS = & $(OBJS)\wxexpat_xmlparse.obj & $(OBJS)\wxexpat_xmlrole.obj & $(OBJS)\wxexpat_xmltok.obj +WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -i=..\..\src\stc\scintilla\include & + -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +WXSCINTILLA_OBJECTS = & + $(OBJS)\wxscintilla_AutoComplete.obj & + $(OBJS)\wxscintilla_CallTip.obj & + $(OBJS)\wxscintilla_CellBuffer.obj & + $(OBJS)\wxscintilla_CharClassify.obj & + $(OBJS)\wxscintilla_ContractionState.obj & + $(OBJS)\wxscintilla_Decoration.obj & + $(OBJS)\wxscintilla_Document.obj & + $(OBJS)\wxscintilla_DocumentAccessor.obj & + $(OBJS)\wxscintilla_Editor.obj & + $(OBJS)\wxscintilla_ExternalLexer.obj & + $(OBJS)\wxscintilla_Indicator.obj & + $(OBJS)\wxscintilla_KeyMap.obj & + $(OBJS)\wxscintilla_KeyWords.obj & + $(OBJS)\wxscintilla_LexAPDL.obj & + $(OBJS)\wxscintilla_LexAU3.obj & + $(OBJS)\wxscintilla_LexASY.obj & + $(OBJS)\wxscintilla_LexAVE.obj & + $(OBJS)\wxscintilla_LexAbaqus.obj & + $(OBJS)\wxscintilla_LexAda.obj & + $(OBJS)\wxscintilla_LexAsm.obj & + $(OBJS)\wxscintilla_LexAsn1.obj & + $(OBJS)\wxscintilla_LexBaan.obj & + $(OBJS)\wxscintilla_LexBash.obj & + $(OBJS)\wxscintilla_LexBasic.obj & + $(OBJS)\wxscintilla_LexBullant.obj & + $(OBJS)\wxscintilla_LexCLW.obj & + $(OBJS)\wxscintilla_LexCmake.obj & + $(OBJS)\wxscintilla_LexCPP.obj & + $(OBJS)\wxscintilla_LexCSS.obj & + $(OBJS)\wxscintilla_LexCaml.obj & + $(OBJS)\wxscintilla_LexCsound.obj & + $(OBJS)\wxscintilla_LexConf.obj & + $(OBJS)\wxscintilla_LexCrontab.obj & + $(OBJS)\wxscintilla_LexD.obj & + $(OBJS)\wxscintilla_LexEScript.obj & + $(OBJS)\wxscintilla_LexEiffel.obj & + $(OBJS)\wxscintilla_LexErlang.obj & + $(OBJS)\wxscintilla_LexFlagship.obj & + $(OBJS)\wxscintilla_LexForth.obj & + $(OBJS)\wxscintilla_LexFortran.obj & + $(OBJS)\wxscintilla_LexGAP.obj & + $(OBJS)\wxscintilla_LexGui4Cli.obj & + $(OBJS)\wxscintilla_LexHTML.obj & + $(OBJS)\wxscintilla_LexHaskell.obj & + $(OBJS)\wxscintilla_LexInno.obj & + $(OBJS)\wxscintilla_LexKix.obj & + $(OBJS)\wxscintilla_LexLisp.obj & + $(OBJS)\wxscintilla_LexLout.obj & + $(OBJS)\wxscintilla_LexLua.obj & + $(OBJS)\wxscintilla_LexMMIXAL.obj & + $(OBJS)\wxscintilla_LexMPT.obj & + $(OBJS)\wxscintilla_LexMSSQL.obj & + $(OBJS)\wxscintilla_LexMatlab.obj & + $(OBJS)\wxscintilla_LexMetapost.obj & + $(OBJS)\wxscintilla_LexNsis.obj & + $(OBJS)\wxscintilla_LexOpal.obj & + $(OBJS)\wxscintilla_LexOthers.obj & + $(OBJS)\wxscintilla_LexPB.obj & + $(OBJS)\wxscintilla_LexPLM.obj & + $(OBJS)\wxscintilla_LexPOV.obj & + $(OBJS)\wxscintilla_LexProgress.obj & + $(OBJS)\wxscintilla_LexPS.obj & + $(OBJS)\wxscintilla_LexPascal.obj & + $(OBJS)\wxscintilla_LexPerl.obj & + $(OBJS)\wxscintilla_LexPython.obj & + $(OBJS)\wxscintilla_LexR.obj & + $(OBJS)\wxscintilla_LexRebol.obj & + $(OBJS)\wxscintilla_LexRuby.obj & + $(OBJS)\wxscintilla_LexSQL.obj & + $(OBJS)\wxscintilla_LexSmalltalk.obj & + $(OBJS)\wxscintilla_LexTADS3.obj & + $(OBJS)\wxscintilla_LexScriptol.obj & + $(OBJS)\wxscintilla_LexSpecman.obj & + $(OBJS)\wxscintilla_LexSpice.obj & + $(OBJS)\wxscintilla_LexTCL.obj & + $(OBJS)\wxscintilla_LexTeX.obj & + $(OBJS)\wxscintilla_LexVB.obj & + $(OBJS)\wxscintilla_LexVHDL.obj & + $(OBJS)\wxscintilla_LexVerilog.obj & + $(OBJS)\wxscintilla_LexYAML.obj & + $(OBJS)\wxscintilla_LineMarker.obj & + $(OBJS)\wxscintilla_PositionCache.obj & + $(OBJS)\wxscintilla_PropSet.obj & + $(OBJS)\wxscintilla_RESearch.obj & + $(OBJS)\wxscintilla_RunStyles.obj & + $(OBJS)\wxscintilla_ScintillaBase.obj & + $(OBJS)\wxscintilla_Style.obj & + $(OBJS)\wxscintilla_StyleContext.obj & + $(OBJS)\wxscintilla_UniConversion.obj & + $(OBJS)\wxscintilla_ViewStyle.obj & + $(OBJS)\wxscintilla_WindowAccessor.obj & + $(OBJS)\wxscintilla_XPM.obj MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -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 $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL & - /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) + -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ & + -dSCI_LEXER -dLINK_LEXERS /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = & $(OBJS)\monodll_dummy.obj & $(OBJS)\monodll_appbase.obj & $(OBJS)\monodll_arcall.obj & $(OBJS)\monodll_arcfind.obj & $(OBJS)\monodll_archive.obj & + $(OBJS)\monodll_arrstr.obj & + $(OBJS)\monodll_base64.obj & $(OBJS)\monodll_clntdata.obj & $(OBJS)\monodll_cmdline.obj & $(OBJS)\monodll_config.obj & @@ -2936,6 +3420,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_dynlib.obj & $(OBJS)\monodll_dynload.obj & $(OBJS)\monodll_encconv.obj & + $(OBJS)\monodll_evtloopcmn.obj & $(OBJS)\monodll_extended.obj & $(OBJS)\monodll_ffile.obj & $(OBJS)\monodll_file.obj & @@ -2972,16 +3457,25 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_strconv.obj & $(OBJS)\monodll_stream.obj & $(OBJS)\monodll_string.obj & + $(OBJS)\monodll_stringimpl.obj & + $(OBJS)\monodll_stringops.obj & + $(OBJS)\monodll_strvararg.obj & $(OBJS)\monodll_sysopt.obj & $(OBJS)\monodll_tarstrm.obj & $(OBJS)\monodll_textbuf.obj & $(OBJS)\monodll_textfile.obj & + $(OBJS)\monodll_timercmn.obj & + $(OBJS)\monodll_timerimpl.obj & $(OBJS)\monodll_tokenzr.obj & $(OBJS)\monodll_txtstrm.obj & + $(OBJS)\monodll_unichar.obj & $(OBJS)\monodll_uri.obj & + $(OBJS)\monodll_ustring.obj & $(OBJS)\monodll_variant.obj & $(OBJS)\monodll_wfstream.obj & - $(OBJS)\monodll_wxchar.obj & + $(OBJS)\monodll_wxcrt.obj & + $(OBJS)\monodll_wxprintf.obj & + $(OBJS)\monodll_xlocale.obj & $(OBJS)\monodll_xti.obj & $(OBJS)\monodll_xtistrm.obj & $(OBJS)\monodll_zipstrm.obj & @@ -3000,12 +3494,14 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_stackwalk.obj & $(OBJS)\monodll_stdpaths.obj & $(OBJS)\monodll_thread.obj & + $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_utils.obj & $(OBJS)\monodll_utilsexc.obj & $(OBJS)\monodll_event.obj & $(OBJS)\monodll_fs_mem.obj & $(OBJS)\monodll_msgout.obj & $(OBJS)\monodll_utilscmn.obj & + $(OBJS)\monodll_evtloop.obj & $(OBJS)\monodll_main.obj & $(OBJS)\monodll_mslu.obj & $(OBJS)\monodll_volume.obj & @@ -3019,7 +3515,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_sckstrm.obj & $(OBJS)\monodll_socket.obj & $(OBJS)\monodll_url.obj & - $(OBJS)\monodll_gsocket.obj & + $(OBJS)\monodll_sockmsw.obj & $(OBJS)\monodll_urlmsw.obj & $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) & $(OBJS)\monodll_xml.obj & @@ -3028,23 +3524,29 @@ MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -dwxUSE_BASE=1 -i=..\..\src\stc\scintilla\include & + -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & + $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -dwxUSE_BASE=1 -i=..\..\src\stc\scintilla\include & + -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & + /fh=$(OBJS)\wxprec_monolib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = & $(OBJS)\monolib_dummy.obj & $(OBJS)\monolib_appbase.obj & $(OBJS)\monolib_arcall.obj & $(OBJS)\monolib_arcfind.obj & $(OBJS)\monolib_archive.obj & + $(OBJS)\monolib_arrstr.obj & + $(OBJS)\monolib_base64.obj & $(OBJS)\monolib_clntdata.obj & $(OBJS)\monolib_cmdline.obj & $(OBJS)\monolib_config.obj & @@ -3056,6 +3558,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_dynlib.obj & $(OBJS)\monolib_dynload.obj & $(OBJS)\monolib_encconv.obj & + $(OBJS)\monolib_evtloopcmn.obj & $(OBJS)\monolib_extended.obj & $(OBJS)\monolib_ffile.obj & $(OBJS)\monolib_file.obj & @@ -3092,16 +3595,25 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_strconv.obj & $(OBJS)\monolib_stream.obj & $(OBJS)\monolib_string.obj & + $(OBJS)\monolib_stringimpl.obj & + $(OBJS)\monolib_stringops.obj & + $(OBJS)\monolib_strvararg.obj & $(OBJS)\monolib_sysopt.obj & $(OBJS)\monolib_tarstrm.obj & $(OBJS)\monolib_textbuf.obj & $(OBJS)\monolib_textfile.obj & + $(OBJS)\monolib_timercmn.obj & + $(OBJS)\monolib_timerimpl.obj & $(OBJS)\monolib_tokenzr.obj & $(OBJS)\monolib_txtstrm.obj & + $(OBJS)\monolib_unichar.obj & $(OBJS)\monolib_uri.obj & + $(OBJS)\monolib_ustring.obj & $(OBJS)\monolib_variant.obj & $(OBJS)\monolib_wfstream.obj & - $(OBJS)\monolib_wxchar.obj & + $(OBJS)\monolib_wxcrt.obj & + $(OBJS)\monolib_wxprintf.obj & + $(OBJS)\monolib_xlocale.obj & $(OBJS)\monolib_xti.obj & $(OBJS)\monolib_xtistrm.obj & $(OBJS)\monolib_zipstrm.obj & @@ -3120,12 +3632,14 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_stackwalk.obj & $(OBJS)\monolib_stdpaths.obj & $(OBJS)\monolib_thread.obj & + $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_utils.obj & $(OBJS)\monolib_utilsexc.obj & $(OBJS)\monolib_event.obj & $(OBJS)\monolib_fs_mem.obj & $(OBJS)\monolib_msgout.obj & $(OBJS)\monolib_utilscmn.obj & + $(OBJS)\monolib_evtloop.obj & $(OBJS)\monolib_main.obj & $(OBJS)\monolib_mslu.obj & $(OBJS)\monolib_volume.obj & @@ -3139,7 +3653,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_sckstrm.obj & $(OBJS)\monolib_socket.obj & $(OBJS)\monolib_url.obj & - $(OBJS)\monolib_gsocket.obj & + $(OBJS)\monolib_sockmsw.obj & $(OBJS)\monolib_urlmsw.obj & $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) & $(OBJS)\monolib_xml.obj & @@ -3148,16 +3662,16 @@ BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & /fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3167,6 +3681,8 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_arcall.obj & $(OBJS)\basedll_arcfind.obj & $(OBJS)\basedll_archive.obj & + $(OBJS)\basedll_arrstr.obj & + $(OBJS)\basedll_base64.obj & $(OBJS)\basedll_clntdata.obj & $(OBJS)\basedll_cmdline.obj & $(OBJS)\basedll_config.obj & @@ -3178,6 +3694,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_dynlib.obj & $(OBJS)\basedll_dynload.obj & $(OBJS)\basedll_encconv.obj & + $(OBJS)\basedll_evtloopcmn.obj & $(OBJS)\basedll_extended.obj & $(OBJS)\basedll_ffile.obj & $(OBJS)\basedll_file.obj & @@ -3214,16 +3731,25 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_strconv.obj & $(OBJS)\basedll_stream.obj & $(OBJS)\basedll_string.obj & + $(OBJS)\basedll_stringimpl.obj & + $(OBJS)\basedll_stringops.obj & + $(OBJS)\basedll_strvararg.obj & $(OBJS)\basedll_sysopt.obj & $(OBJS)\basedll_tarstrm.obj & $(OBJS)\basedll_textbuf.obj & $(OBJS)\basedll_textfile.obj & + $(OBJS)\basedll_timercmn.obj & + $(OBJS)\basedll_timerimpl.obj & $(OBJS)\basedll_tokenzr.obj & $(OBJS)\basedll_txtstrm.obj & + $(OBJS)\basedll_unichar.obj & $(OBJS)\basedll_uri.obj & + $(OBJS)\basedll_ustring.obj & $(OBJS)\basedll_variant.obj & $(OBJS)\basedll_wfstream.obj & - $(OBJS)\basedll_wxchar.obj & + $(OBJS)\basedll_wxcrt.obj & + $(OBJS)\basedll_wxprintf.obj & + $(OBJS)\basedll_xlocale.obj & $(OBJS)\basedll_xti.obj & $(OBJS)\basedll_xtistrm.obj & $(OBJS)\basedll_zipstrm.obj & @@ -3242,12 +3768,14 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_stackwalk.obj & $(OBJS)\basedll_stdpaths.obj & $(OBJS)\basedll_thread.obj & + $(OBJS)\basedll_timer.obj & $(OBJS)\basedll_utils.obj & $(OBJS)\basedll_utilsexc.obj & $(OBJS)\basedll_event.obj & $(OBJS)\basedll_fs_mem.obj & $(OBJS)\basedll_msgout.obj & $(OBJS)\basedll_utilscmn.obj & + $(OBJS)\basedll_evtloop.obj & $(OBJS)\basedll_main.obj & $(OBJS)\basedll_mslu.obj & $(OBJS)\basedll_volume.obj @@ -3255,15 +3783,15 @@ BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 & /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3273,6 +3801,8 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_arcall.obj & $(OBJS)\baselib_arcfind.obj & $(OBJS)\baselib_archive.obj & + $(OBJS)\baselib_arrstr.obj & + $(OBJS)\baselib_base64.obj & $(OBJS)\baselib_clntdata.obj & $(OBJS)\baselib_cmdline.obj & $(OBJS)\baselib_config.obj & @@ -3284,6 +3814,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_dynlib.obj & $(OBJS)\baselib_dynload.obj & $(OBJS)\baselib_encconv.obj & + $(OBJS)\baselib_evtloopcmn.obj & $(OBJS)\baselib_extended.obj & $(OBJS)\baselib_ffile.obj & $(OBJS)\baselib_file.obj & @@ -3320,16 +3851,25 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_strconv.obj & $(OBJS)\baselib_stream.obj & $(OBJS)\baselib_string.obj & + $(OBJS)\baselib_stringimpl.obj & + $(OBJS)\baselib_stringops.obj & + $(OBJS)\baselib_strvararg.obj & $(OBJS)\baselib_sysopt.obj & $(OBJS)\baselib_tarstrm.obj & $(OBJS)\baselib_textbuf.obj & $(OBJS)\baselib_textfile.obj & + $(OBJS)\baselib_timercmn.obj & + $(OBJS)\baselib_timerimpl.obj & $(OBJS)\baselib_tokenzr.obj & $(OBJS)\baselib_txtstrm.obj & + $(OBJS)\baselib_unichar.obj & $(OBJS)\baselib_uri.obj & + $(OBJS)\baselib_ustring.obj & $(OBJS)\baselib_variant.obj & $(OBJS)\baselib_wfstream.obj & - $(OBJS)\baselib_wxchar.obj & + $(OBJS)\baselib_wxcrt.obj & + $(OBJS)\baselib_wxprintf.obj & + $(OBJS)\baselib_xlocale.obj & $(OBJS)\baselib_xti.obj & $(OBJS)\baselib_xtistrm.obj & $(OBJS)\baselib_zipstrm.obj & @@ -3348,12 +3888,14 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_stackwalk.obj & $(OBJS)\baselib_stdpaths.obj & $(OBJS)\baselib_thread.obj & + $(OBJS)\baselib_timer.obj & $(OBJS)\baselib_utils.obj & $(OBJS)\baselib_utilsexc.obj & $(OBJS)\baselib_event.obj & $(OBJS)\baselib_fs_mem.obj & $(OBJS)\baselib_msgout.obj & $(OBJS)\baselib_utilscmn.obj & + $(OBJS)\baselib_evtloop.obj & $(OBJS)\baselib_main.obj & $(OBJS)\baselib_mslu.obj & $(OBJS)\baselib_volume.obj @@ -3361,8 +3903,8 @@ NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET & /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3378,14 +3920,14 @@ NETDLL_OBJECTS = & $(OBJS)\netdll_sckstrm.obj & $(OBJS)\netdll_socket.obj & $(OBJS)\netdll_url.obj & - $(OBJS)\netdll_gsocket.obj & + $(OBJS)\netdll_sockmsw.obj & $(OBJS)\netdll_urlmsw.obj NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = & @@ -3400,14 +3942,14 @@ NETLIB_OBJECTS = & $(OBJS)\netlib_sckstrm.obj & $(OBJS)\netlib_socket.obj & $(OBJS)\netlib_url.obj & - $(OBJS)\netlib_gsocket.obj & + $(OBJS)\netlib_sockmsw.obj & $(OBJS)\netlib_urlmsw.obj COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 & /fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3417,6 +3959,7 @@ COREDLL_OBJECTS = & $(OBJS)\coredll_fs_mem.obj & $(OBJS)\coredll_msgout.obj & $(OBJS)\coredll_utilscmn.obj & + $(OBJS)\coredll_evtloop.obj & $(OBJS)\coredll_main.obj & $(OBJS)\coredll_mslu.obj & $(OBJS)\coredll_volume.obj & @@ -3425,8 +3968,8 @@ CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = & @@ -3435,6 +3978,7 @@ CORELIB_OBJECTS = & $(OBJS)\corelib_fs_mem.obj & $(OBJS)\corelib_msgout.obj & $(OBJS)\corelib_utilscmn.obj & + $(OBJS)\corelib_evtloop.obj & $(OBJS)\corelib_main.obj & $(OBJS)\corelib_mslu.obj & $(OBJS)\corelib_volume.obj & @@ -3443,8 +3987,8 @@ ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV & /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3455,8 +3999,8 @@ ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = & @@ -3466,8 +4010,8 @@ MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA & /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3476,13 +4020,13 @@ MEDIADLL_OBJECTS = & $(OBJS)\mediadll_mediactrlcmn.obj & $(OBJS)\mediadll_mediactrl_am.obj & $(OBJS)\mediadll_mediactrl_wmp10.obj & - $(OBJS)\mediadll_activex.obj + $(OBJS)\mediadll_mediactrl_qt.obj MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = & @@ -3490,61 +4034,13 @@ MEDIALIB_OBJECTS = & $(OBJS)\medialib_mediactrlcmn.obj & $(OBJS)\medialib_mediactrl_am.obj & $(OBJS)\medialib_mediactrl_wmp10.obj & - $(OBJS)\medialib_activex.obj -ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC & - /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -ODBCDLL_OBJECTS = & - $(OBJS)\odbcdll_dummy.obj & - $(OBJS)\odbcdll_db.obj & - $(OBJS)\odbcdll_dbtable.obj -ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -ODBCLIB_OBJECTS = & - $(OBJS)\odbclib_dummy.obj & - $(OBJS)\odbclib_db.obj & - $(OBJS)\odbclib_dbtable.obj -DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID & - /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -DBGRIDDLL_OBJECTS = & - $(OBJS)\dbgriddll_dummy.obj & - $(OBJS)\dbgriddll_dbgrid.obj -DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -DBGRIDLIB_OBJECTS = & - $(OBJS)\dbgridlib_dummy.obj & - $(OBJS)\dbgridlib_dbgrid.obj + $(OBJS)\medialib_mediactrl_qt.obj HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML & /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3578,8 +4074,8 @@ HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = & @@ -3612,8 +4108,8 @@ QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA & /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3625,8 +4121,8 @@ QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = & @@ -3637,8 +4133,8 @@ XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML & /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3650,8 +4146,8 @@ XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = & @@ -3662,8 +4158,8 @@ XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC & /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3701,6 +4197,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_notbk.obj & $(OBJS)\xrcdll_xh_odcombo.obj & $(OBJS)\xrcdll_xh_panel.obj & + $(OBJS)\xrcdll_xh_propdlg.obj & $(OBJS)\xrcdll_xh_radbt.obj & $(OBJS)\xrcdll_xh_radbx.obj & $(OBJS)\xrcdll_xh_scrol.obj & @@ -3710,6 +4207,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_slidr.obj & $(OBJS)\xrcdll_xh_spin.obj & $(OBJS)\xrcdll_xh_split.obj & + $(OBJS)\xrcdll_xh_srchctrl.obj & $(OBJS)\xrcdll_xh_statbar.obj & $(OBJS)\xrcdll_xh_stbmp.obj & $(OBJS)\xrcdll_xh_stbox.obj & @@ -3723,13 +4221,14 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_unkwn.obj & $(OBJS)\xrcdll_xh_wizrd.obj & $(OBJS)\xrcdll_xmlres.obj & + $(OBJS)\xrcdll_xmladv.obj & $(OBJS)\xrcdll_xmlrsall.obj XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = & @@ -3766,6 +4265,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_notbk.obj & $(OBJS)\xrclib_xh_odcombo.obj & $(OBJS)\xrclib_xh_panel.obj & + $(OBJS)\xrclib_xh_propdlg.obj & $(OBJS)\xrclib_xh_radbt.obj & $(OBJS)\xrclib_xh_radbx.obj & $(OBJS)\xrclib_xh_scrol.obj & @@ -3775,6 +4275,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_slidr.obj & $(OBJS)\xrclib_xh_spin.obj & $(OBJS)\xrclib_xh_split.obj & + $(OBJS)\xrclib_xh_srchctrl.obj & $(OBJS)\xrclib_xh_statbar.obj & $(OBJS)\xrclib_xh_stbmp.obj & $(OBJS)\xrclib_xh_stbox.obj & @@ -3788,13 +4289,14 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_unkwn.obj & $(OBJS)\xrclib_xh_wizrd.obj & $(OBJS)\xrclib_xmlres.obj & + $(OBJS)\xrclib_xmladv.obj & $(OBJS)\xrclib_xmlrsall.obj AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI & /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3804,13 +4306,14 @@ AUIDLL_OBJECTS = & $(OBJS)\auidll_dockart.obj & $(OBJS)\auidll_floatpane.obj & $(OBJS)\auidll_auibook.obj & + $(OBJS)\auidll_auibar.obj & $(OBJS)\auidll_tabmdi.obj AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) AUILIB_OBJECTS = & @@ -3819,13 +4322,51 @@ AUILIB_OBJECTS = & $(OBJS)\auilib_dockart.obj & $(OBJS)\auilib_floatpane.obj & $(OBJS)\auilib_auibook.obj & + $(OBJS)\auilib_auibar.obj & $(OBJS)\auilib_tabmdi.obj +PROPGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -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 & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID & + /fh=$(OBJS)\wxprec_propgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) +PROPGRIDDLL_OBJECTS = & + $(OBJS)\propgriddll_dummy.obj & + $(OBJS)\propgriddll_advprops.obj & + $(OBJS)\propgriddll_editors.obj & + $(OBJS)\propgriddll_manager.obj & + $(OBJS)\propgriddll_property.obj & + $(OBJS)\propgriddll_propgrid.obj & + $(OBJS)\propgriddll_propgridiface.obj & + $(OBJS)\propgriddll_propgridpagestate.obj & + $(OBJS)\propgriddll_props.obj +PROPGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -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 & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_propgridlib.pch $(__RTTIFLAG) & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +PROPGRIDLIB_OBJECTS = & + $(OBJS)\propgridlib_dummy.obj & + $(OBJS)\propgridlib_advprops.obj & + $(OBJS)\propgridlib_editors.obj & + $(OBJS)\propgridlib_manager.obj & + $(OBJS)\propgridlib_property.obj & + $(OBJS)\propgridlib_propgrid.obj & + $(OBJS)\propgridlib_propgridiface.obj & + $(OBJS)\propgridlib_propgridpagestate.obj & + $(OBJS)\propgridlib_props.obj RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT & /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3844,8 +4385,8 @@ RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = & @@ -3859,28 +4400,60 @@ RICHTEXTLIB_OBJECTS = & $(OBJS)\richtextlib_richtextsymboldlg.obj & $(OBJS)\richtextlib_richtextstyledlg.obj & $(OBJS)\richtextlib_richtextprint.obj +STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -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 & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include & + -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & + -dWXUSINGDLL -dWXMAKINGDLL_STC /fh=$(OBJS)\wxprec_stcdll.pch $(__RTTIFLAG) & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +STCDLL_OBJECTS = & + $(OBJS)\stcdll_dummy.obj & + $(OBJS)\stcdll_stc.obj & + $(OBJS)\stcdll_PlatWX.obj & + $(OBJS)\stcdll_ScintillaWX.obj +STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -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 & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include & + -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & + /fh=$(OBJS)\wxprec_stclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +STCLIB_OBJECTS = & + $(OBJS)\stclib_dummy.obj & + $(OBJS)\stclib_stc.obj & + $(OBJS)\stclib_PlatWX.obj & + $(OBJS)\stclib_ScintillaWX.obj GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL & /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) GLDLL_OBJECTS = & $(OBJS)\gldll_dummy.obj & + $(OBJS)\gldll_glcmn.obj & $(OBJS)\gldll_glcanvas.obj GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -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 & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = & $(OBJS)\gllib_dummy.obj & + $(OBJS)\gllib_glcmn.obj & $(OBJS)\gllib_glcanvas.obj BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg @@ -3891,7 +4464,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file +all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -3905,6 +4478,7 @@ clean : .SYMBOLIC -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -3923,12 +4497,6 @@ clean : .SYMBOLIC -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib @@ -3944,9 +4512,15 @@ clean : .SYMBOLIC -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib @@ -3992,16 +4566,23 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS) @for %i in ($(WXEXPAT_OBJECTS)) do @%append $(OBJS)\wxexpat.lbc +%i wlib -q -p4096 -n -b $^@ @$(OBJS)\wxexpat.lbc +!ifeq USE_STC 1 +$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib : $(WXSCINTILLA_OBJECTS) + @%create $(OBJS)\wxscintilla.lbc + @for %i in ($(WXSCINTILLA_OBJECTS)) do @%append $(OBJS)\wxscintilla.lbc +%i + wlib -q -p4096 -n -b $^@ @$(OBJS)\wxscintilla.lbc +!endif + !ifeq MONOLITHIC 1 !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) @%create $(OBJS)\monodll.lbc @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ @%append $(OBJS)\monodll.lbc option caseexact - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\monodll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc option resource=$(OBJS)\monodll_version.res @%append $(OBJS)\monodll.lbc system nt_dll wlink @$(OBJS)\monodll.lbc @@ -4020,14 +4601,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res @%create $(OBJS)\basedll.lbc @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ @%append $(OBJS)\basedll.lbc option caseexact - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\basedll.lbc library %i + @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\basedll.lbc library %i @%append $(OBJS)\basedll.lbc option resource=$(OBJS)\basedll_version.res @%append $(OBJS)\basedll.lbc system nt_dll wlink @$(OBJS)\basedll.lbc @@ -4044,16 +4625,20 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !endif !endif +!ifeq MONOLITHIC 0 +wxbase : .SYMBOLIC $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) @%create $(OBJS)\netdll.lbc @%append $(OBJS)\netdll.lbc option quiet @%append $(OBJS)\netdll.lbc name $^@ @%append $(OBJS)\netdll.lbc option caseexact - @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\netdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i + @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i @%append $(OBJS)\netdll.lbc option resource=$(OBJS)\netdll_version.res @%append $(OBJS)\netdll.lbc system nt_dll wlink @$(OBJS)\netdll.lbc @@ -4070,17 +4655,21 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !endif !endif +!ifeq MONOLITHIC 0 +wxnet : .SYMBOLIC $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) @%create $(OBJS)\coredll.lbc @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ @%append $(OBJS)\coredll.lbc option caseexact - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc option resource=$(OBJS)\coredll_version.res @%append $(OBJS)\coredll.lbc system nt_dll wlink @$(OBJS)\coredll.lbc @@ -4100,17 +4689,23 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_GUI 1 +wxcore : .SYMBOLIC $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\advdll.lbc @%append $(OBJS)\advdll.lbc option quiet @%append $(OBJS)\advdll.lbc name $^@ @%append $(OBJS)\advdll.lbc option caseexact - @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\advdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc option resource=$(OBJS)\advdll_version.res @%append $(OBJS)\advdll.lbc system nt_dll wlink @$(OBJS)\advdll.lbc @@ -4130,18 +4725,24 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_GUI 1 +wxadv : .SYMBOLIC $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_MEDIA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll : $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll : $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\mediadll.lbc @%append $(OBJS)\mediadll.lbc option quiet @%append $(OBJS)\mediadll.lbc name $^@ @%append $(OBJS)\mediadll.lbc option caseexact - @%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\mediadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\mediadll.lbc library %i @%append $(OBJS)\mediadll.lbc option resource=$(OBJS)\mediadll_version.res @%append $(OBJS)\mediadll.lbc system nt_dll wlink @$(OBJS)\mediadll.lbc @@ -4165,65 +4766,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_ODBC 1 -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - @%create $(OBJS)\odbcdll.lbc - @%append $(OBJS)\odbcdll.lbc option quiet - @%append $(OBJS)\odbcdll.lbc name $^@ - @%append $(OBJS)\odbcdll.lbc option caseexact - @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i - @%append $(OBJS)\odbcdll.lbc option resource=$(OBJS)\odbcdll_version.res - @%append $(OBJS)\odbcdll.lbc system nt_dll - wlink @$(OBJS)\odbcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_ODBC 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib : $(ODBCLIB_OBJECTS) - @%create $(OBJS)\odbclib.lbc - @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\odbclib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 !ifeq USE_GUI 1 -!ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll : $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\dbgriddll.lbc - @%append $(OBJS)\dbgriddll.lbc option quiet - @%append $(OBJS)\dbgriddll.lbc name $^@ - @%append $(OBJS)\dbgriddll.lbc option caseexact - @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i - @%append $(OBJS)\dbgriddll.lbc option resource=$(OBJS)\dbgriddll_version.res - @%append $(OBJS)\dbgriddll.lbc system nt_dll - wlink @$(OBJS)\dbgriddll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib : $(DBGRIDLIB_OBJECTS) - @%create $(OBJS)\dbgridlib.lbc - @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\dbgridlib.lbc -!endif +!ifeq USE_MEDIA 1 +wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) !endif !endif !endif @@ -4232,14 +4777,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\htmldll.lbc @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ @%append $(OBJS)\htmldll.lbc option caseexact - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc option resource=$(OBJS)\htmldll_version.res @%append $(OBJS)\htmldll.lbc system nt_dll wlink @$(OBJS)\htmldll.lbc @@ -4262,18 +4807,24 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_HTML 1 +wxhtml : .SYMBOLIC $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_QA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll : $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll : $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) @%create $(OBJS)\qadll.lbc @%append $(OBJS)\qadll.lbc option quiet @%append $(OBJS)\qadll.lbc name $^@ @%append $(OBJS)\qadll.lbc option caseexact - @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\qadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i @%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res @%append $(OBJS)\qadll.lbc system nt_dll wlink @$(OBJS)\qadll.lbc @@ -4296,16 +4847,22 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_QA 1 +wxqa : .SYMBOLIC $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) @%create $(OBJS)\xmldll.lbc @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ @%append $(OBJS)\xmldll.lbc option caseexact - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i + @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc option resource=$(OBJS)\xmldll_version.res @%append $(OBJS)\xmldll.lbc system nt_dll wlink @$(OBJS)\xmldll.lbc @@ -4322,17 +4879,21 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !endif !endif +!ifeq MONOLITHIC 0 +wxxml : .SYMBOLIC $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll : $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll : $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) @%create $(OBJS)\xrcdll.lbc @%append $(OBJS)\xrcdll.lbc option quiet @%append $(OBJS)\xrcdll.lbc name $^@ @%append $(OBJS)\xrcdll.lbc option caseexact - @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\xrcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res @%append $(OBJS)\xrcdll.lbc system nt_dll wlink @$(OBJS)\xrcdll.lbc @@ -4352,17 +4913,23 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_XRC 1 +wxxrc : .SYMBOLIC $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_AUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll : $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll : $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\auidll.lbc @%append $(OBJS)\auidll.lbc option quiet @%append $(OBJS)\auidll.lbc name $^@ @%append $(OBJS)\auidll.lbc option caseexact - @%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\auidll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i @%append $(OBJS)\auidll.lbc option resource=$(OBJS)\auidll_version.res @%append $(OBJS)\auidll.lbc system nt_dll wlink @$(OBJS)\auidll.lbc @@ -4382,17 +4949,59 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_AUI 1 +wxaui : .SYMBOLIC $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_PROPGRID 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_wat$(VENDORTAG).dll : $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) + @%create $(OBJS)\propgriddll.lbc + @%append $(OBJS)\propgriddll.lbc option quiet + @%append $(OBJS)\propgriddll.lbc name $^@ + @%append $(OBJS)\propgriddll.lbc option caseexact + @%append $(OBJS)\propgriddll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) + @for %i in ($(PROPGRIDDLL_OBJECTS)) do @%append $(OBJS)\propgriddll.lbc file %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\propgriddll.lbc library %i + @%append $(OBJS)\propgriddll.lbc option resource=$(OBJS)\propgriddll_version.res + @%append $(OBJS)\propgriddll.lbc system nt_dll + wlink @$(OBJS)\propgriddll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib +$^@ +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_PROPGRID 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib : $(PROPGRIDLIB_OBJECTS) + @%create $(OBJS)\propgridlib.lbc + @for %i in ($(PROPGRIDLIB_OBJECTS)) do @%append $(OBJS)\propgridlib.lbc +%i + wlib -q -p4096 -n -b $^@ @$(OBJS)\propgridlib.lbc +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq USE_PROPGRID 1 +wxpropgrid : .SYMBOLIC $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_RICHTEXT 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll : $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll : $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\richtextdll.lbc @%append $(OBJS)\richtextdll.lbc option quiet @%append $(OBJS)\richtextdll.lbc name $^@ @%append $(OBJS)\richtextdll.lbc option caseexact - @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\richtextdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res @%append $(OBJS)\richtextdll.lbc system nt_dll wlink @$(OBJS)\richtextdll.lbc @@ -4412,17 +5021,59 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq USE_RICHTEXT 1 +wxrichtext : .SYMBOLIC $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_STC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll : $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) + @%create $(OBJS)\stcdll.lbc + @%append $(OBJS)\stcdll.lbc option quiet + @%append $(OBJS)\stcdll.lbc name $^@ + @%append $(OBJS)\stcdll.lbc option caseexact + @%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) + @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i + @%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res + @%append $(OBJS)\stcdll.lbc system nt_dll + wlink @$(OBJS)\stcdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +$^@ +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_STC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib : $(STCLIB_OBJECTS) $(__wxscintilla) + @%create $(OBJS)\stclib.lbc + @for %i in ($(STCLIB_OBJECTS)) do @%append $(OBJS)\stclib.lbc +%i + wlib -q -p4096 -n -b $^@ @$(OBJS)\stclib.lbc +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq USE_STC 1 +wxstc : .SYMBOLIC $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) +!endif +!endif + !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) @%create $(OBJS)\gldll.lbc @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ @%append $(OBJS)\gldll.lbc option caseexact - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i @%append $(OBJS)\gldll.lbc option resource=$(OBJS)\gldll_version.res @%append $(OBJS)\gldll.lbc system nt_dll wlink @$(OBJS)\gldll.lbc @@ -4442,6 +5093,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq USE_GUI 1 +!ifeq USE_OPENGL 1 +wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +!endif +!endif + samples : .SYMBOLIC cd ..\..\samples wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all @@ -4470,8 +5127,8 @@ $(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=7 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -4489,7 +5146,6 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE) @@ -4738,109 +5394,112 @@ $(OBJS)\wxjpeg_jquant2.obj : .AUTODEPEND ..\..\src\jpeg\jquant2.c $(OBJS)\wxjpeg_jdmerge.obj : .AUTODEPEND ..\..\src\jpeg\jdmerge.c $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< -$(OBJS)\wxtiff_tif_win32.obj : .AUTODEPEND ..\..\src\tiff\tif_win32.c +$(OBJS)\wxtiff_tif_win32.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_win32.c + $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< + +$(OBJS)\wxtiff_tif_aux.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_aux.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_aux.obj : .AUTODEPEND ..\..\src\tiff\tif_aux.c +$(OBJS)\wxtiff_tif_close.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_close.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_close.obj : .AUTODEPEND ..\..\src\tiff\tif_close.c +$(OBJS)\wxtiff_tif_codec.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_codec.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_codec.obj : .AUTODEPEND ..\..\src\tiff\tif_codec.c +$(OBJS)\wxtiff_tif_color.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_color.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_color.obj : .AUTODEPEND ..\..\src\tiff\tif_color.c +$(OBJS)\wxtiff_tif_compress.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_compress.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_compress.obj : .AUTODEPEND ..\..\src\tiff\tif_compress.c +$(OBJS)\wxtiff_tif_dir.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dir.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_dir.obj : .AUTODEPEND ..\..\src\tiff\tif_dir.c +$(OBJS)\wxtiff_tif_dirinfo.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirinfo.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_dirinfo.obj : .AUTODEPEND ..\..\src\tiff\tif_dirinfo.c +$(OBJS)\wxtiff_tif_dirread.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirread.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_dirread.obj : .AUTODEPEND ..\..\src\tiff\tif_dirread.c +$(OBJS)\wxtiff_tif_dirwrite.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirwrite.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_dirwrite.obj : .AUTODEPEND ..\..\src\tiff\tif_dirwrite.c +$(OBJS)\wxtiff_tif_dumpmode.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dumpmode.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_dumpmode.obj : .AUTODEPEND ..\..\src\tiff\tif_dumpmode.c +$(OBJS)\wxtiff_tif_error.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_error.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_error.obj : .AUTODEPEND ..\..\src\tiff\tif_error.c +$(OBJS)\wxtiff_tif_extension.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_extension.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_extension.obj : .AUTODEPEND ..\..\src\tiff\tif_extension.c +$(OBJS)\wxtiff_tif_fax3.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_fax3.obj : .AUTODEPEND ..\..\src\tiff\tif_fax3.c +$(OBJS)\wxtiff_tif_fax3sm.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3sm.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_fax3sm.obj : .AUTODEPEND ..\..\src\tiff\tif_fax3sm.c +$(OBJS)\wxtiff_tif_flush.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_flush.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_getimage.obj : .AUTODEPEND ..\..\src\tiff\tif_getimage.c +$(OBJS)\wxtiff_tif_getimage.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_getimage.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_jpeg.obj : .AUTODEPEND ..\..\src\tiff\tif_jpeg.c +$(OBJS)\wxtiff_tif_jpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_flush.obj : .AUTODEPEND ..\..\src\tiff\tif_flush.c +$(OBJS)\wxtiff_tif_luv.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_luv.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_lzw.obj : .AUTODEPEND ..\..\src\tiff\tif_lzw.c +$(OBJS)\wxtiff_tif_lzw.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzw.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_luv.obj : .AUTODEPEND ..\..\src\tiff\tif_luv.c +$(OBJS)\wxtiff_tif_next.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_next.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_next.obj : .AUTODEPEND ..\..\src\tiff\tif_next.c +$(OBJS)\wxtiff_tif_ojpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_ojpeg.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_open.obj : .AUTODEPEND ..\..\src\tiff\tif_open.c +$(OBJS)\wxtiff_tif_open.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_open.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_packbits.obj : .AUTODEPEND ..\..\src\tiff\tif_packbits.c +$(OBJS)\wxtiff_tif_packbits.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_packbits.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_pixarlog.obj : .AUTODEPEND ..\..\src\tiff\tif_pixarlog.c +$(OBJS)\wxtiff_tif_pixarlog.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_pixarlog.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_predict.obj : .AUTODEPEND ..\..\src\tiff\tif_predict.c +$(OBJS)\wxtiff_tif_predict.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_predict.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_print.obj : .AUTODEPEND ..\..\src\tiff\tif_print.c +$(OBJS)\wxtiff_tif_print.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_print.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_read.obj : .AUTODEPEND ..\..\src\tiff\tif_read.c +$(OBJS)\wxtiff_tif_read.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_read.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_swab.obj : .AUTODEPEND ..\..\src\tiff\tif_swab.c +$(OBJS)\wxtiff_tif_strip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_strip.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_strip.obj : .AUTODEPEND ..\..\src\tiff\tif_strip.c +$(OBJS)\wxtiff_tif_swab.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_swab.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_thunder.obj : .AUTODEPEND ..\..\src\tiff\tif_thunder.c +$(OBJS)\wxtiff_tif_thunder.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_thunder.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_tile.obj : .AUTODEPEND ..\..\src\tiff\tif_tile.c +$(OBJS)\wxtiff_tif_tile.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_tile.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_version.obj : .AUTODEPEND ..\..\src\tiff\tif_version.c +$(OBJS)\wxtiff_tif_version.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_version.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_warning.obj : .AUTODEPEND ..\..\src\tiff\tif_warning.c +$(OBJS)\wxtiff_tif_warning.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_warning.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_write.obj : .AUTODEPEND ..\..\src\tiff\tif_write.c +$(OBJS)\wxtiff_tif_write.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_write.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< -$(OBJS)\wxtiff_tif_zip.obj : .AUTODEPEND ..\..\src\tiff\tif_zip.c +$(OBJS)\wxtiff_tif_zip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_zip.c $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< $(OBJS)\wxexpat_xmlparse.obj : .AUTODEPEND ..\..\src\expat\lib\xmlparse.c @@ -4852,12 +5511,285 @@ $(OBJS)\wxexpat_xmlrole.obj : .AUTODEPEND ..\..\src\expat\lib\xmlrole.c $(OBJS)\wxexpat_xmltok.obj : .AUTODEPEND ..\..\src\expat\lib\xmltok.c $(CC) -bt=nt -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< +$(OBJS)\wxscintilla_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_Decoration.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Decoration.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexASY.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexASY.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAbaqus.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAbaqus.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCmake.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCmake.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexD.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexD.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexGAP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGAP.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPLM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPLM.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexProgress.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexProgress.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexR.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexR.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_PositionCache.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PositionCache.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_RunStyles.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RunStyles.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + +$(OBJS)\wxscintilla_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx + $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< + $(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG) $< - $(OBJS)\monodll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4870,6 +5802,12 @@ $(OBJS)\monodll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp $(OBJS)\monodll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4903,6 +5841,9 @@ $(OBJS)\monodll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp $(OBJS)\monodll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c $(CC) -bt=nt -zq -fo=$^@ $(MONODLL_CFLAGS) $< @@ -5011,6 +5952,15 @@ $(OBJS)\monodll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp $(OBJS)\monodll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5023,22 +5973,40 @@ $(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(OBJS)\monodll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -5095,6 +6063,9 @@ $(OBJS)\monodll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp $(OBJS)\monodll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5113,6 +6084,9 @@ $(OBJS)\monodll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\monodll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5152,12 +6126,15 @@ $(OBJS)\monodll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp +$(OBJS)\monodll_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5176,7 +6153,7 @@ $(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp +$(OBJS)\monodll_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp @@ -5197,25 +6174,25 @@ $(OBJS)\monodll_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp $(OBJS)\monodll_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp +$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp +$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp +$(OBJS)\monodll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp +$(OBJS)\monodll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp @@ -5242,21 +6219,12 @@ $(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5269,7 +6237,7 @@ $(OBJS)\monodll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\monodll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp +$(OBJS)\monodll_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp @@ -5278,9 +6246,6 @@ $(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(OBJS)\monodll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5299,6 +6264,15 @@ $(OBJS)\monodll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp $(OBJS)\monodll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5311,7 +6285,7 @@ $(OBJS)\monodll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp $(OBJS)\monodll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp +$(OBJS)\monodll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp @@ -5386,21 +6360,12 @@ $(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(OBJS)\monodll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_db.obj : .AUTODEPEND ..\..\src\common\db.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5497,6 +6462,9 @@ $(OBJS)\monodll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monodll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5524,6 +6492,9 @@ $(OBJS)\monodll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp $(OBJS)\monodll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5563,6 +6534,9 @@ $(OBJS)\monodll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp $(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5578,9 +6552,36 @@ $(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5608,6 +6609,15 @@ $(OBJS)\monodll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtexts $(OBJS)\monodll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5699,11 +6709,6 @@ $(OBJS)\monodll_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5730,12 +6735,12 @@ $(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp +$(OBJS)\monodll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp +$(OBJS)\monodll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -5814,11 +6819,6 @@ $(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5864,6 +6864,26 @@ $(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -5995,6 +7015,20 @@ $(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -6093,6 +7127,20 @@ $(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -6163,6 +7211,20 @@ $(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -6219,6 +7281,11 @@ $(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp !endif !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6254,6 +7321,16 @@ $(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6329,6 +7406,11 @@ $(OBJS)\monodll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6370,12 +7452,12 @@ $(OBJS)\monodll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp +$(OBJS)\monodll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp +$(OBJS)\monodll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6409,6 +7491,11 @@ $(OBJS)\monodll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6444,6 +7531,16 @@ $(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.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) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6584,6 +7681,11 @@ $(OBJS)\monodll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6604,11 +7706,31 @@ $(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6625,7 +7747,7 @@ $(OBJS)\monodll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp +$(OBJS)\monodll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6660,37 +7782,37 @@ $(OBJS)\monodll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp +$(OBJS)\monodll_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp +$(OBJS)\monodll_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp +$(OBJS)\monodll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp +$(OBJS)\monodll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp +$(OBJS)\monodll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp +$(OBJS)\monodll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp +$(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6715,12 +7837,12 @@ $(OBJS)\monodll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp +$(OBJS)\monodll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp +$(OBJS)\monodll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6779,6 +7901,21 @@ $(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6819,11 +7956,26 @@ $(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(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_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.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) $< @@ -6835,7 +7987,7 @@ $(OBJS)\monodll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp +$(OBJS)\monodll_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6849,6 +8001,11 @@ $(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6859,6 +8016,11 @@ $(OBJS)\monodll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6870,7 +8032,7 @@ $(OBJS)\monodll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp +$(OBJS)\monodll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6879,6 +8041,11 @@ $(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6909,6 +8076,11 @@ $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(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) $< @@ -6922,12 +8094,12 @@ $(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp +$(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp +$(OBJS)\monodll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6946,6 +8118,9 @@ $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.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 $< + $(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6961,6 +8136,12 @@ $(OBJS)\monolib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp $(OBJS)\monolib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6994,6 +8175,9 @@ $(OBJS)\monolib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp $(OBJS)\monolib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c $(CC) -bt=nt -zq -fo=$^@ $(MONOLIB_CFLAGS) $< @@ -7099,7 +8283,16 @@ $(OBJS)\monolib_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp $(OBJS)\monolib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp +$(OBJS)\monolib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp @@ -7114,22 +8307,40 @@ $(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(OBJS)\monolib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -7186,6 +8397,9 @@ $(OBJS)\monolib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp $(OBJS)\monolib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7204,6 +8418,9 @@ $(OBJS)\monolib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\monolib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7243,12 +8460,15 @@ $(OBJS)\monolib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp +$(OBJS)\monolib_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7267,7 +8487,7 @@ $(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp +$(OBJS)\monolib_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp @@ -7288,25 +8508,25 @@ $(OBJS)\monolib_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp $(OBJS)\monolib_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp +$(OBJS)\monolib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp +$(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp +$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp +$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp +$(OBJS)\monolib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp +$(OBJS)\monolib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp @@ -7333,21 +8553,12 @@ $(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7360,7 +8571,7 @@ $(OBJS)\monolib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\monolib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp +$(OBJS)\monolib_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp @@ -7369,9 +8580,6 @@ $(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(OBJS)\monolib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7390,6 +8598,15 @@ $(OBJS)\monolib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp $(OBJS)\monolib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7402,7 +8619,7 @@ $(OBJS)\monolib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp $(OBJS)\monolib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp +$(OBJS)\monolib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp @@ -7477,21 +8694,12 @@ $(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(OBJS)\monolib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7588,6 +8796,9 @@ $(OBJS)\monolib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monolib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7615,6 +8826,9 @@ $(OBJS)\monolib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp $(OBJS)\monolib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7654,6 +8868,9 @@ $(OBJS)\monolib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp $(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7669,9 +8886,36 @@ $(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7699,6 +8943,15 @@ $(OBJS)\monolib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtexts $(OBJS)\monolib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7790,11 +9043,6 @@ $(OBJS)\monolib_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7821,12 +9069,12 @@ $(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp +$(OBJS)\monolib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp +$(OBJS)\monolib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -7905,11 +9153,6 @@ $(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7955,6 +9198,26 @@ $(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -8086,6 +9349,20 @@ $(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -8184,6 +9461,20 @@ $(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -8254,6 +9545,20 @@ $(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -8310,6 +9615,11 @@ $(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp !endif !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8345,6 +9655,16 @@ $(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8420,6 +9740,11 @@ $(OBJS)\monolib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8461,12 +9786,12 @@ $(OBJS)\monolib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp +$(OBJS)\monolib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp +$(OBJS)\monolib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8500,6 +9825,11 @@ $(OBJS)\monolib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8535,6 +9865,16 @@ $(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.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) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8675,6 +10015,11 @@ $(OBJS)\monolib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8695,11 +10040,31 @@ $(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8716,7 +10081,7 @@ $(OBJS)\monolib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp +$(OBJS)\monolib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8751,37 +10116,37 @@ $(OBJS)\monolib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp +$(OBJS)\monolib_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp +$(OBJS)\monolib_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp +$(OBJS)\monolib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp +$(OBJS)\monolib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp +$(OBJS)\monolib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp +$(OBJS)\monolib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp +$(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8806,12 +10171,12 @@ $(OBJS)\monolib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp +$(OBJS)\monolib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp +$(OBJS)\monolib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8870,6 +10235,21 @@ $(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8910,11 +10290,26 @@ $(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(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_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.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) $< @@ -8926,7 +10321,7 @@ $(OBJS)\monolib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp +$(OBJS)\monolib_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8940,6 +10335,11 @@ $(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8950,6 +10350,11 @@ $(OBJS)\monolib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8961,12 +10366,17 @@ $(OBJS)\monolib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp +$(OBJS)\monolib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp +$(OBJS)\monolib_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -9000,6 +10410,11 @@ $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(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) $< @@ -9013,12 +10428,12 @@ $(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp +$(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp +$(OBJS)\monolib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -9041,7 +10456,7 @@ $(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_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 -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG) $< + 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=wxbase$(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_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $< $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9055,6 +10470,12 @@ $(OBJS)\basedll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp $(OBJS)\basedll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9088,6 +10509,9 @@ $(OBJS)\basedll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp $(OBJS)\basedll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c $(CC) -bt=nt -zq -fo=$^@ $(BASEDLL_CFLAGS) $< @@ -9196,6 +10620,15 @@ $(OBJS)\basedll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp $(OBJS)\basedll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9208,22 +10641,40 @@ $(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(OBJS)\basedll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -9280,6 +10731,9 @@ $(OBJS)\basedll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp $(OBJS)\basedll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9298,6 +10752,9 @@ $(OBJS)\basedll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\basedll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9322,6 +10779,12 @@ $(OBJS)\baselib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp $(OBJS)\baselib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9355,6 +10818,9 @@ $(OBJS)\baselib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp $(OBJS)\baselib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c $(CC) -bt=nt -zq -fo=$^@ $(BASELIB_CFLAGS) $< @@ -9463,6 +10929,15 @@ $(OBJS)\baselib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp $(OBJS)\baselib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9475,22 +10950,40 @@ $(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(OBJS)\baselib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -9547,6 +11040,9 @@ $(OBJS)\baselib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp $(OBJS)\baselib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9565,6 +11061,9 @@ $(OBJS)\baselib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\baselib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9578,7 +11077,7 @@ $(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_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 -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG) $< + 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=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $< $(OBJS)\netdll_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< @@ -9610,7 +11109,7 @@ $(OBJS)\netdll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< -$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp +$(OBJS)\netdll_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp @@ -9649,7 +11148,7 @@ $(OBJS)\netlib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< -$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp +$(OBJS)\netlib_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< $(OBJS)\netlib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp @@ -9659,7 +11158,7 @@ $(OBJS)\coredll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_wat$(VENDORTAG) $< + 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)_core_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $< $(OBJS)\coredll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9673,6 +11172,9 @@ $(OBJS)\coredll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9682,6 +11184,9 @@ $(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9700,7 +11205,7 @@ $(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp +$(OBJS)\coredll_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp @@ -9721,25 +11226,25 @@ $(OBJS)\coredll_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp $(OBJS)\coredll_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp +$(OBJS)\coredll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp +$(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp +$(OBJS)\coredll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp +$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp +$(OBJS)\coredll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp +$(OBJS)\coredll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp @@ -9766,21 +11271,12 @@ $(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9793,7 +11289,7 @@ $(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\coredll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp +$(OBJS)\coredll_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp @@ -9802,9 +11298,6 @@ $(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(OBJS)\coredll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9908,11 +11401,6 @@ $(OBJS)\coredll_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9939,12 +11427,12 @@ $(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp +$(OBJS)\coredll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp +$(OBJS)\coredll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -10023,11 +11511,6 @@ $(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10073,6 +11556,26 @@ $(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -10204,6 +11707,20 @@ $(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -10302,6 +11819,20 @@ $(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -10372,6 +11903,20 @@ $(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -10428,6 +11973,11 @@ $(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp !endif !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10463,6 +12013,16 @@ $(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10538,6 +12098,11 @@ $(OBJS)\coredll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10579,12 +12144,12 @@ $(OBJS)\coredll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp +$(OBJS)\coredll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp +$(OBJS)\coredll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -10618,6 +12183,11 @@ $(OBJS)\coredll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10653,6 +12223,16 @@ $(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.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) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10793,6 +12373,11 @@ $(OBJS)\coredll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10813,11 +12398,31 @@ $(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10834,7 +12439,7 @@ $(OBJS)\coredll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp +$(OBJS)\coredll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -10869,37 +12474,37 @@ $(OBJS)\coredll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp +$(OBJS)\coredll_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp +$(OBJS)\coredll_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp +$(OBJS)\coredll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp +$(OBJS)\coredll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp +$(OBJS)\coredll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp +$(OBJS)\coredll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp +$(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -10924,12 +12529,12 @@ $(OBJS)\coredll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp +$(OBJS)\coredll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp +$(OBJS)\coredll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -10988,6 +12593,21 @@ $(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11038,6 +12658,9 @@ $(OBJS)\corelib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp $(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11047,6 +12670,9 @@ $(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11065,7 +12691,7 @@ $(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp +$(OBJS)\corelib_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp @@ -11086,25 +12712,25 @@ $(OBJS)\corelib_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp $(OBJS)\corelib_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp +$(OBJS)\corelib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp +$(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp +$(OBJS)\corelib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp +$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp +$(OBJS)\corelib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp +$(OBJS)\corelib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp @@ -11131,21 +12757,12 @@ $(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11158,16 +12775,13 @@ $(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\corelib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp +$(OBJS)\corelib_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp +$(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp @@ -11273,11 +12887,6 @@ $(OBJS)\corelib_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11304,12 +12913,12 @@ $(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp +$(OBJS)\corelib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp +$(OBJS)\corelib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -11388,11 +12997,6 @@ $(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11438,6 +13042,26 @@ $(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -11569,6 +13193,20 @@ $(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -11667,6 +13305,20 @@ $(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -11737,6 +13389,20 @@ $(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -11793,6 +13459,11 @@ $(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp !endif !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11828,6 +13499,16 @@ $(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11903,6 +13584,11 @@ $(OBJS)\corelib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11944,12 +13630,12 @@ $(OBJS)\corelib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp +$(OBJS)\corelib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp +$(OBJS)\corelib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -11983,6 +13669,11 @@ $(OBJS)\corelib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12018,6 +13709,16 @@ $(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.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) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12158,6 +13859,11 @@ $(OBJS)\corelib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12178,11 +13884,31 @@ $(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12199,7 +13925,7 @@ $(OBJS)\corelib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp +$(OBJS)\corelib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -12234,37 +13960,37 @@ $(OBJS)\corelib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp +$(OBJS)\corelib_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp +$(OBJS)\corelib_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp +$(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp +$(OBJS)\corelib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp +$(OBJS)\corelib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp +$(OBJS)\corelib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp +$(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -12289,12 +14015,12 @@ $(OBJS)\corelib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp +$(OBJS)\corelib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp +$(OBJS)\corelib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -12353,6 +14079,21 @@ $(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12392,7 +14133,16 @@ $(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_wat$(VENDORTAG) $< + 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)_adv_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $< + +$(OBJS)\advdll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -12400,16 +14150,25 @@ $(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(OBJS)\advdll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.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_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp +$(OBJS)\advdll_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp @@ -12418,24 +14177,33 @@ $(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp $(OBJS)\advdll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp +$(OBJS)\advdll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -12454,6 +14222,9 @@ $(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(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) $< @@ -12462,10 +14233,10 @@ $(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< !endif -$(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp +$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp +$(OBJS)\advdll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp @@ -12480,22 +14251,40 @@ $(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.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_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp +$(OBJS)\advlib_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp @@ -12504,24 +14293,33 @@ $(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp $(OBJS)\advlib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp +$(OBJS)\advlib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -12540,6 +14338,9 @@ $(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(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) $< @@ -12548,10 +14349,10 @@ $(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< !endif -$(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp +$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp +$(OBJS)\advlib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp @@ -12567,7 +14368,7 @@ $(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< $(OBJS)\mediadll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG) $< + 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)_media_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $< $(OBJS)\mediadll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< @@ -12578,7 +14379,7 @@ $(OBJS)\mediadll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp $(OBJS)\mediadll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< -$(OBJS)\mediadll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp +$(OBJS)\mediadll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< $(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp @@ -12593,50 +14394,14 @@ $(OBJS)\medialib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp $(OBJS)\medialib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< -$(OBJS)\medialib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp +$(OBJS)\medialib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< -$(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< - -$(OBJS)\odbcdll_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 -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG) $< - -$(OBJS)\odbcdll_db.obj : .AUTODEPEND ..\..\src\common\db.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< - -$(OBJS)\odbcdll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< - -$(OBJS)\odbclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< - -$(OBJS)\odbclib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< - -$(OBJS)\odbclib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< - -$(OBJS)\dbgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $< - -$(OBJS)\dbgriddll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG) $< - -$(OBJS)\dbgriddll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $< - -$(OBJS)\dbgridlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $< - -$(OBJS)\dbgridlib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $< - $(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< $(OBJS)\htmldll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG) $< + 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)_html_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $< $(OBJS)\htmldll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< @@ -12789,7 +14554,7 @@ $(OBJS)\qadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $< $(OBJS)\qadll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG) $< + 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)_qa_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $< $(OBJS)\qadll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $< @@ -12810,7 +14575,7 @@ $(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< $(OBJS)\xmldll_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 -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG) $< + 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=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $< $(OBJS)\xmldll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< @@ -12831,7 +14596,7 @@ $(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< $(OBJS)\xrcdll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG) $< + 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)_xrc_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $< $(OBJS)\xrcdll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -12929,6 +14694,9 @@ $(OBJS)\xrcdll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrcdll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -12956,6 +14724,9 @@ $(OBJS)\xrcdll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp $(OBJS)\xrcdll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -12995,6 +14766,9 @@ $(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp $(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -13097,6 +14871,9 @@ $(OBJS)\xrclib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrclib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -13124,6 +14901,9 @@ $(OBJS)\xrclib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp $(OBJS)\xrclib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -13163,6 +14943,9 @@ $(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp $(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -13170,7 +14953,7 @@ $(OBJS)\auidll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< $(OBJS)\auidll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG) $< + 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)_aui_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $< $(OBJS)\auidll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< @@ -13184,6 +14967,9 @@ $(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< +$(OBJS)\auidll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< + $(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< @@ -13202,14 +14988,74 @@ $(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< +$(OBJS)\auilib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< + $(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< +$(OBJS)\propgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_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)_propgrid_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID $< + +$(OBJS)\propgriddll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgriddll_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< + +$(OBJS)\propgridlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + +$(OBJS)\propgridlib_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< + $(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< $(OBJS)\richtextdll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG) $< + 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)_richtext_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $< $(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< @@ -13268,11 +15114,41 @@ $(OBJS)\richtextlib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richt $(OBJS)\richtextlib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< +$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_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)_stc_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $< + +$(OBJS)\stcdll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< $(OBJS)\gldll_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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG) $< + 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)_gl_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $< + +$(OBJS)\gldll_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< $(OBJS)\gldll_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< @@ -13280,6 +15156,9 @@ $(OBJS)\gldll_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp $(OBJS)\gllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< +$(OBJS)\gllib_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< + $(OBJS)\gllib_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $<