X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4996f26121bacb8ce4dc4a0f00c638f6b6b802bb..cc9d56b036df991f594e3b73596287ef6a207ea2:/build/msw/makefile.wat diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index f60c791e4f..2c4f9788d2 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -85,7 +85,7 @@ __monodll___depname = !ifeq MONOLITHIC 1 !ifeq SHARED 1 __monodll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll !endif !endif ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = @@ -103,9 +103,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & - $(OBJS)\monodll_joystick.obj & $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & + $(OBJS)\monodll_joystick.obj & $(OBJS)\monodll_helpbest.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -130,7 +130,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_htmllbox.obj & $(OBJS)\monodll_db.obj & $(OBJS)\monodll_dbtable.obj & - $(OBJS)\monodll_dbgrid.obj + $(OBJS)\monodll_dbgrid.obj & + $(OBJS)\monodll_xh_bmpbt.obj & + $(OBJS)\monodll_xh_bmp.obj & + $(OBJS)\monodll_xh_bttn.obj & + $(OBJS)\monodll_xh_cald.obj & + $(OBJS)\monodll_xh_chckb.obj & + $(OBJS)\monodll_xh_chckl.obj & + $(OBJS)\monodll_xh_choic.obj & + $(OBJS)\monodll_xh_combo.obj & + $(OBJS)\monodll_xh_dlg.obj & + $(OBJS)\monodll_xh_frame.obj & + $(OBJS)\monodll_xh_gauge.obj & + $(OBJS)\monodll_xh_gdctl.obj & + $(OBJS)\monodll_xh_html.obj & + $(OBJS)\monodll_xh_listb.obj & + $(OBJS)\monodll_xh_listc.obj & + $(OBJS)\monodll_xh_menu.obj & + $(OBJS)\monodll_xh_notbk.obj & + $(OBJS)\monodll_xh_panel.obj & + $(OBJS)\monodll_xh_radbt.obj & + $(OBJS)\monodll_xh_radbx.obj & + $(OBJS)\monodll_xh_scrol.obj & + $(OBJS)\monodll_xh_scwin.obj & + $(OBJS)\monodll_xh_sizer.obj & + $(OBJS)\monodll_xh_slidr.obj & + $(OBJS)\monodll_xh_spin.obj & + $(OBJS)\monodll_xh_split.obj & + $(OBJS)\monodll_xh_statbar.obj & + $(OBJS)\monodll_xh_stbmp.obj & + $(OBJS)\monodll_xh_stbox.obj & + $(OBJS)\monodll_xh_stlin.obj & + $(OBJS)\monodll_xh_sttxt.obj & + $(OBJS)\monodll_xh_text.obj & + $(OBJS)\monodll_xh_tglbtn.obj & + $(OBJS)\monodll_xh_toolb.obj & + $(OBJS)\monodll_xh_tree.obj & + $(OBJS)\monodll_xh_unkwn.obj & + $(OBJS)\monodll_xh_wizrd.obj & + $(OBJS)\monodll_xmlres.obj & + $(OBJS)\monodll_xmlrsall.obj !endif ____CORE_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 @@ -151,7 +190,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcscreen.obj & $(OBJS)\monodll_dialup.obj & $(OBJS)\monodll_dib.obj & - $(OBJS)\monodll_dirdlg.obj & $(OBJS)\monodll_display.obj & $(OBJS)\monodll_enhmeta.obj & $(OBJS)\monodll_evtloop.obj & @@ -161,16 +199,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & $(OBJS)\monodll_gsockmsw.obj & - $(OBJS)\monodll_helpchm.obj & - $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_minifram.obj & - $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_dataobj.obj & $(OBJS)\monodll_dropsrc.obj & $(OBJS)\monodll_droptgt.obj & $(OBJS)\monodll_oleutils.obj & - $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_palette.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & @@ -185,6 +219,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & + $(OBJS)\monodll_helpchm.obj & + $(OBJS)\monodll_helpwin.obj & + $(OBJS)\monodll_automtn.obj & + $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & @@ -197,10 +235,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_combobox.obj & $(OBJS)\monodll_control.obj & $(OBJS)\monodll_dialog.obj & + $(OBJS)\monodll_dirdlg.obj & $(OBJS)\monodll_dragimag.obj & - $(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_filedlg.obj & - $(OBJS)\monodll_fontdlg.obj & $(OBJS)\monodll_frame.obj & $(OBJS)\monodll_gauge95.obj & $(OBJS)\monodll_imaglist.obj & @@ -232,6 +269,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_textctrl.obj & $(OBJS)\monodll_tglbtn.obj & $(OBJS)\monodll_treectrl.obj & + $(OBJS)\monodll_fdrepdlg.obj & + $(OBJS)\monodll_fontdlg.obj & $(OBJS)\monodll_accesscmn.obj & $(OBJS)\monodll_appcmn.obj & $(OBJS)\monodll_artprov.obj & @@ -240,7 +279,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clntdata.obj & $(OBJS)\monodll_cmdproc.obj & $(OBJS)\monodll_cmndata.obj & $(OBJS)\monodll_containr.obj & @@ -296,6 +334,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & $(OBJS)\monodll_timercmn.obj & @@ -308,6 +347,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & $(OBJS)\monodll_choicdgg.obj & + $(OBJS)\monodll_choicbkg.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & @@ -347,7 +387,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcscreen.obj & $(OBJS)\monodll_dialup.obj & $(OBJS)\monodll_dib.obj & - $(OBJS)\monodll_dirdlg.obj & $(OBJS)\monodll_display.obj & $(OBJS)\monodll_enhmeta.obj & $(OBJS)\monodll_evtloop.obj & @@ -357,16 +396,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & $(OBJS)\monodll_gsockmsw.obj & - $(OBJS)\monodll_helpchm.obj & - $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_minifram.obj & - $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_dataobj.obj & $(OBJS)\monodll_dropsrc.obj & $(OBJS)\monodll_droptgt.obj & $(OBJS)\monodll_oleutils.obj & - $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_palette.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & @@ -381,6 +416,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & + $(OBJS)\monodll_helpchm.obj & + $(OBJS)\monodll_helpwin.obj & + $(OBJS)\monodll_automtn.obj & + $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_accel.obj & $(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_dirdlgg.obj & @@ -438,7 +477,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clntdata.obj & $(OBJS)\monodll_cmdproc.obj & $(OBJS)\monodll_cmndata.obj & $(OBJS)\monodll_containr.obj & @@ -494,6 +532,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & $(OBJS)\monodll_timercmn.obj & @@ -506,6 +545,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & $(OBJS)\monodll_choicdgg.obj & + $(OBJS)\monodll_choicbkg.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & @@ -549,9 +589,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & - $(OBJS)\monolib_joystick.obj & $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & + $(OBJS)\monolib_joystick.obj & $(OBJS)\monolib_helpbest.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -576,7 +616,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_htmllbox.obj & $(OBJS)\monolib_db.obj & $(OBJS)\monolib_dbtable.obj & - $(OBJS)\monolib_dbgrid.obj + $(OBJS)\monolib_dbgrid.obj & + $(OBJS)\monolib_xh_bmpbt.obj & + $(OBJS)\monolib_xh_bmp.obj & + $(OBJS)\monolib_xh_bttn.obj & + $(OBJS)\monolib_xh_cald.obj & + $(OBJS)\monolib_xh_chckb.obj & + $(OBJS)\monolib_xh_chckl.obj & + $(OBJS)\monolib_xh_choic.obj & + $(OBJS)\monolib_xh_combo.obj & + $(OBJS)\monolib_xh_dlg.obj & + $(OBJS)\monolib_xh_frame.obj & + $(OBJS)\monolib_xh_gauge.obj & + $(OBJS)\monolib_xh_gdctl.obj & + $(OBJS)\monolib_xh_html.obj & + $(OBJS)\monolib_xh_listb.obj & + $(OBJS)\monolib_xh_listc.obj & + $(OBJS)\monolib_xh_menu.obj & + $(OBJS)\monolib_xh_notbk.obj & + $(OBJS)\monolib_xh_panel.obj & + $(OBJS)\monolib_xh_radbt.obj & + $(OBJS)\monolib_xh_radbx.obj & + $(OBJS)\monolib_xh_scrol.obj & + $(OBJS)\monolib_xh_scwin.obj & + $(OBJS)\monolib_xh_sizer.obj & + $(OBJS)\monolib_xh_slidr.obj & + $(OBJS)\monolib_xh_spin.obj & + $(OBJS)\monolib_xh_split.obj & + $(OBJS)\monolib_xh_statbar.obj & + $(OBJS)\monolib_xh_stbmp.obj & + $(OBJS)\monolib_xh_stbox.obj & + $(OBJS)\monolib_xh_stlin.obj & + $(OBJS)\monolib_xh_sttxt.obj & + $(OBJS)\monolib_xh_text.obj & + $(OBJS)\monolib_xh_tglbtn.obj & + $(OBJS)\monolib_xh_toolb.obj & + $(OBJS)\monolib_xh_tree.obj & + $(OBJS)\monolib_xh_unkwn.obj & + $(OBJS)\monolib_xh_wizrd.obj & + $(OBJS)\monolib_xmlres.obj & + $(OBJS)\monolib_xmlrsall.obj !endif ____CORE_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 @@ -597,7 +676,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcscreen.obj & $(OBJS)\monolib_dialup.obj & $(OBJS)\monolib_dib.obj & - $(OBJS)\monolib_dirdlg.obj & $(OBJS)\monolib_display.obj & $(OBJS)\monolib_enhmeta.obj & $(OBJS)\monolib_evtloop.obj & @@ -607,16 +685,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & $(OBJS)\monolib_gsockmsw.obj & - $(OBJS)\monolib_helpchm.obj & - $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_minifram.obj & - $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_dataobj.obj & $(OBJS)\monolib_dropsrc.obj & $(OBJS)\monolib_droptgt.obj & $(OBJS)\monolib_oleutils.obj & - $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_palette.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & @@ -631,6 +705,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & + $(OBJS)\monolib_helpchm.obj & + $(OBJS)\monolib_helpwin.obj & + $(OBJS)\monolib_automtn.obj & + $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & @@ -643,10 +721,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_combobox.obj & $(OBJS)\monolib_control.obj & $(OBJS)\monolib_dialog.obj & + $(OBJS)\monolib_dirdlg.obj & $(OBJS)\monolib_dragimag.obj & - $(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_filedlg.obj & - $(OBJS)\monolib_fontdlg.obj & $(OBJS)\monolib_frame.obj & $(OBJS)\monolib_gauge95.obj & $(OBJS)\monolib_imaglist.obj & @@ -678,6 +755,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_textctrl.obj & $(OBJS)\monolib_tglbtn.obj & $(OBJS)\monolib_treectrl.obj & + $(OBJS)\monolib_fdrepdlg.obj & + $(OBJS)\monolib_fontdlg.obj & $(OBJS)\monolib_accesscmn.obj & $(OBJS)\monolib_appcmn.obj & $(OBJS)\monolib_artprov.obj & @@ -686,7 +765,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clntdata.obj & $(OBJS)\monolib_cmdproc.obj & $(OBJS)\monolib_cmndata.obj & $(OBJS)\monolib_containr.obj & @@ -742,6 +820,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & $(OBJS)\monolib_timercmn.obj & @@ -754,6 +833,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & $(OBJS)\monolib_choicdgg.obj & + $(OBJS)\monolib_choicbkg.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & @@ -793,7 +873,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcscreen.obj & $(OBJS)\monolib_dialup.obj & $(OBJS)\monolib_dib.obj & - $(OBJS)\monolib_dirdlg.obj & $(OBJS)\monolib_display.obj & $(OBJS)\monolib_enhmeta.obj & $(OBJS)\monolib_evtloop.obj & @@ -803,16 +882,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & $(OBJS)\monolib_gsockmsw.obj & - $(OBJS)\monolib_helpchm.obj & - $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_minifram.obj & - $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_dataobj.obj & $(OBJS)\monolib_dropsrc.obj & $(OBJS)\monolib_droptgt.obj & $(OBJS)\monolib_oleutils.obj & - $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_palette.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & @@ -827,6 +902,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & + $(OBJS)\monolib_helpchm.obj & + $(OBJS)\monolib_helpwin.obj & + $(OBJS)\monolib_automtn.obj & + $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_accel.obj & $(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_dirdlgg.obj & @@ -884,7 +963,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clntdata.obj & $(OBJS)\monolib_cmdproc.obj & $(OBJS)\monolib_cmndata.obj & $(OBJS)\monolib_containr.obj & @@ -940,6 +1018,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & $(OBJS)\monolib_timercmn.obj & @@ -952,6 +1031,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & $(OBJS)\monolib_choicdgg.obj & + $(OBJS)\monolib_choicbkg.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & @@ -977,7 +1057,7 @@ __basedll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __basedll___depname = & - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll !endif !endif __baselib___depname = @@ -991,7 +1071,7 @@ __netdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __netdll___depname = & - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll !endif !endif __netlib___depname = @@ -1006,7 +1086,7 @@ __coredll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 __coredll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll !endif !endif !endif @@ -1029,7 +1109,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcscreen.obj & $(OBJS)\coredll_dialup.obj & $(OBJS)\coredll_dib.obj & - $(OBJS)\coredll_dirdlg.obj & $(OBJS)\coredll_display.obj & $(OBJS)\coredll_enhmeta.obj & $(OBJS)\coredll_evtloop.obj & @@ -1039,16 +1118,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & $(OBJS)\coredll_gsockmsw.obj & - $(OBJS)\coredll_helpchm.obj & - $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_minifram.obj & - $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_dataobj.obj & $(OBJS)\coredll_dropsrc.obj & $(OBJS)\coredll_droptgt.obj & $(OBJS)\coredll_oleutils.obj & - $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_palette.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & @@ -1063,6 +1138,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & + $(OBJS)\coredll_helpchm.obj & + $(OBJS)\coredll_helpwin.obj & + $(OBJS)\coredll_automtn.obj & + $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & @@ -1075,10 +1154,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_combobox.obj & $(OBJS)\coredll_control.obj & $(OBJS)\coredll_dialog.obj & + $(OBJS)\coredll_dirdlg.obj & $(OBJS)\coredll_dragimag.obj & - $(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_filedlg.obj & - $(OBJS)\coredll_fontdlg.obj & $(OBJS)\coredll_frame.obj & $(OBJS)\coredll_gauge95.obj & $(OBJS)\coredll_imaglist.obj & @@ -1110,6 +1188,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_textctrl.obj & $(OBJS)\coredll_tglbtn.obj & $(OBJS)\coredll_treectrl.obj & + $(OBJS)\coredll_fdrepdlg.obj & + $(OBJS)\coredll_fontdlg.obj & $(OBJS)\coredll_accesscmn.obj & $(OBJS)\coredll_appcmn.obj & $(OBJS)\coredll_artprov.obj & @@ -1118,7 +1198,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clntdata.obj & $(OBJS)\coredll_cmdproc.obj & $(OBJS)\coredll_cmndata.obj & $(OBJS)\coredll_containr.obj & @@ -1174,6 +1253,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & $(OBJS)\coredll_timercmn.obj & @@ -1186,6 +1266,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & $(OBJS)\coredll_choicdgg.obj & + $(OBJS)\coredll_choicbkg.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & @@ -1225,7 +1306,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcscreen.obj & $(OBJS)\coredll_dialup.obj & $(OBJS)\coredll_dib.obj & - $(OBJS)\coredll_dirdlg.obj & $(OBJS)\coredll_display.obj & $(OBJS)\coredll_enhmeta.obj & $(OBJS)\coredll_evtloop.obj & @@ -1235,16 +1315,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & $(OBJS)\coredll_gsockmsw.obj & - $(OBJS)\coredll_helpchm.obj & - $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_minifram.obj & - $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_dataobj.obj & $(OBJS)\coredll_dropsrc.obj & $(OBJS)\coredll_droptgt.obj & $(OBJS)\coredll_oleutils.obj & - $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_palette.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & @@ -1259,6 +1335,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & + $(OBJS)\coredll_helpchm.obj & + $(OBJS)\coredll_helpwin.obj & + $(OBJS)\coredll_automtn.obj & + $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_accel.obj & $(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_dirdlgg.obj & @@ -1316,7 +1396,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clntdata.obj & $(OBJS)\coredll_cmdproc.obj & $(OBJS)\coredll_cmndata.obj & $(OBJS)\coredll_containr.obj & @@ -1372,6 +1451,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & $(OBJS)\coredll_timercmn.obj & @@ -1384,6 +1464,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & $(OBJS)\coredll_choicdgg.obj & + $(OBJS)\coredll_choicbkg.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & @@ -1433,7 +1514,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcscreen.obj & $(OBJS)\corelib_dialup.obj & $(OBJS)\corelib_dib.obj & - $(OBJS)\corelib_dirdlg.obj & $(OBJS)\corelib_display.obj & $(OBJS)\corelib_enhmeta.obj & $(OBJS)\corelib_evtloop.obj & @@ -1443,16 +1523,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & $(OBJS)\corelib_gsockmsw.obj & - $(OBJS)\corelib_helpchm.obj & - $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_minifram.obj & - $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_dataobj.obj & $(OBJS)\corelib_dropsrc.obj & $(OBJS)\corelib_droptgt.obj & $(OBJS)\corelib_oleutils.obj & - $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_palette.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & @@ -1467,6 +1543,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & + $(OBJS)\corelib_helpchm.obj & + $(OBJS)\corelib_helpwin.obj & + $(OBJS)\corelib_automtn.obj & + $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & @@ -1479,10 +1559,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_combobox.obj & $(OBJS)\corelib_control.obj & $(OBJS)\corelib_dialog.obj & + $(OBJS)\corelib_dirdlg.obj & $(OBJS)\corelib_dragimag.obj & - $(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_filedlg.obj & - $(OBJS)\corelib_fontdlg.obj & $(OBJS)\corelib_frame.obj & $(OBJS)\corelib_gauge95.obj & $(OBJS)\corelib_imaglist.obj & @@ -1514,6 +1593,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_textctrl.obj & $(OBJS)\corelib_tglbtn.obj & $(OBJS)\corelib_treectrl.obj & + $(OBJS)\corelib_fdrepdlg.obj & + $(OBJS)\corelib_fontdlg.obj & $(OBJS)\corelib_accesscmn.obj & $(OBJS)\corelib_appcmn.obj & $(OBJS)\corelib_artprov.obj & @@ -1522,7 +1603,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clntdata.obj & $(OBJS)\corelib_cmdproc.obj & $(OBJS)\corelib_cmndata.obj & $(OBJS)\corelib_containr.obj & @@ -1578,6 +1658,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & $(OBJS)\corelib_timercmn.obj & @@ -1590,6 +1671,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & $(OBJS)\corelib_choicdgg.obj & + $(OBJS)\corelib_choicbkg.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & @@ -1629,7 +1711,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcscreen.obj & $(OBJS)\corelib_dialup.obj & $(OBJS)\corelib_dib.obj & - $(OBJS)\corelib_dirdlg.obj & $(OBJS)\corelib_display.obj & $(OBJS)\corelib_enhmeta.obj & $(OBJS)\corelib_evtloop.obj & @@ -1639,16 +1720,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & $(OBJS)\corelib_gsockmsw.obj & - $(OBJS)\corelib_helpchm.obj & - $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_minifram.obj & - $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_dataobj.obj & $(OBJS)\corelib_dropsrc.obj & $(OBJS)\corelib_droptgt.obj & $(OBJS)\corelib_oleutils.obj & - $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_palette.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & @@ -1663,6 +1740,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & + $(OBJS)\corelib_helpchm.obj & + $(OBJS)\corelib_helpwin.obj & + $(OBJS)\corelib_automtn.obj & + $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_accel.obj & $(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_dirdlgg.obj & @@ -1720,7 +1801,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clntdata.obj & $(OBJS)\corelib_cmdproc.obj & $(OBJS)\corelib_cmndata.obj & $(OBJS)\corelib_containr.obj & @@ -1776,6 +1856,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & $(OBJS)\corelib_timercmn.obj & @@ -1788,6 +1869,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & $(OBJS)\corelib_choicdgg.obj & + $(OBJS)\corelib_choicbkg.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & @@ -1814,7 +1896,7 @@ __advdll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 __advdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll !endif !endif !endif @@ -1832,7 +1914,7 @@ __odbcdll___depname = !ifeq SHARED 1 !ifeq USE_ODBC 1 __odbcdll___depname = & - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll !endif !endif !endif @@ -1851,7 +1933,7 @@ __dbgriddll___depname = !ifeq USE_GUI 1 !ifeq USE_ODBC 1 __dbgriddll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll !endif !endif !endif @@ -1872,7 +1954,7 @@ __htmldll___depname = !ifeq SHARED 1 !ifeq USE_HTML 1 __htmldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll !endif !endif !endif @@ -1889,7 +1971,7 @@ __xmldll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __xmldll___depname = & - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll !endif !endif __xmllib___depname = @@ -1899,12 +1981,30 @@ __xmllib___depname = & $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif !endif +__xrcdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_XRC 1 +__xrcdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll +!endif +!endif +!endif +__xrclib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_XRC 1 +__xrclib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +!endif +!endif +!endif __gldll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 __gldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll !endif !endif !endif @@ -1931,22 +2031,22 @@ __gllib___depname = & !endif !endif !endif -__DEBUGINFO_10 = +__DEBUGINFO_2 = !ifeq BUILD debug !ifeq DEBUG_INFO default -__DEBUGINFO_10 = debug all +__DEBUGINFO_2 = debug all !endif !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_10 = +__DEBUGINFO_2 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_10 = +__DEBUGINFO_2 = !endif !ifeq DEBUG_INFO 1 -__DEBUGINFO_10 = debug all +__DEBUGINFO_2 = debug all !endif __LIB_TIFF_p = !ifeq USE_GUI 1 @@ -2037,15 +2137,17 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" & + USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & - VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" + VENDOR="$(VENDOR)" CFG="$(CFG)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" & + CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)" OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -i=..\..\include -i=$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) + -i=..\..\include -i=$(SETUPHDIR) -d__WXMSW__ $(__UNICODE_DEFINE_p) & + $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = & $(OBJS)\wxregex_regcomp.obj & $(OBJS)\wxregex_regexec.obj & @@ -2063,10 +2165,8 @@ WXZLIB_OBJECTS = & $(OBJS)\wxzlib_trees.obj & $(OBJS)\wxzlib_zutil.obj & $(OBJS)\wxzlib_inflate.obj & - $(OBJS)\wxzlib_infblock.obj & + $(OBJS)\wxzlib_infback.obj & $(OBJS)\wxzlib_inftrees.obj & - $(OBJS)\wxzlib_infcodes.obj & - $(OBJS)\wxzlib_infutil.obj & $(OBJS)\wxzlib_inffast.obj WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -i=..\..\src\zlib $(CPPFLAGS) $(CFLAGS) @@ -2193,6 +2293,7 @@ MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & MONODLL_OBJECTS = & $(OBJS)\monodll_dummy.obj & $(OBJS)\monodll_appbase.obj & + $(OBJS)\monodll_clntdata.obj & $(OBJS)\monodll_cmdline.obj & $(OBJS)\monodll_config.obj & $(OBJS)\monodll_datetime.obj & @@ -2211,7 +2312,6 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_filesys.obj & $(OBJS)\monodll_fmapbase.obj & $(OBJS)\monodll_fs_zip.obj & - $(OBJS)\monodll_gzstream.obj & $(OBJS)\monodll_hash.obj & $(OBJS)\monodll_hashmap.obj & $(OBJS)\monodll_init.obj & @@ -2227,6 +2327,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_object.obj & $(OBJS)\monodll_process.obj & $(OBJS)\monodll_regex.obj & + $(OBJS)\monodll_sstream.obj & $(OBJS)\monodll_stopwatch.obj & $(OBJS)\monodll_strconv.obj & $(OBJS)\monodll_stream.obj & @@ -2291,6 +2392,7 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & MONOLIB_OBJECTS = & $(OBJS)\monolib_dummy.obj & $(OBJS)\monolib_appbase.obj & + $(OBJS)\monolib_clntdata.obj & $(OBJS)\monolib_cmdline.obj & $(OBJS)\monolib_config.obj & $(OBJS)\monolib_datetime.obj & @@ -2309,7 +2411,6 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_filesys.obj & $(OBJS)\monolib_fmapbase.obj & $(OBJS)\monolib_fs_zip.obj & - $(OBJS)\monolib_gzstream.obj & $(OBJS)\monolib_hash.obj & $(OBJS)\monolib_hashmap.obj & $(OBJS)\monolib_init.obj & @@ -2325,6 +2426,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_object.obj & $(OBJS)\monolib_process.obj & $(OBJS)\monolib_regex.obj & + $(OBJS)\monolib_sstream.obj & $(OBJS)\monolib_stopwatch.obj & $(OBJS)\monolib_strconv.obj & $(OBJS)\monolib_stream.obj & @@ -2390,6 +2492,7 @@ BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & BASEDLL_OBJECTS = & $(OBJS)\basedll_dummy.obj & $(OBJS)\basedll_appbase.obj & + $(OBJS)\basedll_clntdata.obj & $(OBJS)\basedll_cmdline.obj & $(OBJS)\basedll_config.obj & $(OBJS)\basedll_datetime.obj & @@ -2408,7 +2511,6 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_filesys.obj & $(OBJS)\basedll_fmapbase.obj & $(OBJS)\basedll_fs_zip.obj & - $(OBJS)\basedll_gzstream.obj & $(OBJS)\basedll_hash.obj & $(OBJS)\basedll_hashmap.obj & $(OBJS)\basedll_init.obj & @@ -2424,6 +2526,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_object.obj & $(OBJS)\basedll_process.obj & $(OBJS)\basedll_regex.obj & + $(OBJS)\basedll_sstream.obj & $(OBJS)\basedll_stopwatch.obj & $(OBJS)\basedll_strconv.obj & $(OBJS)\basedll_stream.obj & @@ -2473,6 +2576,7 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & BASELIB_OBJECTS = & $(OBJS)\baselib_dummy.obj & $(OBJS)\baselib_appbase.obj & + $(OBJS)\baselib_clntdata.obj & $(OBJS)\baselib_cmdline.obj & $(OBJS)\baselib_config.obj & $(OBJS)\baselib_datetime.obj & @@ -2491,7 +2595,6 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_filesys.obj & $(OBJS)\baselib_fmapbase.obj & $(OBJS)\baselib_fs_zip.obj & - $(OBJS)\baselib_gzstream.obj & $(OBJS)\baselib_hash.obj & $(OBJS)\baselib_hashmap.obj & $(OBJS)\baselib_init.obj & @@ -2507,6 +2610,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_object.obj & $(OBJS)\baselib_process.obj & $(OBJS)\baselib_regex.obj & + $(OBJS)\baselib_sstream.obj & $(OBJS)\baselib_stopwatch.obj & $(OBJS)\baselib_strconv.obj & $(OBJS)\baselib_stream.obj & @@ -2542,12 +2646,6 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_main.obj & $(OBJS)\baselib_mslu.obj & $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET & - $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2568,11 +2666,6 @@ NETDLL_OBJECTS = & $(OBJS)\netdll_url.obj & $(OBJS)\netdll_gsocket.obj & $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2593,12 +2686,6 @@ NETLIB_OBJECTS = & $(OBJS)\netlib_url.obj & $(OBJS)\netlib_gsocket.obj & $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 & - $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2615,11 +2702,6 @@ COREDLL_OBJECTS = & $(OBJS)\coredll_mslu.obj & $(OBJS)\coredll_volume.obj & $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2655,9 +2737,9 @@ ADVDLL_OBJECTS = & $(OBJS)\advdll_tipdlg.obj & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & - $(OBJS)\advdll_joystick.obj & $(OBJS)\advdll_sound.obj & - $(OBJS)\advdll_taskbar.obj + $(OBJS)\advdll_taskbar.obj & + $(OBJS)\advdll_joystick.obj ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2677,9 +2759,9 @@ ADVLIB_OBJECTS = & $(OBJS)\advlib_tipdlg.obj & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & - $(OBJS)\advlib_joystick.obj & $(OBJS)\advlib_sound.obj & - $(OBJS)\advlib_taskbar.obj + $(OBJS)\advlib_taskbar.obj & + $(OBJS)\advlib_joystick.obj ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2799,6 +2881,100 @@ XMLLIB_OBJECTS = & $(OBJS)\xmllib_dummy.obj & $(OBJS)\xmllib_xml.obj & $(OBJS)\xmllib_xtixml.obj +XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & + -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC & + /fh=$(OBJS)\wxprec_xrcdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +XRCDLL_OBJECTS = & + $(OBJS)\xrcdll_dummy.obj & + $(OBJS)\xrcdll_xh_bmpbt.obj & + $(OBJS)\xrcdll_xh_bmp.obj & + $(OBJS)\xrcdll_xh_bttn.obj & + $(OBJS)\xrcdll_xh_cald.obj & + $(OBJS)\xrcdll_xh_chckb.obj & + $(OBJS)\xrcdll_xh_chckl.obj & + $(OBJS)\xrcdll_xh_choic.obj & + $(OBJS)\xrcdll_xh_combo.obj & + $(OBJS)\xrcdll_xh_dlg.obj & + $(OBJS)\xrcdll_xh_frame.obj & + $(OBJS)\xrcdll_xh_gauge.obj & + $(OBJS)\xrcdll_xh_gdctl.obj & + $(OBJS)\xrcdll_xh_html.obj & + $(OBJS)\xrcdll_xh_listb.obj & + $(OBJS)\xrcdll_xh_listc.obj & + $(OBJS)\xrcdll_xh_menu.obj & + $(OBJS)\xrcdll_xh_notbk.obj & + $(OBJS)\xrcdll_xh_panel.obj & + $(OBJS)\xrcdll_xh_radbt.obj & + $(OBJS)\xrcdll_xh_radbx.obj & + $(OBJS)\xrcdll_xh_scrol.obj & + $(OBJS)\xrcdll_xh_scwin.obj & + $(OBJS)\xrcdll_xh_sizer.obj & + $(OBJS)\xrcdll_xh_slidr.obj & + $(OBJS)\xrcdll_xh_spin.obj & + $(OBJS)\xrcdll_xh_split.obj & + $(OBJS)\xrcdll_xh_statbar.obj & + $(OBJS)\xrcdll_xh_stbmp.obj & + $(OBJS)\xrcdll_xh_stbox.obj & + $(OBJS)\xrcdll_xh_stlin.obj & + $(OBJS)\xrcdll_xh_sttxt.obj & + $(OBJS)\xrcdll_xh_text.obj & + $(OBJS)\xrcdll_xh_tglbtn.obj & + $(OBJS)\xrcdll_xh_toolb.obj & + $(OBJS)\xrcdll_xh_tree.obj & + $(OBJS)\xrcdll_xh_unkwn.obj & + $(OBJS)\xrcdll_xh_wizrd.obj & + $(OBJS)\xrcdll_xmlres.obj & + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & + -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) +XRCLIB_OBJECTS = & + $(OBJS)\xrclib_dummy.obj & + $(OBJS)\xrclib_xh_bmpbt.obj & + $(OBJS)\xrclib_xh_bmp.obj & + $(OBJS)\xrclib_xh_bttn.obj & + $(OBJS)\xrclib_xh_cald.obj & + $(OBJS)\xrclib_xh_chckb.obj & + $(OBJS)\xrclib_xh_chckl.obj & + $(OBJS)\xrclib_xh_choic.obj & + $(OBJS)\xrclib_xh_combo.obj & + $(OBJS)\xrclib_xh_dlg.obj & + $(OBJS)\xrclib_xh_frame.obj & + $(OBJS)\xrclib_xh_gauge.obj & + $(OBJS)\xrclib_xh_gdctl.obj & + $(OBJS)\xrclib_xh_html.obj & + $(OBJS)\xrclib_xh_listb.obj & + $(OBJS)\xrclib_xh_listc.obj & + $(OBJS)\xrclib_xh_menu.obj & + $(OBJS)\xrclib_xh_notbk.obj & + $(OBJS)\xrclib_xh_panel.obj & + $(OBJS)\xrclib_xh_radbt.obj & + $(OBJS)\xrclib_xh_radbx.obj & + $(OBJS)\xrclib_xh_scrol.obj & + $(OBJS)\xrclib_xh_scwin.obj & + $(OBJS)\xrclib_xh_sizer.obj & + $(OBJS)\xrclib_xh_slidr.obj & + $(OBJS)\xrclib_xh_spin.obj & + $(OBJS)\xrclib_xh_split.obj & + $(OBJS)\xrclib_xh_statbar.obj & + $(OBJS)\xrclib_xh_stbmp.obj & + $(OBJS)\xrclib_xh_stbox.obj & + $(OBJS)\xrclib_xh_stlin.obj & + $(OBJS)\xrclib_xh_sttxt.obj & + $(OBJS)\xrclib_xh_text.obj & + $(OBJS)\xrclib_xh_tglbtn.obj & + $(OBJS)\xrclib_xh_toolb.obj & + $(OBJS)\xrclib_xh_tree.obj & + $(OBJS)\xrclib_xh_unkwn.obj & + $(OBJS)\xrclib_xh_wizrd.obj & + $(OBJS)\xrclib_xmlres.obj & + $(OBJS)\xrclib_xmlrsall.obj GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2826,7 +3002,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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___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 $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -2839,34 +3015,37 @@ 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)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib cd ..\..\samples @@ -2913,12 +3092,12 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS) !ifeq MONOLITHIC 1 !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib @%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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @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 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 @%append $(OBJS)\monodll.lbc @@ -2939,12 +3118,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib @%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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.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 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 @%append $(OBJS)\basedll.lbc @@ -2965,12 +3144,12 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(BASELIB_OBJECTS) !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.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 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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i @%append $(OBJS)\netdll.lbc @@ -2992,12 +3171,12 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__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)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @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 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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc @@ -3022,12 +3201,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__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)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @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 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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc @@ -3052,12 +3231,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.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 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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @%append $(OBJS)\odbcdll.lbc @@ -3083,12 +3262,12 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJEC !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll : $(DBGRIDDLL_OBJECTS) $(__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) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll : $(DBGRIDDLL_OBJECTS) $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_2) 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 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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i @%append $(OBJS)\dbgriddll.lbc @@ -3116,12 +3295,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__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)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @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 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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc @@ -3145,12 +3324,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.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 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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc @@ -3169,15 +3348,45 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS !endif !endif +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_XRC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll : $(XRCDLL_OBJECTS) $(__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) + @%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_2) libpath $(LIBDIRNAME) + @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 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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\xrcdll.lbc library %i + @%append $(OBJS)\xrcdll.lbc + @%append $(OBJS)\xrcdll.lbc system nt_dll + wlink @$(OBJS)\xrcdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$^@ +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_XRC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(XRCLIB_OBJECTS) + @%create $(OBJS)\xrclib.lbc + @for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i + wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc +!endif +!endif +!endif + !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__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)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___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_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @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 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 @%append $(OBJS)\gldll.lbc @@ -3222,7 +3431,7 @@ $(SETUPHDIR)\wx\setup.h : build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3287,18 +3496,12 @@ $(OBJS)\wxzlib_zutil.obj : .AUTODEPEND ..\..\src\zlib\zutil.c $(OBJS)\wxzlib_inflate.obj : .AUTODEPEND ..\..\src\zlib\inflate.c $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< -$(OBJS)\wxzlib_infblock.obj : .AUTODEPEND ..\..\src\zlib\infblock.c +$(OBJS)\wxzlib_infback.obj : .AUTODEPEND ..\..\src\zlib\infback.c $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< $(OBJS)\wxzlib_inftrees.obj : .AUTODEPEND ..\..\src\zlib\inftrees.c $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< -$(OBJS)\wxzlib_infcodes.obj : .AUTODEPEND ..\..\src\zlib\infcodes.c - $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_infutil.obj : .AUTODEPEND ..\..\src\zlib\infutil.c - $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - $(OBJS)\wxzlib_inffast.obj : .AUTODEPEND ..\..\src\zlib\inffast.c $(CC) -zq -fo=$^@ $(WXZLIB_CFLAGS) $< @@ -3605,6 +3808,9 @@ $(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(OBJS)\monodll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3659,9 +3865,6 @@ $(OBJS)\monodll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp $(OBJS)\monodll_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3707,6 +3910,9 @@ $(OBJS)\monodll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(OBJS)\monodll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3842,8 +4048,8 @@ $(OBJS)\monodll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3851,13 +4057,13 @@ $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp +$(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp +$(OBJS)\monodll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp +$(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp @@ -3911,6 +4117,9 @@ $(OBJS)\monodll_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp $(OBJS)\monodll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4013,15 +4222,15 @@ $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4097,6 +4306,123 @@ $(OBJS)\monodll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp $(OBJS)\monodll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4179,12 +4505,7 @@ $(OBJS)\monodll_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp +$(OBJS)\monodll_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -4224,17 +4545,7 @@ $(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp +$(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -4248,11 +4559,6 @@ $(OBJS)\monodll_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4273,11 +4579,6 @@ $(OBJS)\monodll_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4348,6 +4649,26 @@ $(OBJS)\monodll_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -4493,20 +4814,6 @@ $(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp @@ -4703,6 +5010,20 @@ $(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4743,11 +5064,6 @@ $(OBJS)\monodll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5023,6 +5339,11 @@ $(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5083,6 +5404,11 @@ $(OBJS)\monodll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5184,6 +5510,9 @@ $(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(OBJS)\monolib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5238,9 +5567,6 @@ $(OBJS)\monolib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp $(OBJS)\monolib_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5286,6 +5612,9 @@ $(OBJS)\monolib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(OBJS)\monolib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5421,8 +5750,8 @@ $(OBJS)\monolib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5430,13 +5759,13 @@ $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp +$(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp +$(OBJS)\monolib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp +$(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp @@ -5490,6 +5819,9 @@ $(OBJS)\monolib_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp $(OBJS)\monolib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5592,15 +5924,15 @@ $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5676,6 +6008,123 @@ $(OBJS)\monolib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp $(OBJS)\monolib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5757,11 +6206,6 @@ $(OBJS)\monolib_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5803,17 +6247,7 @@ $(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp +$(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -5827,11 +6261,6 @@ $(OBJS)\monolib_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5852,11 +6281,6 @@ $(OBJS)\monolib_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5927,6 +6351,26 @@ $(OBJS)\monolib_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -6072,20 +6516,6 @@ $(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp @@ -6282,6 +6712,20 @@ $(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6322,11 +6766,6 @@ $(OBJS)\monolib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6602,6 +7041,11 @@ $(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6662,6 +7106,11 @@ $(OBJS)\monolib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6763,6 +7212,9 @@ $(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp + $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -6817,9 +7269,6 @@ $(OBJS)\basedll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp $(OBJS)\basedll_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -6865,6 +7314,9 @@ $(OBJS)\basedll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(OBJS)\basedll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp + $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -6976,6 +7428,9 @@ $(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp + $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -7030,9 +7485,6 @@ $(OBJS)\baselib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp $(OBJS)\baselib_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -7078,6 +7530,9 @@ $(OBJS)\baselib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(OBJS)\baselib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp + $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -7216,8 +7671,8 @@ $(OBJS)\netdll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< -$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $< +$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< @@ -7255,8 +7710,8 @@ $(OBJS)\netlib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< -$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $< +$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< $(OBJS)\netlib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< @@ -7288,13 +7743,13 @@ $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp +$(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp +$(OBJS)\coredll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp +$(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp @@ -7348,6 +7803,9 @@ $(OBJS)\coredll_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp $(OBJS)\coredll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7492,11 +7950,6 @@ $(OBJS)\coredll_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7538,17 +7991,7 @@ $(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(COREDLL_CFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp +$(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -7562,11 +8005,6 @@ $(OBJS)\coredll_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7587,11 +8025,6 @@ $(OBJS)\coredll_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7662,6 +8095,26 @@ $(OBJS)\coredll_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -7807,20 +8260,6 @@ $(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp @@ -8017,6 +8456,20 @@ $(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8057,11 +8510,6 @@ $(OBJS)\coredll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8337,6 +8785,11 @@ $(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8397,6 +8850,11 @@ $(OBJS)\coredll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8519,13 +8977,13 @@ $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp +$(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp +$(OBJS)\corelib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp +$(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp @@ -8579,6 +9037,9 @@ $(OBJS)\corelib_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp $(OBJS)\corelib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8723,11 +9184,6 @@ $(OBJS)\corelib_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8769,17 +9225,7 @@ $(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(CORELIB_CFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp +$(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -8793,11 +9239,6 @@ $(OBJS)\corelib_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8818,11 +9259,6 @@ $(OBJS)\corelib_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8893,6 +9329,26 @@ $(OBJS)\corelib_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -9038,20 +9494,6 @@ $(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp @@ -9248,6 +9690,20 @@ $(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -9288,11 +9744,6 @@ $(OBJS)\corelib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -9568,6 +10019,11 @@ $(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -9628,6 +10084,11 @@ $(OBJS)\corelib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -9759,15 +10220,15 @@ $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -9804,15 +10265,15 @@ $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\advlib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< @@ -9999,6 +10460,246 @@ $(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(OBJS)\xmllib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp $(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< +$(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<